From d89e547ef30f7aa5ea37edd96ca61fe8a51192e3 Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Thu, 11 May 2023 15:14:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=80=E5=8C=97=E5=9C=B0=E5=9B=BE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/majornetwork/mapping/DistributionMonitorMapper.xml | 4 ++--
 .../device/pms/service/impl/SubstationExpendServiceImpl.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml
index c8d756ce4..1b974a615 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml
@@ -207,7 +207,7 @@ AND EXISTS (
     <select id="getOnlineRate" resultType="com.njcn.device.pms.pojo.dto.PmsSimpleDTO">
         SELECT
             pdm.Monitor_Sort name,
-            SUM(rmded.dev_effective_rate) doubleValue
+            IFNULL(SUM(rmded.dev_effective_rate),0)doubleValue
         FROM pms_distribution_monitor pdm
         LEFT JOIN r_mp_dev_evaluate_detail rmded ON pdm.Terminal_Id = rmded.device_id
         WHERE pdm.Terminal_Id IN
@@ -219,7 +219,7 @@ AND EXISTS (
     <select id="getIntegrity" resultType="com.njcn.device.pms.pojo.dto.PmsSimpleDTO">
         SELECT
             pdm.Monitor_Sort name,
-            SUM(romd.data_integrity_rate) doubleValue
+            IFNULL(SUM(romd.data_integrity_rate),0) doubleValue
         FROM pms_distribution_monitor pdm
         LEFT JOIN r_operating_monitor_d romd ON pdm.Monitor_Id = romd.measurement_point_id
         WHERE pdm.Monitor_Id IN
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java
index 72b5cabee..63dad73f3 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java
@@ -125,13 +125,13 @@ public class SubstationExpendServiceImpl extends ServiceImpl<SubstationExpendMap
 
         // 统计在线率
         List<PmsSimpleDTO> onlineRateStatistic =  distributionMonitorMapper.getOnlineRate(terminalIds);
-        double sum = onlineRateStatistic.stream().mapToDouble(PmsSimpleDTO::getDoubleValue).sum();
+        double sum = onlineRateStatistic.stream().mapToDouble(PmsSimpleDTO::getDoubleValue).sum()!=0?onlineRateStatistic.stream().mapToDouble(PmsSimpleDTO::getDoubleValue).sum():3.14159;
         onlineRateStatistic.forEach(dto -> dto.setDoubleValue(new BigDecimal(dto.getDoubleValue() * 100 / sum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
         ledgerStaticDTO.setTerminalStatistics(onlineRateStatistic);
 
         // 完整性
         List<PmsSimpleDTO> integrityStatistic =  distributionMonitorMapper.getIntegrity(terminalIds);
-        double s = integrityStatistic.stream().mapToDouble(PmsSimpleDTO::getDoubleValue).sum();
+        double s = integrityStatistic.stream().mapToDouble(PmsSimpleDTO::getDoubleValue).sum()!=0?integrityStatistic.stream().mapToDouble(PmsSimpleDTO::getDoubleValue).sum():3.14159;
         integrityStatistic.forEach(dto -> dto.setDoubleValue(new BigDecimal(dto.getDoubleValue() * 100 / s).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
         return ledgerStaticDTO;
     }