流程消息改造

cas/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.cas.exchange</groupId>
     <artifactId>cas-exchange</artifactId>
-    <version>2.0.0.2</version>
+    <version>2.0.0.3</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.teachcloud.exchange.service</groupId>
         <artifactId>teachcloud-exchange-service</artifactId>
-        <version>2.0.0.2</version>
+        <version>2.0.0.3</version>
     </parent>
 
     <dependencies>

cas/src/main/java/com/qmth/teachcloud/cas/mq/gdpu/api/GdpuMqController.java

@@ -62,7 +62,7 @@ public class GdpuMqController {
             throw ExceptionResultEnum.PARAMS_ERROR.exception("流水号为空");
         }
         Long flowId = Long.parseLong(orunId);
-        Long schoolId = FlowMqCacheUtil.getSchoolId(flowId);
+        Long schoolId = Long.parseLong((String) FlowMqCacheUtil.getSchoolId(flowId));
         Map<String, SimpleObject> mapSetting = commonCacheService.getSysSetting(schoolId);
 
         String appId = null, appSecret = null, sysAppId = null;
@@ -105,14 +105,16 @@ public class GdpuMqController {
         data.put("processInfo", processInfo);
 
         JSONArray todoInfo = new JSONArray(); //待办信息
-        List<StandardFlowWorkMsg> todoTaskList = toDoTaskDto.getHandleMessageDto().getTodoTaskList();
-        if (!CollectionUtils.isEmpty(todoTaskList)) {
-            for (StandardFlowWorkMsg s : todoTaskList) {
-                TodoInfoDTO todoInfoDTO = new TodoInfoDTO();
-                setTodoInfoDTO(todoInfoDTO, s);
-                todoInfo.add(todoInfoDTO);
+        if (Objects.nonNull(toDoTaskDto) && Objects.nonNull(toDoTaskDto.getHandleMessageDto())) {
+            List<StandardFlowWorkMsg> todoTaskList = toDoTaskDto.getHandleMessageDto().getTodoTaskList();
+            if (!CollectionUtils.isEmpty(todoTaskList)) {
+                for (StandardFlowWorkMsg s : todoTaskList) {
+                    TodoInfoDTO todoInfoDTO = new TodoInfoDTO();
+                    setTodoInfoDTO(todoInfoDTO, s);
+                    todoInfo.add(todoInfoDTO);
+                }
+                data.put("todoInfo", todoInfo);
             }
-            data.put("todoInfo", todoInfo);
         }
 //        JSONArray toreadInfo = new JSONArray(); //待阅信息
 //        if (orunId != null) {
@@ -153,32 +155,39 @@ public class GdpuMqController {
     private void setProcessInfoDTO(ProcessInfoDTO processInfoDTO, ToDoTaskDto toDoTaskDto) {
 //        processInfoDTO.setSysAppId("LYOA");
 //        processInfoDTO.setOrunId("LYOA79ec0af89702d641d839d5bbb5e9073b0e4b");
-        List<StandardFlowWorkMsg> standardFlowWorkMsgList = toDoTaskDto.getHandleMessageDto().getTodoTaskList();
-        List<String> userIdList = new LinkedList<>(), userNameList = new LinkedList<>();
-        if (!CollectionUtils.isEmpty(standardFlowWorkMsgList)) {
-            for (StandardFlowWorkMsg s : standardFlowWorkMsgList) {
-                userIdList.add(String.valueOf(s.getUserId()));
-                userNameList.add(s.getUserName());
+        if (Objects.nonNull(toDoTaskDto)) {
+            List<String> userIdList = new LinkedList<>(), userNameList = new LinkedList<>(), taskIdList = new LinkedList<>();
+            String taskName = null;
+            if (Objects.nonNull(toDoTaskDto.getHandleMessageDto())) {
+                List<StandardFlowWorkMsg> standardFlowWorkMsgList = toDoTaskDto.getHandleMessageDto().getTodoTaskList();
+                if (!CollectionUtils.isEmpty(standardFlowWorkMsgList)) {
+                    for (StandardFlowWorkMsg s : standardFlowWorkMsgList) {
+                        userIdList.add(s.getLoginName());
+                        userNameList.add(s.getUserName());
+                        taskIdList.add(String.valueOf(s.getTaskId()));
+                        taskName = s.getTaskName();
+                    }
+                }
             }
-        }
 
-        processInfoDTO.setSubject(toDoTaskDto.getFlowData().getName());
-        processInfoDTO.setCurrentNodeId(String.valueOf(toDoTaskDto.getFlowData().getId()));
-        processInfoDTO.setCurrentNodeName(toDoTaskDto.getFlowData().getName());
+            processInfoDTO.setSubject(toDoTaskDto.getFlowData().getName());
+            processInfoDTO.setCurrentNodeId(StringUtils.join(taskIdList, ","));
+            processInfoDTO.setCurrentNodeName(taskName);
 //        processInfoDTO.setStatus(standardFlowWorkMsgList.get(0).getStatus().name());
-        processInfoDTO.setStatus("Current");
-        processInfoDTO.setUserId(String.valueOf(toDoTaskDto.getFlowData().getCreateId())); //申请人ID
-        processInfoDTO.setUserName(toDoTaskDto.getFlowData().getUpdateName()); //申请人名称
-        processInfoDTO.setAuthor(StringUtils.join(userIdList, ",")); //当前审批人的账户ID（多个使用逗号分隔（示例：2007112, admin））
-        processInfoDTO.setAuthorCn(StringUtils.join(userNameList, ",")); //当前审批人的账户名称（多个使用逗号分隔（示例：2007112, admin））
-        processInfoDTO.setUrl(SystemConstant.GDPU_CAS_URL);
-        processInfoDTO.setMobileUrl(SystemConstant.GDPU_CAS_URL);
-        processInfoDTO.setDocAddTime(new Date());// "2022-07-25 02:36:00"
-        processInfoDTO.setDesc(toDoTaskDto.getFlowData().getName());
+            processInfoDTO.setStatus("Current");
+            processInfoDTO.setUserId(toDoTaskDto.getFlowData().getUpdateName()); //申请人ID
+            processInfoDTO.setUserName(toDoTaskDto.getFlowData().getUpdateName()); //申请人名称
+            processInfoDTO.setAuthor(StringUtils.join(userIdList, ",")); //当前审批人的账户ID（多个使用逗号分隔（示例：2007112, admin））
+            processInfoDTO.setAuthorCn(StringUtils.join(userNameList, ",")); //当前审批人的账户名称（多个使用逗号分隔（示例：2007112, admin））
+            processInfoDTO.setUrl(SystemConstant.GDPU_CAS_URL);
+            processInfoDTO.setMobileUrl(SystemConstant.GDPU_CAS_URL);
+            processInfoDTO.setDocAddTime(new Date());// "2022-07-25 02:36:00"
+            processInfoDTO.setDesc(toDoTaskDto.getFlowData().getName());
+        }
     }
 
     private void setTodoInfoDTO(TodoInfoDTO todoInfoDTO, StandardFlowWorkMsg standardFlowWorkMsg) {
-        todoInfoDTO.setUserId(String.valueOf(standardFlowWorkMsg.getUserId()));
+        todoInfoDTO.setUserId(standardFlowWorkMsg.getLoginName());
         todoInfoDTO.setUserName(standardFlowWorkMsg.getUserName());
         todoInfoDTO.setStartTime(DateUtil.format(new Date(standardFlowWorkMsg.getCreateTime()), SystemConstant.DEFAULT_DATE_PATTERN));
         todoInfoDTO.setOrunId(String.valueOf(standardFlowWorkMsg.getExecutionId()));
@@ -196,12 +205,12 @@ public class GdpuMqController {
         remarkInfoDTO.setStartTime(DateUtil.format(new Date(doneTaskDto.getCreateTime()), SystemConstant.DEFAULT_DATE_PATTERN));
         remarkInfoDTO.setEndTime(DateUtil.format(new Date(doneTaskDto.getCreateTime()), SystemConstant.DEFAULT_DATE_PATTERN));
         remarkInfoDTO.setActionName(doneTaskDto.getApproveOperation().name());
-        remarkInfoDTO.setUserId(String.valueOf(doneTaskDto.getApproveId()));
-        remarkInfoDTO.setUserName(doneTaskDto.getApproveUserName());
+        remarkInfoDTO.setUserId(doneTaskDto.getApproveUserName());
+        remarkInfoDTO.setUserName(doneTaskDto.getRealName());
         remarkInfoDTO.setOrunId(String.valueOf(doneTaskDto.getId()));
         remarkInfoDTO.setRemark(doneTaskDto.getApproveRemark());
-        remarkInfoDTO.setUrl("https://portal.lysky.com:6205/bpmui/#/formRender/run?docUnid=79ec0af89702d641d839d5bbb5e9073b0e4b");
-        remarkInfoDTO.setMobileUrl("https://portal.lysky.com:6205/bpmui/#/formRender/run?docUnid=79ec0af89702d641d839d5bbb5e9073b0e4b");
+        remarkInfoDTO.setUrl(SystemConstant.GDPU_CAS_URL);
+        remarkInfoDTO.setMobileUrl(SystemConstant.GDPU_CAS_URL);
     }
 
 //    private void setToReadInfoDTO(ToReadInfoDTO toReadInfoDTO) {

cas/src/main/java/com/qmth/teachcloud/cas/mq/gdpu/api/OpenMqController.java

@@ -51,7 +51,7 @@ public class OpenMqController {
         //发送广药流程
         if (Objects.nonNull(toDoTaskDto.getFlowData())) {
             this.sendFlowDataMq(basicSchool.getId(), String.valueOf(toDoTaskDto.getFlowData().getFlowId()));
-            FlowMqCacheUtil.setSchoolId(toDoTaskDto.getFlowData().getFlowId(), basicSchool.getId());
+            FlowMqCacheUtil.setSchoolId(toDoTaskDto.getFlowData().getFlowId(), String.valueOf(basicSchool.getId()));
             FlowMqCacheUtil.setToDoTask(toDoTaskDto.getFlowData().getFlowId(), toDoTaskDto);
         }
         return ResultUtil.ok(true);
@@ -71,7 +71,7 @@ public class OpenMqController {
         //发送广药流程
         if (Objects.nonNull(doneTaskDto)) {
             this.sendFlowDataMq(basicSchool.getId(), String.valueOf(doneTaskDto.getFlowId()));
-            FlowMqCacheUtil.setSchoolId(doneTaskDto.getFlowId(), basicSchool.getId());
+            FlowMqCacheUtil.setSchoolId(doneTaskDto.getFlowId(), String.valueOf(basicSchool.getId()));
             FlowMqCacheUtil.setDoneTask(doneTaskDto.getFlowId(), doneTaskDto);
         }
         return ResultUtil.ok(true);

cas/src/main/java/com/qmth/teachcloud/cas/mq/gdpu/cache/FlowMqCacheUtil.java

@@ -18,13 +18,13 @@ public class FlowMqCacheUtil {
 
     private static RedisUtil redisUtil = SpringContextHolder.getBean(RedisUtil.class);
 
-    public static void setSchoolId(Long flowId, Long schoolId) {
+    public static void setSchoolId(Long flowId, String schoolId) {
         redisUtil.set(RedisKeyHelper.flowIdCacheKey(flowId), FlowMqFieldEnum.schoolId.name(), schoolId);
         setUpdateTime(flowId, System.currentTimeMillis());
     }
 
-    public static Long getSchoolId(Long flowId) {
-        return (Long) redisUtil.get(RedisKeyHelper.flowIdCacheKey(flowId), FlowMqFieldEnum.schoolId.name());
+    public static String getSchoolId(Long flowId) {
+        return (String) redisUtil.get(RedisKeyHelper.flowIdCacheKey(flowId), FlowMqFieldEnum.schoolId.name());
     }
 
     public static void setToDoTask(Long flowId, ToDoTaskDto toDoTaskDto) {

eds/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.eds.exchange</groupId>
     <artifactId>eds-exchange</artifactId>
-    <version>2.0.0.2</version>
+    <version>2.0.0.3</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.teachcloud.exchange.service</groupId>
         <artifactId>teachcloud-exchange-service</artifactId>
-        <version>2.0.0.2</version>
+        <version>2.0.0.3</version>
     </parent>
 
     <dependencies>

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.teachcloud.exchange.service</groupId>
     <artifactId>teachcloud-exchange-service</artifactId>
-    <version>2.0.0.2</version>
+    <version>2.0.0.3</version>
     <packaging>pom</packaging>
 
     <modules>

teachcloud-exchange-common/pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.teachcloud.exchange.common</groupId>
     <artifactId>teachcloud-exchange-common</artifactId>
-    <version>2.0.0.2</version>
+    <version>2.0.0.3</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.qmth.teachcloud.exchange.service</groupId>
         <artifactId>teachcloud-exchange-service</artifactId>
-        <version>2.0.0.2</version>
+        <version>2.0.0.3</version>
     </parent>
 
     <dependencies>

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/bean/result/flow/WorkResult.java

@@ -117,6 +117,17 @@ public class WorkResult extends BaseFlowData implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     Long examId;
 
+    @ApiModelProperty(value = "登录工号")
+    String loginName;
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
     public Long getExamId() {
         return examId;
     }