From da3c5230bfd55242493649123c0da08e0300bba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 5 Mar 2024 10:54:12 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=B2=B3=E5=8C=97pms?=
 =?UTF-8?q?=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81=E4=B8=BB=E9=85=8D=E7=BD=91?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ploadPointStatisticalDataDServiceImpl.java | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
index 41c3dc4aa..63a7275db 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
@@ -120,10 +120,15 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
 
             List<LineDevGetDTO> otherMonitor = item.getLineBaseList().stream().filter(me->!otherIds.contains(me.getObjType())).collect(Collectors.toList());
 
+            List<LineDevGetDTO> temBaseList = item.getLineBaseList();
+            long monitorCount = temBaseList.stream().map(LineDevGetDTO::getPointId).distinct().count();
+            long devCount = temBaseList.stream().map(LineDevGetDTO::getDevId).distinct().count();
+
 
             mapKey.forEach((key, val) -> {
 
-                List<LineDevGetDTO> keyItem = item.getLineBaseList().stream().filter(o -> val.contains(o.getObjType())).collect(Collectors.toList());
+
+                List<LineDevGetDTO> keyItem = temBaseList.stream().filter(o -> val.contains(o.getObjType())).collect(Collectors.toList());
                 RUploadPointStatisticalDataD rUploadPointStatisticalDataD = new RUploadPointStatisticalDataD();
                 switch (key){
                     case "2100":
@@ -163,14 +168,14 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
 
 
                 long pointCount = keyItem.stream().map(LineDevGetDTO::getPointId).distinct().count();
-                long devCount = keyItem.stream().map(LineDevGetDTO::getDevId).distinct().count();
+                //long devCount = keyItem.stream().map(LineDevGetDTO::getDevId).distinct().count();
                 rUploadPointStatisticalDataD.setRunTerminalNum((int) devCount);
-                rUploadPointStatisticalDataD.setOnlineMonitorNum((int) pointCount);
-                rUploadPointStatisticalDataD.setRunMonitorNum((int) pointCount);
-                rUploadPointStatisticalDataD.setOnlineMonitorRate(pointCount == 0 ? 0d : BigDecimal.valueOf(rUploadPointStatisticalDataD.getOnlineMonitorNum() * 100.0 / rUploadPointStatisticalDataD.getRunMonitorNum()).setScale(4, RoundingMode.HALF_UP).doubleValue());
+                rUploadPointStatisticalDataD.setOnlineMonitorNum((int) monitorCount);
+                rUploadPointStatisticalDataD.setRunMonitorNum((int) monitorCount);
+                rUploadPointStatisticalDataD.setOnlineMonitorRate(monitorCount == 0 ? 0d : BigDecimal.valueOf(rUploadPointStatisticalDataD.getOnlineMonitorNum() * 100.0 / rUploadPointStatisticalDataD.getRunMonitorNum()).setScale(4, RoundingMode.HALF_UP).doubleValue());
 
 
-                    List<RStatIntegrityD> l3 = dataList.stream().filter(it -> keyItem.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()).contains(it.getLineIndex())).collect(Collectors.toList());
+                    List<RStatIntegrityD> l3 = dataList.stream().filter(it -> temBaseList.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()).contains(it.getLineIndex())).collect(Collectors.toList());
                     int due = l3.stream().mapToInt(RStatIntegrityD::getDueTime).sum();
                     int real = l3.stream().mapToInt(RStatIntegrityD::getRealTime).sum();
                     rUploadPointStatisticalDataD.setExpectCollectNum(due);
@@ -181,7 +186,7 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
                     } else {
                         rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(real * 100.0 / due).setScale(4, RoundingMode.HALF_UP).doubleValue());
                     }
-                    rUploadPointStatisticalDataD.setStationMonitorNum(l3.size());
+                    rUploadPointStatisticalDataD.setStationMonitorNum((int)pointCount);
 
 
 
@@ -208,14 +213,14 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
 
 
             long pointCount = otherMonitor.stream().map(LineDevGetDTO::getPointId).distinct().count();
-            long devCount = otherMonitor.stream().map(LineDevGetDTO::getDevId).distinct().count();
+            //long devCount = otherMonitor.stream().map(LineDevGetDTO::getDevId).distinct().count();
             rUploadPointStatisticalDataD.setRunTerminalNum((int) devCount);
-            rUploadPointStatisticalDataD.setOnlineMonitorNum((int) pointCount);
-            rUploadPointStatisticalDataD.setRunMonitorNum((int) pointCount);
-            rUploadPointStatisticalDataD.setOnlineMonitorRate(pointCount == 0 ? 0d : BigDecimal.valueOf(rUploadPointStatisticalDataD.getOnlineMonitorNum() * 100.0 / rUploadPointStatisticalDataD.getRunMonitorNum()).setScale(4, RoundingMode.HALF_UP).doubleValue());
+            rUploadPointStatisticalDataD.setOnlineMonitorNum((int) monitorCount);
+            rUploadPointStatisticalDataD.setRunMonitorNum((int) monitorCount);
+            rUploadPointStatisticalDataD.setOnlineMonitorRate(monitorCount == 0 ? 0d : BigDecimal.valueOf(rUploadPointStatisticalDataD.getOnlineMonitorNum() * 100.0 / rUploadPointStatisticalDataD.getRunMonitorNum()).setScale(4, RoundingMode.HALF_UP).doubleValue());
 
 
-                List<RStatIntegrityD> l3 = dataList.stream().filter(it -> otherMonitor.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()).contains(it.getLineIndex())).collect(Collectors.toList());
+                List<RStatIntegrityD> l3 = dataList.stream().filter(it -> temBaseList.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList()).contains(it.getLineIndex())).collect(Collectors.toList());
                 int due = l3.stream().mapToInt(RStatIntegrityD::getDueTime).sum();
                 int real = l3.stream().mapToInt(RStatIntegrityD::getRealTime).sum();
                 rUploadPointStatisticalDataD.setExpectCollectNum(due);
@@ -226,7 +231,7 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
                 } else {
                     rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(real * 100.0 / due).setScale(4, RoundingMode.HALF_UP).doubleValue());
                 }
-                rUploadPointStatisticalDataD.setStationMonitorNum(l3.size());
+                rUploadPointStatisticalDataD.setStationMonitorNum((int)pointCount);
 
             result.add(rUploadPointStatisticalDataD);