diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java index 64b23f6a..b3e3c898 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java +++ b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java @@ -14,6 +14,7 @@ import com.jfinal.plugin.activerecord.Record; import io.github.yedaxia.apidocs.ApiDoc; import java.util.List; + @ApiDoc public class BaseController extends Controller { BaseModel bm = new BaseModel(); @@ -134,26 +135,26 @@ public class BaseController extends Controller { /** * 增加版本 - * @param scheme_name 版本名称 - * @param stage_id 学段ID - * @param subject_id 科目ID - * @param owner_id 创建人ID - * @param type_id 1:章节目录结构 2:知识点结构 - * @param scheme_type_id 1:系统 2云盘 - * @param sort_id 排序号 + * + * @param scheme_name 版本名称 + * @param stage_id 学段ID + * @param subject_id 科目ID + * @param owner_id 创建人ID + * @param type_id 1:章节目录结构 2:知识点结构 + * @param sort_id 排序号 */ @Before({POST.class}) @JwtCheckInterface({}) @EmptyInterface({"scheme_name", "owner_id"}) - @IsNumericInterface({"stage_id", "subject_id", "type_id", "scheme_type_id", "sort_id"}) - public void addScheme(String scheme_name, int stage_id, int subject_id, String owner_id, int type_id, int scheme_type_id, int sort_id) { + @IsNumericInterface({"stage_id", "subject_id", "type_id", "sort_id"}) + public void addScheme(String scheme_name, int stage_id, int subject_id, String owner_id, int type_id, int sort_id) { //1、检查此名称的版本是否已经存在,存在的不能继续添加 if (bm.checkSchemeName(scheme_name, stage_id)) { renderJson(RetKit.renderFail("该版本名称已存在")); return; } //2、通过检查,可以添加 - bm.addScheme(scheme_name, stage_id, subject_id, 1, owner_id, type_id, scheme_type_id, sort_id); + bm.addScheme(scheme_name, stage_id, subject_id, 1, owner_id, type_id, sort_id); renderJson(RetKit.renderSuccess("操作成功")); } @@ -173,25 +174,24 @@ public class BaseController extends Controller { /** * 修改版本 * - * @param scheme_id 版本ID - * @param scheme_name 版本名称 - * @param stage_id 学段ID - * @param subject_id 科目ID - * @param type_id 1:章节目录结构 2:知识点结构 - * @param scheme_type_id 1:系统 2云盘 - * @param sort_id 排序号 + * @param scheme_id 版本ID + * @param scheme_name 版本名称 + * @param stage_id 学段ID + * @param subject_id 科目ID + * @param type_id 1:章节目录结构 2:知识点结构 + * @param sort_id 排序号 */ @Before({POST.class}) @EmptyInterface({"scheme_name"}) - @IsNumericInterface({"scheme_id", "stage_id", "subject_id", "type_id", "scheme_type_id", "sort_id"}) - public void updateScheme(int scheme_id, String scheme_name, int stage_id, int subject_id, int type_id, int scheme_type_id, int sort_id) { + @IsNumericInterface({"scheme_id", "stage_id", "subject_id", "type_id", "sort_id"}) + public void updateScheme(int scheme_id, String scheme_name, int stage_id, int subject_id, int type_id, int sort_id) { //1、检查此名称的版本是否已经存在,存在的不能继续添加 if (bm.checkSchemeName(scheme_id, scheme_name, stage_id)) { renderJson(RetKit.renderFail("该版本名称已存在")); return; } //2、检查通过,可以修改 - bm.updateScheme(scheme_id, scheme_name, stage_id, subject_id, type_id, scheme_type_id, sort_id); + bm.updateScheme(scheme_id, scheme_name, stage_id, subject_id, type_id, sort_id); renderJson(RetKit.renderSuccess("操作成功")); } diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java index a7bf402c..b02dd0e3 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java +++ b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java @@ -170,10 +170,9 @@ public class BaseModel { * @param b_use * @param owner_id * @param type_id - * @param scheme_type_id * @param sort_id */ - public void addScheme(String scheme_name, int stage_id, int subject_id, int b_use, String owner_id, int type_id, int scheme_type_id, int sort_id) { + public void addScheme(String scheme_name, int stage_id, int subject_id, int b_use, String owner_id, int type_id, int sort_id) { Record record = new Record(); record.set("scheme_name", scheme_name); record.set("stage_id", stage_id); @@ -181,9 +180,8 @@ public class BaseModel { record.set("b_use", b_use); record.set("owner_id", owner_id); record.set("type_id", type_id); - record.set("scheme_type_id", scheme_type_id); record.set("sort_id", sort_id); - Db.save("t_resource_scheme", record); + Db.save("t_resource_scheme","scheme_id", record); } /** @@ -204,12 +202,11 @@ public class BaseModel { * @param stage_id * @param subject_id * @param type_id - * @param scheme_type_id * @param sort_id */ - public void updateScheme(int scheme_id, String scheme_name, int stage_id, int subject_id, int type_id, int scheme_type_id, int sort_id) { - String sql = "update t_resource_scheme set scheme_name=?,stage_id=?,subject_id=?,type_id=?,scheme_type_id=?,sort_id=? where scheme_id=?"; - Db.update(sql, scheme_name, stage_id, subject_id, type_id, scheme_type_id, sort_id, scheme_id); + public void updateScheme(int scheme_id, String scheme_name, int stage_id, int subject_id, int type_id, int sort_id) { + String sql = "update t_resource_scheme set scheme_name=?,stage_id=?,subject_id=?,type_id=?,sort_id=? where scheme_id=?"; + Db.update(sql, scheme_name, stage_id, subject_id, type_id, sort_id, scheme_id); } /**