配置文件修改

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

@@ -14,6 +14,7 @@ import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.business.enums.FlowModelEnum;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.entity.SysOrg;
@@ -151,10 +152,11 @@ public class ActivitiServiceImpl implements ActivitiService {
     public ProcessInstance flowStart(Map<String, Object> map) {
         BasicSchool basicSchool = (BasicSchool) ServletUtil.getRequestSchool();
         ProcessInstance processInstance = null;
+        Map<String, String> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
         //广东医科大学
-        if (Objects.equals(basicSchool.getCode(), FlowSchoolCodeEnum.GDYKDX.getCode())) {
+        if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY))) {
             processInstance = this.startActivity(SystemConstant.GDYKDX_FLOW_KEY, map);
-        } else if (Objects.equals(basicSchool.getCode(), FlowSchoolCodeEnum.JXZYYDX.getCode())) {//江西中医药大学
+        } else if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY))) {//江西中医药大学
             processInstance = this.startActivity(SystemConstant.JXZYY_FLOW_KEY, map);
         } else {
             throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
@@ -600,14 +602,15 @@ public class ActivitiServiceImpl implements ActivitiService {
                     break;
             }
         } else {//获取整个节点审批人
+            Map<String, String> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
             BasicSchool basicSchool = (BasicSchool) ServletUtil.getRequestSchool();
-            if (Objects.equals(basicSchool.getCode(), FlowSchoolCodeEnum.GDYKDX.getCode())) {
+            if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY))) {
                 if (Objects.isNull(courseCode) || Objects.equals(courseCode, "")) {
                     throw ExceptionResultEnum.ERROR.exception("课程编码为空");
                 }
                 flowTaskApprovePeopleResultList = getApproveUserAll(courseCode, flowTaskApprovePeopleResultList, SystemConstant.GDYKDX_FLOW_KEY);
                 flowTaskApprovePeopleAllResult = new FlowTaskApprovePeopleAllResult();
-            } else if (Objects.equals(basicSchool.getCode(), FlowSchoolCodeEnum.JXZYYDX.getCode())) {//江西中医药大学
+            } else if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY))) {//江西中医药大学
                 flowTaskApprovePeopleResultList = getApproveUserAll(courseCode, flowTaskApprovePeopleResultList, SystemConstant.JXZYY_FLOW_KEY);
                 flowTaskApprovePeopleAllResult = new FlowTaskApprovePeopleAllResult();
             } else {
@@ -834,14 +837,15 @@ public class ActivitiServiceImpl implements ActivitiService {
                     break;
             }
         } else {//获取整个节点审批人
+            Map<String, String> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
             List<ApproveUserResult> approveUserResultList = null;
             BasicSchool basicSchool = (BasicSchool) ServletUtil.getRequestSchool();
-            if (Objects.equals(basicSchool.getCode(), FlowSchoolCodeEnum.GDYKDX.getCode())) {
+            if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY))) {
                 if (Objects.isNull(courseCode) || Objects.equals(courseCode, "")) {
                     throw ExceptionResultEnum.ERROR.exception("课程编码为空");
                 }
                 approveUserResultList = sysUserService.findByRootApprove(courseCode, null, null, FlowApproveNameEnum.DIRECTOR);
-            } else if (Objects.equals(basicSchool.getCode(), FlowSchoolCodeEnum.JXZYYDX.getCode())) {//江西中医药大学
+            } else if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY))) {//江西中医药大学
                 approveUserResultList = sysUserService.findByJxzyyDirectorApprove(null, FlowApproveNameEnum.DIRECTOR);
             } else {
                 throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");

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

@@ -2,13 +2,10 @@ package com.qmth.distributed.print.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.ExamPaperStructure;
 import com.qmth.distributed.print.business.enums.ExamPaperStructureStatusEnum;
-import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.business.service.ExamPaperStructureService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -27,8 +24,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * @Description: 工作台 前端控制器

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

@@ -79,6 +79,8 @@ sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
+sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
+sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 org.center.url=https://solar.qmth.com.cn

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

@@ -79,6 +79,8 @@ sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
+sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-2
+sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-1
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 org.center.url=https://solar.qmth.com.cn

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

@@ -79,6 +79,8 @@ sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
 sys.config.sessionActive=4h
+sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-5
+sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-6
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 org.center.url=https://solar.qmth.com.cn

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

@@ -79,6 +79,8 @@ sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=false
 sys.config.sessionActive=4h
+sys.config.flowSchoolCodeMap.GdykdxPaperApprove=test-school-5
+sys.config.flowSchoolCodeMap.JxzyyPaperApprove=test-school-6
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 org.center.url=https://solar.qmth.com.cn

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

@@ -3,6 +3,7 @@ package com.qmth.teachcloud.common.contant;
 import com.qmth.boot.core.uid.service.UidService;
 import com.qmth.teachcloud.common.annotation.DBVerify;
 import com.qmth.teachcloud.common.bean.result.DBVerifyResult;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -364,7 +365,7 @@ public class SystemConstant {
             field.setAccessible(true); // 解除封装
             String fieldValue = String.valueOf(field.get(obj));
             DBVerify dbVerify = field.getAnnotation(DBVerify.class);
-            if (Objects.isNull(dbVerify)){
+            if (Objects.isNull(dbVerify)) {
                 continue;
             }
             String value = dbVerify.value();
@@ -390,4 +391,16 @@ public class SystemConstant {
         }
         return new DBVerifyResult(true, "成功");
     }
+
+    /**
+     * 获取流程学校code
+     *
+     * @return
+     */
+    public static Map<String, String> getFlowSchoolCodeMap() {
+        DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
+        Map<String, String> flowSchoolCodeMap = dictionaryConfig.sysDomain().getFlowSchoolCodeMap();
+        Optional.ofNullable(flowSchoolCodeMap).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置学校流程code"));
+        return flowSchoolCodeMap;
+    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/SysDomain.java

@@ -3,6 +3,7 @@ package com.qmth.teachcloud.common.domain;
 import java.io.Serializable;
 import java.time.Duration;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 系统配置
@@ -47,6 +48,16 @@ public class SysDomain implements Serializable {
 
     String loginAuthenUrl;
 
+    Map<String, String> flowSchoolCodeMap;
+
+    public Map<String, String> getFlowSchoolCodeMap() {
+        return flowSchoolCodeMap;
+    }
+
+    public void setFlowSchoolCodeMap(Map<String, String> flowSchoolCodeMap) {
+        this.flowSchoolCodeMap = flowSchoolCodeMap;
+    }
+
     public String getLoginAuthenUrl() {
         return loginAuthenUrl;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/FlowSchoolCodeEnum.java

@@ -1,53 +0,0 @@
-package com.qmth.teachcloud.common.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 学校流程code enum
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/11/10
- */
-public enum FlowSchoolCodeEnum {
-
-//    GDYKDX("广东医科大学", "gdpu"),
-//
-//    JXZYYDX("江西中医药大学", "jxutcm");
-
-    GDYKDX("广东医科大学", "test-school-5"),
-
-    JXZYYDX("江西中医药大学", "test-school-6");
-
-    private String title;
-
-    private String code;
-
-    private FlowSchoolCodeEnum(String title, String code) {
-        this.title = title;
-        this.code = code;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (FlowSchoolCodeEnum e : FlowSchoolCodeEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -375,8 +375,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             throw ExceptionResultEnum.ERROR.exception("找不到此课程信息");
         }
 
+        Map<String, String> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
         BasicSchool basicSchool = (BasicSchool) ServletUtil.getRequestSchool();
-        if (Objects.equals(basicSchool.getCode(), FlowSchoolCodeEnum.JXZYYDX.getCode())) {
+        if (Objects.equals(basicSchool.getCode(), flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY))) {
             List<ApproveUserResult> approveUserResultList = sysUserService.findByJxzyyDirectorApprove(null, FlowApproveNameEnum.TEACHER);
             if (Objects.nonNull(approveUserResultList) && approveUserResultList.size() > 0) {//说明是实施人员提交
                 List<BlurryUserDto> blurryUserDtoList = new ArrayList<>();