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 sortedList = fileMetadataInfoList.stream() - .sorted(Comparator.comparing(FileMetadataInfo::getTag1, + PageInfo page = new PageInfo<>(fileMetadataInfoList); + long total = page.getTotal(); + + List fileIdList = fileMetadataInfoList.stream().map(FileMetadataInfo::getId).toList(); + List finalResultList = hierarchyHelper.processFileHierarchy( + fileIdList, + SimulationTaskResultCurveResp.class, + FileMetadataHierarchyHelper::setFileHierarchy + ); + + List 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 page = new PageInfo<>(sortedList); - long total = page.getTotal(); + .toList(); - List fileIdList = sortedList.stream().map(FileMetadataInfo::getId).toList(); - List finalResultList = hierarchyHelper.processFileHierarchy( - fileIdList, - SimulationTaskResultCurveResp.class, - FileMetadataHierarchyHelper::setFileHierarchy - ); - - PageInfo page1 = new PageInfo<>(finalResultList); + PageInfo page1 = new PageInfo<>(sortedList); page1.setTotal(total); - return PageUtils.getJsonObjectSdmResponse(finalResultList, page1); + return PageUtils.getJsonObjectSdmResponse(sortedList, page1); } } return PageUtils.getJsonObjectSdmResponse(new ArrayList<>(), new PageInfo<>());