diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java index 48e35905b..1df990980 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java @@ -92,6 +92,21 @@ public class IntegrityServiceImpl implements IntegrityService { dealAverageAndChildrenData(subBaseInfo, lineBaseInfo, true); //处理供电公司 dealAverageAndChildrenData(gdBaseInfo, subBaseInfo, false); + /** + * ---------------------------------- + * 处理顶层数据 + * xy + */ + integrityTemp.setLineData(lineBaseInfo); + double averageData = lineBaseInfo.stream().filter(integrityVO1 -> integrityVO1.getIntegrityData() != 3.14159) + .mapToDouble(IntegrityVO::getIntegrityData) + .average() + .orElse(3.14159); + integrityTemp.setIntegrityData(averageData); + /** + * 结束 + * ---------------------------------- + */ if (integrityParam.getStatisticalType().getCode().equalsIgnoreCase(StatisticsEnum.POWER_NETWORK.getCode())) { integrityTemp.setChildren(gdBaseInfo); } else {