集成CID仿真评审流

common/src/main/java/com/sdm/common/entity/req/system/LaunchApproveReq.java

@@ -1,39 +1,63 @@
 package com.sdm.common.entity.req.system;
 
-public class LaunchApproveReq {
+import com.sdm.common.entity.bo.BaseBean;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.bind.DefaultValue;
 
 
+public class LaunchApproveReq extends BaseBean {
+
+    public LaunchApproveReq( ) {
+        init();
+    }
 
     public int id;
 
+    @Schema(description = "CID生成的流程ID",defaultValue = "")
+    public String cidFlowId;
 
-    public String cidFlowId; //CID生成的流程ID
+    @Schema(description = "审批类型 1：仿真地图审批 2：知识库审批",defaultValue = "0")
+    @Value("10")
+    public int approveType;
 
-    public int approveType; //审批类型 1：仿真地图审批 2：知识库审批
+    @Schema(description = "评审动作 1：新增 2：修改 3：删除",defaultValue = "0")
+    public int approveAction;
 
-    public int approveAction; //评审动作 1：新增 2：修改 3：删除
+    @Schema(description = "审批内容",defaultValue = " ")
+    public String approveContents;
 
-    public String approveContents = ""; //审批内容
+    @Schema(description = "审批主题",defaultValue = "")
+    public String approveTitle;
 
-    public String approveTitle; //审批主题
+    @Schema(description = "审批状态 1: 审批中 2：审批通过 3：审批不通过",defaultValue = "1")
+    public int approveStatus ;
 
-    public int approveStatus = 1; //审批状态 1: 审批中 2：审批通过 3：审批不通过
+    @Schema(description = "审批描述",defaultValue = "")
+    public String comment ;
 
-    public String comment = ""; //审批描述
+    @Schema(description = "租户ID",defaultValue = "0")
+    public long tenantId;
 
-    public long tenantId = 0; //租户ID
+    @Schema(description = "审批回复URL",defaultValue = "")
+    public String replyUrl;
 
-    public String replyUrl; //审批回复URL
-
-    public String templateName; //模版名称
+    @Schema(description = "模版名称",defaultValue = "")
+    public String templateName;
 
+    @Schema(description = "评审流程模版ID",defaultValue = "")
     public String templateId; //评审流程模版ID
 
-    public int replyStatus = 0; //审批回复状态 0：未回复 1：已回复
+    @Schema(description = "审批回复状态 0：未回复 1：已回复",defaultValue = "0")
+    public int replyStatus = 0;
 
-    public long userId = 0; //用户ID
+    @Schema(description = "用户ID",defaultValue = "0")
+    public long userId ;
 
-    public String creator; //审批创建者
+    @Schema(description = "审批创建者",defaultValue = "")
+    public String creator;
 
-    public String createTime; //审批创建时间
+    @Schema(description = "审批创建时间")
+    public String createTime;
 }

task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java

@@ -2,6 +2,7 @@ package com.sdm.task.controller;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.req.system.LaunchApproveReq;
 import com.sdm.task.model.entity.TaskPoolUpdateBean;
 import com.sdm.task.service.ISimulationTaskPoolService;
 import jakarta.servlet.http.HttpServletResponse;
@@ -86,6 +87,13 @@ public class SimuluationTaskPoolController {
         return service.getSimulationPoolTasks(poolName,version);
     }
 
+    @PostMapping(value = "/approveHandleNotice")
+    @ResponseBody
+    SdmResponse receiveApproveNotice(@RequestBody LaunchApproveReq req)
+    {
+        return service.handleApproveNotice(req);
+    }
+
 
 }
 

task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java

@@ -32,5 +32,5 @@ public interface ISimulationTaskPoolService {
 
     SdmResponse exportTaskPool(HttpServletResponse httpServletResponse,JSONObject jsonObject);
 
-    SdmResponse handleApproveNotice(LaunchApproveReq req, int status);
+    SdmResponse handleApproveNotice(LaunchApproveReq req);
 }

task/src/main/resources/application-dev.yml

@@ -104,5 +104,7 @@ lombok:
 file:
   rootPath: /data/home/sdm
   scriptPath : /opt/script
+approve:
+  replyUrl: http:192.168.65.161:7102/simulation/task/taskpool/approveHandleNotice
 #logging:
 #  config: ./config/logback.xml