3.3.2 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TPProfessional.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,6 +30,7 @@ public class TPProfessional extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "学校ID")
     private Long schoolId;
 
@@ -35,6 +38,7 @@ public class TPProfessional extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "专业名称")
     private String name;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @NotNull(message = "所属学院ID不能为空")
     @ApiModelProperty(value = "所属学院ID")
     private Long orgId;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TPRequirement.java

@@ -23,7 +23,8 @@ public class TPRequirement extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "专业ID")
     private Long professionalId;
-
+    @ApiModelProperty(value = "毕业要求Code")
+    private String code;
     @ApiModelProperty(value = "毕业要求")
     private String name;
 
@@ -41,6 +42,14 @@ public class TPRequirement extends BaseEntity implements Serializable {
         this.professionalId = professionalId;
     }
 
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
     public String getName() {
         return name;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TPRequirementService.java

@@ -21,4 +21,6 @@ public interface TPRequirementService extends IService<TPRequirement> {
     boolean saveRequirement(TPRequirement tpRequirement);
 
     boolean saveSort(List<TPRequirement> requirementList);
+
+    boolean removeRequirement(Long id);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TPProfessionalServiceImpl.java

@@ -52,6 +52,7 @@ public class TPProfessionalServiceImpl extends ServiceImpl<TPProfessionalMapper,
         ProfessionalCertificationEnum.listTypes().forEach(m -> {
             TPRequirement tpRequirement = new TPRequirement();
             tpRequirement.setProfessionalId(tpProfessional.getId());
+            tpRequirement.setCode(m.getCode());
             tpRequirement.setName(m.getName());
             tpRequirement.setSortNum(m.getOrdinal() + 1);
             tpRequirement.insertInfo(sysUser.getId());

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TPRequirementServiceImpl.java

@@ -81,4 +81,9 @@ public class TPRequirementServiceImpl extends ServiceImpl<TPRequirementMapper, T
         });
         return true;
     }
+
+    @Override
+    public boolean removeRequirement(Long id) {
+        return this.removeById(id);
+    }
 }

distributed-print-business/src/main/resources/mapper/TPRequirementMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.TPRequirement">
         <id column="id" property="id" />
         <result column="professional_id" property="professionalId" />
+        <result column="code" property="name" />
         <result column="name" property="name" />
         <result column="node_count" property="nodeCount" />
         <result column="sort_num" property="sortNum" />

distributed-print/install/mysql/upgrade/3.3.2.sql

@@ -1,7 +1,7 @@
 USE teachcloud_db;
 
 CREATE TABLE `t_p_professional` (
-       `id` INT NOT NULL,
+       `id` BIGINT(20) NOT NULL,
        `school_id` BIGINT(20) NULL COMMENT '学校ID',
        `name` VARCHAR(80) NULL COMMENT '专业名称',
        `org_id` BIGINT(20) NULL COMMENT '所属学院ID',
@@ -28,6 +28,7 @@ CREATE TABLE `t_p_course` (
 CREATE TABLE `t_p_requirement` (
       `id` BIGINT(20) NOT NULL,
       `professional_id` BIGINT(20) NOT NULL COMMENT '专业ID',
+      `code` VARCHAR(50) NOT NULL COMMENT '毕业要求code',
       `name` VARCHAR(50) NOT NULL COMMENT '毕业要求',
       `node_count` INT NULL COMMENT '节点数量',
       `sort_num` INT NULL COMMENT '排序值',

distributed-print/src/main/java/com/qmth/distributed/print/api/TPProfessionalController.java

@@ -62,7 +62,7 @@ public class TPProfessionalController {
     @ApiOperation(value = "新增")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "新增", response = Boolean.class)})
-    public Result save(@ApiParam(value = "专业对象") @RequestParam(required = false) TPProfessional tpProfessional) {
+    public Result save(@RequestBody TPProfessional tpProfessional) {
         return ResultUtil.ok(tpProfessionalService.saveData(tpProfessional));
     }
 
@@ -112,7 +112,7 @@ public class TPProfessionalController {
     @ApiOperation(value = "毕业要求-新增/编辑")
     @RequestMapping(value = "/requirement/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = Boolean.class)})
-    public Result saveRequirement(@ApiParam(value = "专业要求对象", required = true) @RequestParam TPRequirement tpRequirement) {
+    public Result saveRequirement(@RequestBody TPRequirement tpRequirement) {
         return ResultUtil.ok(tpRequirementService.saveRequirement(tpRequirement));
     }
 
@@ -123,6 +123,13 @@ public class TPProfessionalController {
         return ResultUtil.ok(tpRequirementService.saveSort(requirementList));
     }
 
+    @ApiOperation(value = "毕业要求-删除")
+    @RequestMapping(value = "/requirement/remove", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "删除", response = Boolean.class)})
+    public Result removeRequirement(@ApiParam(value = "毕业要求ID", required = true) @RequestParam Long id) {
+        return ResultUtil.ok(tpRequirementService.removeRequirement(id));
+    }
+
     @ApiOperation(value = "毕业矩阵支撑-查询")
     @RequestMapping(value = "/matrix/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = MatrixDto.class)})

distributed-print/src/main/resources/application.properties

@@ -58,9 +58,9 @@ spring.activiti.history-level=audit
 #com.qmth.fss.private.server=/static/
 
 com.qmth.fss.public.config=/Users/xiaofei/qmth/temporary/zxzk/file-temp
-com.qmth.fss.public.server=http://localhost:7001
+com.qmth.fss.public.server=http://192.168.11.111:7001
 com.qmth.fss.private.config=/Users/xiaofei/qmth/temporary/zxzk/pdf-temp
-com.qmth.fss.private.server=http://localhost:7001
+com.qmth.fss.private.server=http://192.168.11.111:7001
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -76,7 +76,7 @@ public class SystemConstant {
     public static final String PREFIX_URL_NOTIFY = "/admin/print/notify";
     public static final String PREFIX_URL_GRADE = "/admin/grade";
     public static final String PREFIX_URL_COURSE_DEGREE = "/admin/course/degree";
-    public static final String PREFIX_URL_PROFESSIONAL = "/api/admin/professional/certification";
+    public static final String PREFIX_URL_PROFESSIONAL = "/admin/professional/certification";
 
     /**
      * 教研分析api前缀