From 34b76fe7ff640bd71cffe87df145c1b900f3f64a Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Wed, 6 Mar 2024 11:16:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97=E8=B6=85=E9=AB=98=E5=8E=8Bbu?=
 =?UTF-8?q?g=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysql/dim/impl/RDimBusbarHarmnicDPOServiceImpl.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimBusbarHarmnicDPOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimBusbarHarmnicDPOServiceImpl.java
index 232c79db0..04c1ff558 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimBusbarHarmnicDPOServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimBusbarHarmnicDPOServiceImpl.java
@@ -153,6 +153,7 @@ public class RDimBusbarHarmnicDPOServiceImpl extends MppServiceImpl<RDimBusbarHa
                         rDimBusbarHarmnicDPO.setStatisDate(localDate);
                         rDimBusbarHarmnicDPO.setTargetType(dictData.getId());
                         rDimBusbarHarmnicDPO.setBusbarId(busbar.getLineId());
+                        rDimBusbarHarmnicDPO.setPowerId(busbar.getPowerrId());
                         rDimBusbarHarmnicDPO.setLevel(1);
                         rDimBusbarHarmnicDPO.setMonitorTag(busbar.getMonitorTag());
                         rDimBusbarHarmnicDPO.setVoltageLevel(busbar.getVoltageLevel());
@@ -165,6 +166,7 @@ public class RDimBusbarHarmnicDPOServiceImpl extends MppServiceImpl<RDimBusbarHa
                         }
 
                         rDimBusbarHarmnicDPO.setLimitCount(eventBusbarsCount(dictData,rMpEventDetailDPO));
+                        rDimBusbarHarmnicDPO.setStatisCount(0);
                         rDimBusbarHarmnicDPOList.add(rDimBusbarHarmnicDPO);
                     });
 
@@ -193,9 +195,9 @@ public class RDimBusbarHarmnicDPOServiceImpl extends MppServiceImpl<RDimBusbarHa
                             rDimStationHarmnicDPO.setTargetType(targetType);
                             rDimStationHarmnicDPO.setStationId(powerId);
                             rDimStationHarmnicDPO.setLevel(level);
-                            int sum = map3.stream().mapToInt(RDimBusbarHarmnicDPO::getStatisCount).sum();
+                            int sum = map3.stream().map(o->Objects.isNull(o.getStatisCount())?0:o.getStatisCount()).mapToInt(p->p).sum();
                             rDimStationHarmnicDPO.setStatisCount(sum);
-                            int limitSum = map3.stream().mapToInt(RDimBusbarHarmnicDPO::getLimitCount).sum();
+                            int limitSum = map3.stream().map(o->Objects.isNull(o.getLimitCount())?0:o.getLimitCount()).mapToInt(p->p).sum();
                             rDimStationHarmnicDPO.setLimitCount(limitSum);
                             rDimStationHarmnicDPO.setVoltageLevel(data.stream().filter(temp->Objects.equals(temp.getPowerId(),powerId)).map(PmsStatationStatInfoDTO::getPowerVoltageLevel).findFirst().orElse("3.14159"));
                             rDimStationHarmnicDPOList.add(rDimStationHarmnicDPO);