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