ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2025-10-28 10:31:39 +08:00
parent 02c8164b7e
commit 40e39d651b
1 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
View File

@@ -1806,38 +1806,39 @@ public class ResultServiceImpl implements IResultService {
} }
// 统计数据 // 统计数据
List<ContrastNonHarmonicResult> statisticsNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, dataType.getValue(), monitorId, null); if (ObjectUtil.isNotNull(dataType)) {
Map<Integer, List<ContrastNonHarmonicResult>> statisticsNumNonHarmonicMap = statisticsNonHarmonicResults.stream() List<ContrastNonHarmonicResult> statisticsNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, dataType.getValue(), monitorId, null);
.sorted(Comparator.comparing(ContrastNonHarmonicResult::getNum)) Map<Integer, List<ContrastNonHarmonicResult>> statisticsNumNonHarmonicMap = statisticsNonHarmonicResults.stream()
.collect(Collectors.groupingBy(ContrastNonHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList())); .sorted(Comparator.comparing(ContrastNonHarmonicResult::getNum))
.collect(Collectors.groupingBy(ContrastNonHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
List<ContrastHarmonicResult> statisticsHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, dataType.getValue(), monitorId, null); List<ContrastHarmonicResult> statisticsHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, dataType.getValue(), monitorId, null);
Map<Integer, List<ContrastHarmonicResult>> statisticsNumHarmonicMap = statisticsHarmonicResults.stream() Map<Integer, List<ContrastHarmonicResult>> statisticsNumHarmonicMap = statisticsHarmonicResults.stream()
.sorted(Comparator.comparing(ContrastHarmonicResult::getNum)) .sorted(Comparator.comparing(ContrastHarmonicResult::getNum))
.collect(Collectors.groupingBy(ContrastHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList())); .collect(Collectors.groupingBy(ContrastHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
Map<Integer, List<Integer>> statisticsNumResutMap = new TreeMap<>(); Map<Integer, List<Integer>> statisticsNumResutMap = new TreeMap<>();
statisticsNumNonHarmonicMap.forEach((num, resultList) -> { statisticsNumNonHarmonicMap.forEach((num, resultList) -> {
statisticsNumResutMap.put(num, resultList.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList())); statisticsNumResutMap.put(num, resultList.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
}); });
statisticsNumHarmonicMap.forEach((num, resultList) -> { statisticsNumHarmonicMap.forEach((num, resultList) -> {
List<Integer> list = statisticsNumResutMap.getOrDefault(num, new ArrayList<>()); List<Integer> list = statisticsNumResutMap.getOrDefault(num, new ArrayList<>());
list.addAll(resultList.stream().map(ContrastHarmonicResult::getResultFlag).distinct().collect(Collectors.toList())); list.addAll(resultList.stream().map(ContrastHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
statisticsNumResutMap.put(num, list); statisticsNumResutMap.put(num, list);
}); });
DataSourceEnum finalDataType = dataType; DataSourceEnum finalDataType = dataType;
statisticsNumResutMap.forEach((num, resultList) -> { statisticsNumResutMap.forEach((num, resultList) -> {
List<DataSourceResultVO> dataSourceResultVOList = new ArrayList<>(); List<DataSourceResultVO> dataSourceResultVOList = new ArrayList<>();
DataSourceResultVO realDataSourceResultVO = new DataSourceResultVO(); DataSourceResultVO realDataSourceResultVO = new DataSourceResultVO();
realDataSourceResultVO.setDataSourceCode(finalDataType.getValue()); realDataSourceResultVO.setDataSourceCode(finalDataType.getValue());
realDataSourceResultVO.setDataSourceName(finalDataType.getMsg()); realDataSourceResultVO.setDataSourceName(finalDataType.getMsg());
realDataSourceResultVO.setCheckResult(StorageUtil.getInteger(resultList)); realDataSourceResultVO.setCheckResult(StorageUtil.getInteger(resultList));
dataSourceResultVOList.add(realDataSourceResultVO); dataSourceResultVOList.add(realDataSourceResultVO);
result.put(num, dataSourceResultVOList);
});
result.put(num, dataSourceResultVOList);
});
}
return result; return result;
} }