Merge remote-tracking branch 'origin/main'

common/src/main/java/com/sdm/common/entity/enums/MessageTemplateEnum.java

@@ -0,0 +1,36 @@
+package com.sdm.common.entity.enums;
+
+/**
+ * 消息通知模板枚举
+ */
+public enum MessageTemplateEnum {
+
+    TASK_ISSUE("任务通知", "收到一条下发的新任务：%s，请前去[任务管理-我执行的]进行处理"),
+    HPC_START("作业通知", "作业已发起"),
+    HPC_END("作业通知", "作业已结束")
+    ;
+
+    private final String title;
+    private final String content;
+
+    MessageTemplateEnum(String title, String content) {
+        this.title = title;
+        this.content = content;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * 获取模板内容（含参数替换）
+     */
+    public String getContent(String taskName) {
+        return String.format(content, taskName);
+    }
+
+}

common/src/main/java/com/sdm/common/entity/req/capability/FlowNodeDto.java

@@ -1,6 +1,7 @@
 package com.sdm.common.entity.req.capability;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sdm.common.entity.flowable.dto.NodeDetailInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -59,4 +60,7 @@ public class FlowNodeDto {
     private LocalDateTime updateTime;
 
     private List<FlowNodeDto> flowNodeDtoList;
+
+    @Schema(description = "节点详细信息 来自flowable")
+    private NodeDetailInfo nodeDetailInfo;
 }

common/src/main/java/com/sdm/common/feign/impl/flowable/FlowableClientFeignClientImpl.java

@@ -50,10 +50,10 @@ public class FlowableClientFeignClientImpl implements IFlowableFeignClient {
     }
 
     @Override
-    public SdmResponse saveParamsByDefinitionId(String processDefinitionId, String nodeId, Map<String, Object> params) {
+    public SdmResponse saveParamsByDefinitionId(String processDefinitionId, String nodeId, String runId, Map<String, Object> params) {
         SdmResponse response;
         try {
-            response = flowableFeignClient.saveParamsByDefinitionId(processDefinitionId, nodeId, params);
+            response = flowableFeignClient.saveParamsByDefinitionId(processDefinitionId, nodeId, runId, params);
             log.info("保存节点参数："+ response);
             return response;
         } catch (Exception e) {
@@ -76,10 +76,10 @@ public class FlowableClientFeignClientImpl implements IFlowableFeignClient {
     }
 
     @Override
-    public SdmResponse<ProcessInstanceDetailResponse> getProcessAndNodeDetailByInstanceId(String processDefinitionId,String processInstanceId) {
+    public SdmResponse<ProcessInstanceDetailResponse> getProcessAndNodeDetailByInstanceId(String processDefinitionId,String processInstanceId,String runId) {
         SdmResponse<ProcessInstanceDetailResponse> response;
         try {
-            response = flowableFeignClient.getProcessAndNodeDetailByInstanceId(processDefinitionId,processInstanceId);
+            response = flowableFeignClient.getProcessAndNodeDetailByInstanceId(processDefinitionId,processInstanceId,runId);
             log.info("查询流程状态以及节点状态："+ response);
             return response;
         } catch (Exception e) {

common/src/main/java/com/sdm/common/feign/impl/system/MessageFeignClientImpl.java

@@ -0,0 +1,36 @@
+package com.sdm.common.feign.impl.system;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.req.system.SendMsgReq;
+import com.sdm.common.feign.inter.system.IMessageFeignClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Optional;
+
+
+@Slf4j
+@Component
+public class MessageFeignClientImpl implements IMessageFeignClient {
+
+    @Autowired
+    private IMessageFeignClient messageFeignClient;
+
+    @Override
+    public SdmResponse sendMessage(SendMsgReq req) {
+        SdmResponse response=null ;
+        try {
+            response = messageFeignClient.sendMessage(req);
+            if(response==null || !response.isSuccess()){
+                log.error("sendMessage failed response:{}", JSONObject.toJSONString(Optional.ofNullable(response)));
+                return SdmResponse.failed("发送消息通知失败");
+            }
+        } catch (Exception e) {
+            log.error("sendMessage error response:{}", JSONObject.toJSONString(Optional.ofNullable(response)));
+            return SdmResponse.failed("发送消息通知异常");
+        }
+        return response;
+    }
+}

common/src/main/java/com/sdm/common/feign/inter/flowable/IFlowableFeignClient.java

@@ -26,11 +26,11 @@ public interface IFlowableFeignClient {
     SdmResponse<DeployFlowableResp> deploy(@RequestBody ProcessDefinitionDTO processDTO);
 
     @PostMapping("/process/saveParamsByDefinitionId")
-    SdmResponse saveParamsByDefinitionId(@RequestParam String processDefinitionId, @RequestParam String nodeId, @RequestBody Map<String, Object> params);
+    SdmResponse saveParamsByDefinitionId(@RequestParam String processDefinitionId, @RequestParam String nodeId, @RequestParam String runId,@RequestBody Map<String, Object> params);
 
     @PostMapping("/process/updateNodeParamProcessInstanceId")
     SdmResponse updateNodeParamProcessInstanceId(@RequestParam String processDefinitionId, @RequestParam String processInstanceId);
 
     @GetMapping("/process/getProcessAndNodeDetailByInstanceId")
-     SdmResponse<ProcessInstanceDetailResponse> getProcessAndNodeDetailByInstanceId(@RequestParam String processDefinitionId,@RequestParam(required = false) String processInstanceId);
+    SdmResponse<ProcessInstanceDetailResponse> getProcessAndNodeDetailByInstanceId(@RequestParam String processDefinitionId,@RequestParam(required = false) String processInstanceId,@RequestParam String runId);
 }