toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gulongcheng
2026-02-12 15:57:00 +08:00
parent 911967e64b 672645b332
commit 0ffa316aee
4 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java
View File

@@ -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<>());