fix:交付物审批改造

common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java

@@ -0,0 +1,41 @@
+package com.sdm.common.entity.resp.data;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 任务结果曲线响应对象
+ */
+@Data
+@Schema(description = "任务结果曲线响应对象")
+public class SimulationTaskResultCurveResp {
+    @Schema(description = "文件id")
+    private Long id;
+
+    @Schema(description = "文件原始名称")
+    private String originalName;
+
+    //极大值
+    @Schema(description = "极大值")
+    private Double maxValue;
+
+    //极小值
+    @Schema(description = "极小值")
+    private Double minValue;
+
+    //均值
+    @Schema(description = "均值")
+    private Double meanValue;
+
+    //创建时间
+    @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    //格式化后的文件大小
+    @Schema(description = "格式化后的文件大小")
+    private String formatFileSize;
+}

common/src/main/java/com/sdm/common/feign/impl/data/DataAnalysisFeignClientImpl.java

@@ -2,7 +2,9 @@ package com.sdm.common.feign.impl.data;
 
 import com.sdm.common.common.SdmResponse;
 import com.sdm.common.entity.req.data.GetSimulationTaskFileReq;
+import com.sdm.common.entity.resp.PageDataResp;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
+import com.sdm.common.entity.resp.data.SimulationTaskResultCurveResp;
 import com.sdm.common.feign.inter.data.IDataAnalysisFeignClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,8 +19,8 @@ public class DataAnalysisFeignClientImpl implements IDataAnalysisFeignClient {
     IDataAnalysisFeignClient dataAnalysisFeignClient;
 
     @Override
-    public SdmResponse getSimulationTaskFile(GetSimulationTaskFileReq getSimulationTaskFileReq) {
-        SdmResponse response;
+    public SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> getSimulationTaskFile(GetSimulationTaskFileReq getSimulationTaskFileReq) {
+        SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> response;
         try {
             response = dataAnalysisFeignClient.getSimulationTaskFile(getSimulationTaskFileReq);
             log.info("查询文件夹列表响应："+ response);

common/src/main/java/com/sdm/common/feign/impl/project/SimulationRunFeignClientImpl.java

@@ -0,0 +1,30 @@
+package com.sdm.common.feign.impl.project;
+
+import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.req.system.LaunchApproveReq;
+import com.sdm.common.entity.resp.AllNodeByProjectIdAndTypeResp;
+import com.sdm.common.feign.inter.project.ISimulationRunFeignClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Slf4j
+@Component
+public class SimulationRunFeignClientImpl implements ISimulationRunFeignClient {
+    @Autowired
+    ISimulationRunFeignClient simulationRunFeignClient;
+
+    @Override
+    public SdmResponse deliverableApproveCallback(LaunchApproveReq req) {
+        SdmResponse response;
+        try {
+            response = simulationRunFeignClient.deliverableApproveCallback(req);
+        } catch (Exception e) {
+            log.error("交付物审批回调失败", e);
+            return SdmResponse.failed("交付物审批回调失败");
+        }
+        return response;
+    }
+}

common/src/main/java/com/sdm/common/feign/inter/data/IDataAnalysisFeignClient.java

@@ -2,12 +2,16 @@ package com.sdm.common.feign.inter.data;
 
 import com.sdm.common.common.SdmResponse;
 import com.sdm.common.entity.req.data.GetSimulationTaskFileReq;
+import com.sdm.common.entity.resp.PageDataResp;
+import com.sdm.common.entity.resp.data.SimulationTaskResultCurveResp;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 @FeignClient(name = "data",contextId = "dataAnalysisFeignClient")
 public interface IDataAnalysisFeignClient {
     @PostMapping("/dataAnalysis/getSimulationTaskFile")
-    public SdmResponse getSimulationTaskFile(@RequestBody GetSimulationTaskFileReq getSimulationTaskFileReq);
+    public SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> getSimulationTaskFile(@RequestBody GetSimulationTaskFileReq getSimulationTaskFileReq);
 }

common/src/main/java/com/sdm/common/feign/inter/project/ISimulationNodeFeignClient.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(name = "project")
+@FeignClient(name = "project",contextId = "nodeFeignClient")
 public interface ISimulationNodeFeignClient {
     /**
      * 根据节点类型获取所有节点

common/src/main/java/com/sdm/common/feign/inter/project/ISimulationRunFeignClient.java

@@ -0,0 +1,16 @@
+package com.sdm.common.feign.inter.project;
+
+import com.sdm.common.common.SdmResponse;
+import com.sdm.common.entity.req.system.LaunchApproveReq;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+@FeignClient(name = "project",contextId = "runFeignClient")
+public interface ISimulationRunFeignClient {
+
+    @PostMapping("/run/deliverableApproveCallback")
+    SdmResponse deliverableApproveCallback(@RequestBody LaunchApproveReq req);
+
+}