From 1154be540f13919fc31a6ea3b12b8c07c1f262aa Mon Sep 17 00:00:00 2001
From: zhuxinru <zhuxinru@honeycombis.com>
Date: Thu, 12 Feb 2026 14:09:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=91=8A=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E6=8C=89tag1=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/SimulationTaskResultCurveResp.java   |  3 ++
 .../service/impl/DataAnalysisServiceImpl.java | 29 ++++++++++---------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java b/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java
index ce9c6963..3539e2c2 100644
--- a/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java
+++ b/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java
@@ -35,4 +35,7 @@ public class SimulationTaskResultCurveResp extends BaseResp {
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
+
+    @Schema(description = "排序号")
+    private String tag1;
 }
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 4a5bfedd..bb68cee7 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
@@ -143,8 +143,18 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
                         .eq(FileMetadataInfo::getTenantId, ThreadLocalContext.getTenantId())
                         .isNull(FileMetadataInfo::getDeletedAt)
                         .list();
-                List<FileMetadataInfo> sortedList = fileMetadataInfoList.stream()
-                        .sorted(Comparator.comparing(FileMetadataInfo::getTag1,
+                PageInfo<FileMetadataInfo> page = new PageInfo<>(fileMetadataInfoList);
+                long total = page.getTotal();
+
+                List<Long> fileIdList = fileMetadataInfoList.stream().map(FileMetadataInfo::getId).toList();
+                List<SimulationTaskResultCurveResp> finalResultList = hierarchyHelper.processFileHierarchy(
+                        fileIdList,
+                        SimulationTaskResultCurveResp.class,
+                        FileMetadataHierarchyHelper::setFileHierarchy
+                );
+
+                List<SimulationTaskResultCurveResp> sortedList = finalResultList.stream()
+                        .sorted(Comparator.comparing(SimulationTaskResultCurveResp::getTag1,
                                 Comparator.nullsLast((tag1, tag2) -> {
                                     try {
                                         int num1 = Integer.parseInt(tag1.trim());
@@ -154,20 +164,11 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
                                         return tag1.compareTo(tag2);
                                     }
                                 })))
-                        .collect(Collectors.toList());
-                PageInfo<FileMetadataInfo> page = new PageInfo<>(sortedList);
-                long total = page.getTotal();
+                        .toList();
 
-                List<Long> fileIdList = sortedList.stream().map(FileMetadataInfo::getId).toList();
-                List<SimulationTaskResultCurveResp> finalResultList = hierarchyHelper.processFileHierarchy(
-                        fileIdList,
-                        SimulationTaskResultCurveResp.class,
-                        FileMetadataHierarchyHelper::setFileHierarchy
-                );
-
-                PageInfo<SimulationTaskResultCurveResp> page1 = new PageInfo<>(finalResultList);
+                PageInfo<SimulationTaskResultCurveResp> page1 = new PageInfo<>(sortedList);
                 page1.setTotal(total);
-                return PageUtils.getJsonObjectSdmResponse(finalResultList, page1);
+                return PageUtils.getJsonObjectSdmResponse(sortedList, page1);
             }
         }
         return PageUtils.getJsonObjectSdmResponse(new ArrayList<>(), new PageInfo<>());