树形数据结构导出优化

project/src/main/java/com/sdm/project/controller/YAModelController.java

@@ -4,12 +4,14 @@ import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.sdm.common.common.SdmResponse;
 import com.sdm.common.entity.enums.NodeTypeEnum;
+import com.sdm.common.entity.req.data.GetSimulationTaskFileReq;
 import com.sdm.common.entity.req.data.UploadFilesReq;
 
 import com.sdm.common.entity.resp.PageDataResp;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
+import com.sdm.common.feign.impl.data.DataAnalysisFeignClientImpl;
+
 import com.sdm.common.feign.inter.data.IDataFeignClient;
-import com.sdm.common.utils.PageUtils;
 import com.sdm.project.common.KeyResultTypeEnum;
 import com.sdm.project.model.entity.SimulationRunKeyResult;
 import com.sdm.project.model.req.KeyResultReq;
@@ -33,6 +35,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 @RestController
@@ -43,6 +47,9 @@ public class YAModelController {
     @Autowired
     private IDataFeignClient dataFeignClient;
 
+    @Autowired
+    private DataAnalysisFeignClientImpl dataAnalysisFeignClient;
+
     @Resource
     INodeService nodeService;
 
@@ -84,10 +91,10 @@ public class YAModelController {
         BosimSaveNodeInfoRsp rsp = new BosimSaveNodeInfoRsp();
         if(uploadRespond.isSuccess())
         {
-            JSONObject data = (JSONObject) uploadRespond.getData();
+            LinkedHashMap data = (LinkedHashMap) uploadRespond.getData();
             rsp.setCode("200");
             rsp.setMessage("success");
-            long fileId = data.getLong("fileId");
+            int fileId = (int)data.get("fileId");
             rsp.getWorkRequest().add(String.valueOf(fileId));
         }
         return rsp;
@@ -125,10 +132,10 @@ public class YAModelController {
         BosimSaveNodeInfoRsp rsp = new BosimSaveNodeInfoRsp();
         if(uploadRespond.isSuccess())
         {
-            JSONObject data = (JSONObject) uploadRespond.getData();
+            HashMap data = (HashMap) uploadRespond.getData();
             rsp.setCode("200");
             rsp.setMessage("success");
-            long fileId = data.getLong("fileId");
+            int fileId = (int)data.get("fileId");
             rsp.getWorkRequest().add(String.valueOf(fileId));
         }
         return rsp;
@@ -268,6 +275,44 @@ public class YAModelController {
     }
 
 
+    /**
+     * 获取Task下模型文件信息
+     * @param outsideReq
+     * @return
+     */
+    @PostMapping("GetTaskModels")
+    public SdmResponse getTaskModels(@RequestBody  @Validated GetTaskSimulatinFileReq  outsideReq)
+    {
+        GetSimulationTaskFileReq req = new GetSimulationTaskFileReq();
+        req.setUuid(outsideReq.getTaskId());
+        req.setFileBizType(1);
+        req.setSize(outsideReq.getSize());
+        req.setCurrent(outsideReq.getCurrent());
+        return dataAnalysisFeignClient.getSimulationTaskFile(req);
+    }
+
+    /**
+     * 获取Task下报告文件信息
+     * @param outsideReq
+     * @return
+     */
+    @PostMapping("GetTaskReports")
+    public SdmResponse getTaskReports(@RequestBody  @Validated GetTaskSimulatinFileReq  outsideReq)
+    {
+        GetSimulationTaskFileReq req = new GetSimulationTaskFileReq();
+        req.setUuid(outsideReq.getTaskId());
+        req.setFileBizType(2);
+        req.setSize(outsideReq.getSize());
+        req.setCurrent(outsideReq.getCurrent());
+        return dataAnalysisFeignClient.getSimulationTaskFile(req);
+    }
+
+
+
+    public void downloadSimulationFile(long fileId)
+    {
+
+    }
 
     @PostMapping("syncCidProject")
     public BosimSaveProjectTaskRsp syncCidProject(@RequestBody @Validated SyncCidProjectReq req)

project/src/main/java/com/sdm/project/model/req/YA/GetTaskSimulatinFileReq.java

@@ -0,0 +1,22 @@
+package com.sdm.project.model.req.YA;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class GetTaskSimulatinFileReq {
+
+    @Schema(description = "项目ID")
+    @NotBlank(message = "项目ID不能为空")
+    private String taskId;
+
+    @Schema(description = "当前页")
+    @NotNull(message = "当前页不能为空")
+    private Integer current;
+
+    @Schema(description = "每页数据大小")
+    @NotNull(message = "显示页大小不能为空")
+    private Integer size;
+}