From 10c2a655338b5ed18a98d4982cd151280df38c85 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Thu, 14 Mar 2024 11:32:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97PMS=E7=AE=97=E6=B3=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RUploadEvaluationDataDServiceImpl.java | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java
index 7a644ab0f..ae565e663 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java
@@ -393,16 +393,19 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
                     List<String> l2 = voltageMap.get(key).stream().map(PmsMidLedger::getId).collect(Collectors.toList());
                     voltageChild.setVoltageLevel(key);
                     voltageChild.setOnlineBusNum(l2.size());
-                    //这边没法直接通过电压等级来关联灿能母线，只能通过 Mid_Bus_Id 来关联
-                    List<GeneratrixWire> l3 = list1.stream().filter(o->l2.contains(o.getMidBusId())).collect(Collectors.toList());
-                    if (CollUtil.isNotEmpty(l3)){
-                        voltageChild.setMonitorBusNum(l3.size());
+                    //匹配wire母线表数量
+                    if (CollUtil.isNotEmpty(item.getBusBarIds())){
+                        List<GeneratrixWire> l3 = list1.stream().filter(o->item.getBusBarIds().contains(o.getId())).collect(Collectors.toList());
+                        if (CollUtil.isNotEmpty(l3)){
+                            voltageChild.setMonitorBusNum(l3.size());
+                        }
                     } else {
                         voltageChild.setMonitorBusNum(0);
                     }
                     voltageChild.setMonitorRate(voltageChild.getMonitorBusNum()*100.0/voltageChild.getOnlineBusNum());
                     childList.add(voltageChild);
-                    count = count + voltageChild.getMonitorBusNum();
+//                    count = count + voltageChild.getMonitorBusNum();
+                    count = voltageChild.getMonitorBusNum();
                 }
                 dto1.setAllMonitorBusNum(count);
                 dto1.setVoltageChild(childList);
@@ -444,9 +447,9 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
                     map.forEach((k,v)->{
                         BusBarDto.VoltageChild c1 = new BusBarDto.VoltageChild();
                         c1.setVoltageLevel(k);
-                        int monitorBusNum = v.stream().mapToInt(BusBarDto.VoltageChild::getMonitorBusNum).sum();
+                        int monitorBusNum = (int) v.stream().mapToDouble(BusBarDto.VoltageChild::getMonitorBusNum).average().getAsDouble();
                         c1.setMonitorBusNum(monitorBusNum);
-                        int online = v.stream().mapToInt(BusBarDto.VoltageChild::getOnlineBusNum).sum();
+                        int online = (int) v.stream().mapToDouble(BusBarDto.VoltageChild::getOnlineBusNum).average().getAsDouble();
                         c1.setOnlineBusNum(online);
                         c1.setMonitorRate(online==0.0?0:monitorBusNum*100.0/online);
                         children.add(c1);