From 7552dcb652e7bfe082c386bbb9db354b58649f72 Mon Sep 17 00:00:00 2001
From: gulongcheng <474084054@qq.com>
Date: Mon, 8 Dec 2025 10:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/inter/data/IDataAnalysisFeignClient.java       | 2 +-
 .../com/sdm/data/controller/DataAnalysisController.java  | 4 +++-
 .../sdm/data/service/impl/DataAnalysisServiceImpl.java   | 9 +++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/com/sdm/common/feign/inter/data/IDataAnalysisFeignClient.java b/common/src/main/java/com/sdm/common/feign/inter/data/IDataAnalysisFeignClient.java
index 50750935..b3c99382 100644
--- a/common/src/main/java/com/sdm/common/feign/inter/data/IDataAnalysisFeignClient.java
+++ b/common/src/main/java/com/sdm/common/feign/inter/data/IDataAnalysisFeignClient.java
@@ -13,5 +13,5 @@ import java.util.List;
 @FeignClient(name = "data",contextId = "dataAnalysisFeignClient")
 public interface IDataAnalysisFeignClient {
     @PostMapping("/dataAnalysis/getSimulationTaskFile")
-    public SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> getSimulationTaskFile(@RequestBody GetSimulationTaskFileReq getSimulationTaskFileReq);
+    SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> getSimulationTaskFile(@RequestBody GetSimulationTaskFileReq getSimulationTaskFileReq);
 }
diff --git a/data/src/main/java/com/sdm/data/controller/DataAnalysisController.java b/data/src/main/java/com/sdm/data/controller/DataAnalysisController.java
index 10a9644a..600cad0d 100644
--- a/data/src/main/java/com/sdm/data/controller/DataAnalysisController.java
+++ b/data/src/main/java/com/sdm/data/controller/DataAnalysisController.java
@@ -2,6 +2,8 @@ package com.sdm.data.controller;
 
 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 com.sdm.common.feign.inter.data.IDataAnalysisFeignClient;
 import com.sdm.data.service.IDataAnalysisService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -30,7 +32,7 @@ public class DataAnalysisController implements IDataAnalysisFeignClient {
      */
     @Operation(summary = "获取 simulationtTask的文件,文件类型： 1：模型文件 2：仿真报告 3：计算文件 4：曲线文件 5：云图文件")
     @PostMapping("/getSimulationTaskFile")
-    public SdmResponse getSimulationTaskFile(@RequestBody @Validated GetSimulationTaskFileReq getSimulationTaskFileReq) {
+    public SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> getSimulationTaskFile(@RequestBody @Validated GetSimulationTaskFileReq getSimulationTaskFileReq) {
         return dataAnalysisService.getSimulationTaskFile(getSimulationTaskFileReq);
     }
 
diff --git a/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java
index db156259..608818af 100644
--- a/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java
@@ -44,7 +44,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
     private IMinioService MinIOService;
 
     @Override
-    public SdmResponse getSimulationTaskFile(GetSimulationTaskFileReq getSimulationTaskFileReq) {
+    public SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> getSimulationTaskFile(GetSimulationTaskFileReq getSimulationTaskFileReq) {
         QueryBigFileReq queryBigFileReq = new QueryBigFileReq();
         BeanUtils.copyProperties(getSimulationTaskFileReq, queryBigFileReq);
         queryBigFileReq.setFileBizType(List.of(getSimulationTaskFileReq.getFileBizType()));
@@ -61,7 +61,12 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
         PageDataResp<List<FileStorage>> pageDataResp = searchResult.getData();
         List<FileStorage> data = pageDataResp.getData();
         if(CollectionUtils.isEmpty(data)) {
-            return SdmResponse.success();
+            List<SimulationTaskResultCurveResp> emptyData = new ArrayList<>();
+            PageInfo<FileMetadataInfo> emptyPageInfo =new PageInfo<>();
+            emptyPageInfo.setTotal(0);
+            emptyPageInfo.setPageNum(0);
+            emptyPageInfo.setPageSize(0);
+            return PageUtils.getJsonObjectSdmResponse(emptyData,emptyPageInfo);
         }
         List<Long> fileIdList = data.stream().map(FileStorage::getFileId).toList();