From 1f2d333924f607e0027e52b2f36db02515e6c279 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Thu, 27 Apr 2023 16:30:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../line/RMpMonitorEvaluateDServiceImpl.java  |  5 +----
 .../Impl/line/RMpPassRateDServiceImpl.java    | 11 +++++++++-
 .../line/ROperatingMonitorDServiceImpl.java   | 22 ++++++++++++++-----
 .../Impl/line/RStatAbnormalDServiceImpl.java  |  4 ++++
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
index 1865d9f8d..7438bd49e 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
@@ -63,10 +63,7 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
 
         indexLists.forEach (temp -> {
             LineDetailDataVO data = lineFeignClient.getLineDetailData (temp).getData ( );
-            if(Objects.isNull (data)){
-                System.out.println ( );
-                return;
-            }
+
             /*todo 统计间隔，电压等级取值方式后期提供融合版本接口获取不然pms，pqs系统取值方式不一样*/
             /*统计间隔*/
             Integer statisticalInterval = data.getTimeInterval ();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java
index cc3ca8f7f..f2f095e09 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java
@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Description:
@@ -74,17 +75,25 @@ public class RMpPassRateDServiceImpl extends MppServiceImpl<RMpPassRateDMapper,
                     eq ("measurement_point_id", temp).
                     eq ("DATE_FORMAT( data_date ,'%Y-%m-%d')", lineParam.getDataDate ( ));
             RMpMonitorEvaluateDPO one = rMpMonitorEvaluateDService.getOne (rMpMonitorEvaluateDPOQueryWrapper);
+            if (Objects.isNull(one)) {
+                return;
+            }
             queryWrapper.clear ( );
             queryWrapper.select ("freq_times", "v_dev_times").
                     eq ("measurement_point_id", temp).
                     eq ("DATE_FORMAT( data_date ,'%Y-%m-%d')", lineParam.getDataDate ( ));
             RMpPartHarmonicDetailD rMpPartHarmonicDetailD = rMpPartHarmonicDetailDMapper.selectOne (queryWrapper);
-
+            if (Objects.isNull(rMpPartHarmonicDetailD)) {
+                return;
+            }
             surplusHarmonicDetailDQueryWrapper.clear ( );
             surplusHarmonicDetailDQueryWrapper.select ("flicker_times").
                     eq ("measurement_point_id", temp).
                     eq ("DATE_FORMAT( data_date ,'%Y-%m-%d')", lineParam.getDataDate ( ));
             RMpSurplusHarmonicDetailD rMpSurplusHarmonicDetailD = rMpSurplusHarmonicDetailDMapper.selectOne (surplusHarmonicDetailDQueryWrapper);
+            if (Objects.isNull(rMpSurplusHarmonicDetailD)) {
+                return;
+            }
             RMpPassRateDPO rMpPassRateDPO = new RMpPassRateDPO ( );
             rMpPassRateDPO.setMeasurementPointId (temp);
             rMpPassRateDPO.setDataDate (date);
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java
index f70e3540d..f8f97baf0 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java
@@ -20,6 +20,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 
@@ -73,21 +74,32 @@ public class ROperatingMonitorDServiceImpl extends MppServiceImpl<ROperatingMoni
             rMpMonitorEvaluateDPO.setMeasurementPointId (temp);
             rMpMonitorEvaluateDPO.setDataDate (date);
             rMpMonitorEvaluateDPO = rMpMonitorEvaluateDService.selectByMultiId (rMpMonitorEvaluateDPO);
+            if (Objects.isNull(rMpMonitorEvaluateDPO)) {
+                return;
+            }
             RStatAbnormalDPO rStatAbnormalDPO = new RStatAbnormalDPO();
             rStatAbnormalDPO.setDataDate (date);
             rStatAbnormalDPO.setMeasurementPointId (temp);
             rStatAbnormalDPO = rStatAbnormalDService.selectByMultiId (rStatAbnormalDPO);
+            if (Objects.isNull(rStatAbnormalDPO)) {
+                return;
+            }
             ROperatingMonitorDPO rOperatingMonitorDPO = new ROperatingMonitorDPO();
             rOperatingMonitorDPO.setMeasurementPointId (temp);
             rOperatingMonitorDPO.setDataDate (date);
             rOperatingMonitorDPO.setIsUnusual (rStatAbnormalDPO.getValueAlarm ());
             rOperatingMonitorDPO.setEffectiveMinuteCount (rMpMonitorEvaluateDPO.getEffectiveMinuteCount ());
             rOperatingMonitorDPO.setDataIntegrityRate (BigDecimal.valueOf (rMpMonitorEvaluateDPO.getEffectiveMinuteCount ()*statisticalInterval/1440));
-            rOperatingMonitorDPO.setDataRightRate (BigDecimal.valueOf(
-                    (rMpMonitorEvaluateDPO.getFreqCount ()+ rMpMonitorEvaluateDPO.getLineVoltageCount ()+
-                            rMpMonitorEvaluateDPO.getPhaseVoltageCount ()+rMpMonitorEvaluateDPO.getUnbalanceCount ()+
-                            rMpMonitorEvaluateDPO.getVThdCount ())/(5*rMpMonitorEvaluateDPO.getEffectiveMinuteCount ())
-            ));
+            if(rMpMonitorEvaluateDPO.getEffectiveMinuteCount ()==0){
+                rOperatingMonitorDPO.setDataRightRate(BigDecimal.valueOf(0.00));
+            }else{
+                rOperatingMonitorDPO.setDataRightRate (BigDecimal.valueOf(
+                        (rMpMonitorEvaluateDPO.getFreqCount ()+ rMpMonitorEvaluateDPO.getLineVoltageCount ()+
+                                rMpMonitorEvaluateDPO.getPhaseVoltageCount ()+rMpMonitorEvaluateDPO.getUnbalanceCount ()+
+                                rMpMonitorEvaluateDPO.getVThdCount ())/(5*rMpMonitorEvaluateDPO.getEffectiveMinuteCount ())
+                ));
+            }
+
             rOperatingMonitorDPO.setIndexIntegrityRate (
                     BigDecimal.valueOf(
                             (rMpMonitorEvaluateDPO.getFreqCount ()+ rMpMonitorEvaluateDPO.getLineVoltageCount ()+
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RStatAbnormalDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RStatAbnormalDServiceImpl.java
index 2c9690355..13c8d43a1 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RStatAbnormalDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RStatAbnormalDServiceImpl.java
@@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 
@@ -42,6 +43,9 @@ public class RStatAbnormalDServiceImpl extends MppServiceImpl<RStatAbnormalDMapp
             rMpMonitorEvaluateDPO.setMeasurementPointId (temp);
             rMpMonitorEvaluateDPO.setDataDate (date);
             rMpMonitorEvaluateDPO = rMpMonitorEvaluateDService.selectByMultiId (rMpMonitorEvaluateDPO);
+            if(Objects.isNull (rMpMonitorEvaluateDPO)){
+            return;
+            }
             RStatAbnormalDPO rStatAbnormalDPO = new RStatAbnormalDPO();
             rStatAbnormalDPO.setDataDate (date);
             rStatAbnormalDPO.setMeasurementPointId (temp);