流程消息改造

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

@@ -15,6 +15,7 @@ import com.qmth.teachcloud.exchange.common.bean.dto.flow.StandardFlowWorkMsg;
 import com.qmth.teachcloud.exchange.common.bean.dto.flow.ToDoTaskDto;
 import com.qmth.teachcloud.exchange.common.bean.dto.syssetting.SimpleObject;
 import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
+import com.qmth.teachcloud.exchange.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.exchange.common.service.CommonCacheService;
 import com.qmth.teachcloud.exchange.common.util.ResultUtil;
 import io.swagger.annotations.*;
@@ -51,6 +52,15 @@ public class GdpuMqController {
                                      @ApiParam(value = "签名串", required = true) @RequestHeader String secret,
                                      @ApiParam(value = "流程id", required = true) @RequestHeader String orunId) {
         log.info("appid:{},secret:{},orunId:{}", appid, secret, orunId);
+        if (Objects.isNull(appid) || Objects.equals(appid.trim(), "")) {
+            throw ExceptionResultEnum.PARAMS_ERROR.exception("appid为空");
+        }
+        if (Objects.isNull(secret) || Objects.equals(secret.trim(), "")) {
+            throw ExceptionResultEnum.PARAMS_ERROR.exception("secret为空");
+        }
+        if (Objects.isNull(orunId) || Objects.equals(orunId.trim(), "")) {
+            throw ExceptionResultEnum.PARAMS_ERROR.exception("流水号为空");
+        }
         Long flowId = null;
         if (Objects.nonNull(orunId)) {
             flowId = Long.parseLong(orunId.substring(4, orunId.length()));
@@ -96,8 +106,8 @@ public class GdpuMqController {
             processInfo.add(processInfoDTO);
         }
         JSONArray todoInfo = new JSONArray(); //待办信息
-        List<StandardFlowWorkMsg> standardFlowWorkMsgList = toDoTaskDto.getTodoTaskList();
-        for (StandardFlowWorkMsg s : standardFlowWorkMsgList) {
+        List<StandardFlowWorkMsg> todoTaskList = toDoTaskDto.getHandleMessageDto().getTodoTaskList();
+        for (StandardFlowWorkMsg s : todoTaskList) {
             TodoInfoDTO todoInfoDTO = new TodoInfoDTO();
             setTodoInfoDTO(todoInfoDTO, s);
             todoInfo.add(todoInfoDTO);
@@ -138,7 +148,8 @@ public class GdpuMqController {
     private void setProcessInfoDTO(ProcessInfoDTO processInfoDTO, ToDoTaskDto toDoTaskDto) {
 //        processInfoDTO.setSysAppId("LYOA");
 //        processInfoDTO.setOrunId("LYOA79ec0af89702d641d839d5bbb5e9073b0e4b");
-        List<StandardFlowWorkMsg> standardFlowWorkMsgList = toDoTaskDto.getTodoTaskList();
+        List<StandardFlowWorkMsg> standardFlowWorkMsgList = toDoTaskDto.getHandleMessageDto().getTodoTaskList();
+        ;
         List<String> userIdList = new LinkedList<>(), userNameList = new LinkedList<>();
         for (StandardFlowWorkMsg s : standardFlowWorkMsgList) {
             userIdList.add(String.valueOf(s.getUserId()));

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

@@ -20,6 +20,7 @@ public class FlowMqCacheUtil {
 
     public static void setSchoolId(Long flowId, Long schoolId) {
         redisUtil.set(RedisKeyHelper.flowIdCacheKey(flowId), FlowMqFieldEnum.schoolId.name(), schoolId);
+        setUpdateTime(flowId, System.currentTimeMillis());
     }
 
     public static Long getSchoolId(Long flowId) {
@@ -41,4 +42,12 @@ public class FlowMqCacheUtil {
     public static DoneTaskDto getDoneTask(Long flowId) {
         return (DoneTaskDto) redisUtil.get(RedisKeyHelper.flowIdCacheKey(flowId), FlowMqFieldEnum.donetask.name());
     }
+
+    public static void setUpdateTime(Long flowId, Long time) {
+        redisUtil.set(RedisKeyHelper.flowIdCacheKey(flowId), FlowMqFieldEnum.updateTime.name(), time);
+    }
+
+    public static Long getUpdateTime(Long flowId) {
+        return (Long) redisUtil.get(RedisKeyHelper.flowIdCacheKey(flowId), FlowMqFieldEnum.updateTime.name());
+    }
 }

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/bean/dto/flow/HandleMessageDto.java

@@ -15,33 +15,37 @@ import java.util.List;
 public class HandleMessageDto implements Serializable {
 
     @ApiModelProperty(value = "待办消息")
-    List<StandardFlowWorkMsg> standardFlowWorkMsgList;
+    List<StandardFlowWorkMsg> todoTaskList;
 
-    @ApiModelProperty(value = "消息详情")
-    StandardFlowViewMsg standardFlowViewMsg;
+//    @ApiModelProperty(value = "消息详情")
+//    StandardFlowViewMsg standardFlowViewMsg;
 
     public HandleMessageDto() {
 
     }
 
-    public HandleMessageDto(List<StandardFlowWorkMsg> standardFlowWorkMsgList, StandardFlowViewMsg standardFlowViewMsg) {
-        this.standardFlowWorkMsgList = standardFlowWorkMsgList;
-        this.standardFlowViewMsg = standardFlowViewMsg;
+    public HandleMessageDto(List<StandardFlowWorkMsg> todoTaskList) {
+        this.todoTaskList = todoTaskList;
     }
 
-    public List<StandardFlowWorkMsg> getStandardFlowWorkMsgList() {
-        return standardFlowWorkMsgList;
-    }
+//    public HandleMessageDto(List<StandardFlowWorkMsg> standardFlowWorkMsgList, StandardFlowViewMsg standardFlowViewMsg) {
+//        this.standardFlowWorkMsgList = standardFlowWorkMsgList;
+//        this.standardFlowViewMsg = standardFlowViewMsg;
+//    }
 
-    public void setStandardFlowWorkMsgList(List<StandardFlowWorkMsg> standardFlowWorkMsgList) {
-        this.standardFlowWorkMsgList = standardFlowWorkMsgList;
+    public List<StandardFlowWorkMsg> getTodoTaskList() {
+        return todoTaskList;
     }
 
-    public StandardFlowViewMsg getStandardFlowViewMsg() {
-        return standardFlowViewMsg;
+    public void setTodoTaskList(List<StandardFlowWorkMsg> todoTaskList) {
+        this.todoTaskList = todoTaskList;
     }
 
-    public void setStandardFlowViewMsg(StandardFlowViewMsg standardFlowViewMsg) {
-        this.standardFlowViewMsg = standardFlowViewMsg;
-    }
+//    public StandardFlowViewMsg getStandardFlowViewMsg() {
+//        return standardFlowViewMsg;
+//    }
+//
+//    public void setStandardFlowViewMsg(StandardFlowViewMsg standardFlowViewMsg) {
+//        this.standardFlowViewMsg = standardFlowViewMsg;
+//    }
 }

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/bean/dto/flow/StandardFlowViewMsg.java

@@ -1,16 +0,0 @@
-package com.qmth.teachcloud.exchange.common.bean.dto.flow;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.qmth.teachcloud.exchange.common.bean.result.flow.FlowViewResult;
-
-/**
- * @Description: 标准流程详情消息
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2023/6/14
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class StandardFlowViewMsg extends FlowViewResult {
-
-}

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/bean/dto/flow/ToDoTaskDto.java

@@ -3,7 +3,6 @@ package com.qmth.teachcloud.exchange.common.bean.dto.flow;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description: 流程消息dto
@@ -17,9 +16,6 @@ public class ToDoTaskDto implements Serializable {
     @ApiModelProperty(value = "流程信息")
     StandardFlowData flowData;
 
-    @ApiModelProperty(value = "待办消息")
-    List<StandardFlowWorkMsg> todoTaskList;
-
     @ApiModelProperty(value = "待办详情消息")
     HandleMessageDto handleMessageDto;
 
@@ -27,22 +23,8 @@ public class ToDoTaskDto implements Serializable {
 
     }
 
-    public ToDoTaskDto(StandardFlowData flowData, List<StandardFlowWorkMsg> todoTaskList) {
-        this.flowData = flowData;
-        this.todoTaskList = todoTaskList;
-    }
-
-    public ToDoTaskDto(StandardFlowData flowData, List<StandardFlowWorkMsg> todoTaskList, HandleMessageDto handleMessageDto) {
+    public ToDoTaskDto(StandardFlowData flowData, HandleMessageDto handleMessageDto) {
         this.flowData = flowData;
-        this.todoTaskList = todoTaskList;
-        this.handleMessageDto = handleMessageDto;
-    }
-
-    public HandleMessageDto getHandleMessageDto() {
-        return handleMessageDto;
-    }
-
-    public void setHandleMessageDto(HandleMessageDto handleMessageDto) {
         this.handleMessageDto = handleMessageDto;
     }
 
@@ -54,11 +36,11 @@ public class ToDoTaskDto implements Serializable {
         this.flowData = flowData;
     }
 
-    public List<StandardFlowWorkMsg> getTodoTaskList() {
-        return todoTaskList;
+    public HandleMessageDto getHandleMessageDto() {
+        return handleMessageDto;
     }
 
-    public void setTodoTaskList(List<StandardFlowWorkMsg> todoTaskList) {
-        this.todoTaskList = todoTaskList;
+    public void setHandleMessageDto(HandleMessageDto handleMessageDto) {
+        this.handleMessageDto = handleMessageDto;
     }
 }

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/enums/flow/FlowMqFieldEnum.java

@@ -14,7 +14,9 @@ public enum FlowMqFieldEnum {
 
     todotask("待办"),
 
-    donetask("已办");
+    donetask("已办"),
+
+    updateTime("更新时间");
 
     private String title;