From fc6dedfabd4d7f78d9186cfc409ea6541ebcc4c0 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Mon, 11 Jul 2022 09:19:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AE=8C=E6=95=B4=E6=80=A7?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IntegrityServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 {