diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/knowledge/ExamKnowledgePointsController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/knowledge/ExamKnowledgePointsController.java index 8a9d86ea..6bfceb24 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/knowledge/ExamKnowledgePointsController.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/knowledge/ExamKnowledgePointsController.java @@ -28,7 +28,7 @@ import java.util.Objects; @Tag(name = "管理后台 - 知识点") @RestController @RequestMapping("/exam/points") -public class ExamKnowledgePointsController{ +public class ExamKnowledgePointsController { @Autowired private ExamKnowledgePointsService knowledgePointsService; @@ -76,7 +76,7 @@ public class ExamKnowledgePointsController{ Long ParentId = knowledgePoints.getParentId(); if (SpName != null) { if (String.valueOf(ParentId).equals("0")) { - return CommonResult.error(122_333_444,"不可增加根节点!"); + return CommonResult.error(122_333_444, "不可增加根节点!"); } else { //获取父节点的信息 @@ -93,7 +93,7 @@ public class ExamKnowledgePointsController{ } } else - return CommonResult.error(122_333_444,"输入名称不能为空!"); + return CommonResult.error(122_333_444, "输入名称不能为空!"); } @@ -105,10 +105,10 @@ public class ExamKnowledgePointsController{ public CommonResult edit(@RequestBody ExamKnowledgePoints knowledgePoints) { //判断是否修改的根节点 if (Objects.equals(knowledgePoints.getAncestors(), "0")) { - return CommonResult.error(122_333_444,"不可直接修改根节点,请在专业表中修改!"); + return CommonResult.error(122_333_444, "不可直接修改根节点,请在专业表中修改!"); } else { if (Objects.equals(knowledgePoints.getSpName(), "")) { - return CommonResult.error(122_333_444,"修改名称不得为空!"); + return CommonResult.error(122_333_444, "修改名称不得为空!"); } else { return CommonResult.success(knowledgePointsService.updateKnowledgePoints(knowledgePoints)); @@ -129,11 +129,11 @@ public class ExamKnowledgePointsController{ Long ParentId = knowledgePoint.getParentId(); // 根据父节点id查找是否为根节点,根节点为专业不可在此删除 if (ParentId == 0) { - return CommonResult.error(122_333_444,"删除失败,删除目录中含有专业,请在专业表中删除!"); + return CommonResult.error(122_333_444, "删除失败,删除目录中含有专业,请在专业表中删除!"); } else { // 判断是否有子树 if (knowledgePoint.getTreeNum() != 0) { - return CommonResult.error(122_333_444,"删除失败,删除目录下还存在知识点!"); + return CommonResult.error(122_333_444, "删除失败,删除目录下还存在知识点!"); } } } diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/knowledge/ExamKnowledgePoints.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/knowledge/ExamKnowledgePoints.java index 77de7c65..76579f7c 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/knowledge/ExamKnowledgePoints.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/knowledge/ExamKnowledgePoints.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import pc.exam.pp.framework.tenant.core.db.TenantBaseDO; +import pc.exam.pp.framework.mybatis.core.dataobject.BaseDO; /** * 知识点对象 exam_knowledge_points @@ -16,11 +16,12 @@ import pc.exam.pp.framework.tenant.core.db.TenantBaseDO; @TableName("exam_knowledge_points") @Data @EqualsAndHashCode(callSuper = true) -public class ExamKnowledgePoints extends TenantBaseDO -{ +public class ExamKnowledgePoints extends BaseDO { private static final long serialVersionUID = 1L; - /** id */ + /** + * id + */ @TableId(value = "sp_id", type = IdType.AUTO) private Long spId; @@ -30,12 +31,18 @@ public class ExamKnowledgePoints extends TenantBaseDO private int orderNum; - /** 名称 */ + /** + * 名称 + */ private String spName; - /** 状态(0正常 1停用) */ + /** + * 状态(0正常 1停用) + */ private int status; - /** 子树数量 */ + /** + * 子树数量 + */ private Long treeNum; } diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/knowledge/ExamKnowledgePointsMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/knowledge/ExamKnowledgePointsMapper.xml index 88b12c74..fe43e9f2 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/knowledge/ExamKnowledgePointsMapper.xml +++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/knowledge/ExamKnowledgePointsMapper.xml @@ -53,15 +53,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update exam_knowledge_points + update exam_knowledge_points deleted = 1 - where sp_id = #{spId} + where sp_id = #{spId} - delete from knowledge_points update exam_knowledge_points deleted = 1 diff --git a/exam-server/src/main/resources/application.yaml b/exam-server/src/main/resources/application.yaml index 5f876363..1d90c714 100644 --- a/exam-server/src/main/resources/application.yaml +++ b/exam-server/src/main/resources/application.yaml @@ -297,6 +297,7 @@ exam: - /admin-api/system/auth/refreshLogout # 登出用户 ignore-tables: - exam_tenant_specialty + - exam_knowledge_points - exam_specialty - exam_app_check - system_tenant