From 5c4feecf7c2f4dee2dad9686de24cfdb3dc6b473 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Fri, 28 Jul 2023 14:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/device/pq/pojo/po/LineDetail.java    |  5 ++-
 .../device/pq/pojo/vo/LineDetailDataVO.java   |  2 +
 .../pq/service/impl/LineServiceImpl.java      |  1 +
 .../line/RMpMonitorEvaluateDServiceImpl.java  | 37 ++++++++++++++-----
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java
index ecb9b7a6b..e488d77c4 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java
@@ -164,6 +164,9 @@ public class LineDetail{
      * 接线图
      */
     private String wiringDiagram;
-
+    /**
+     * 监测点接线相别（0，单相,1，三相，默认三相）
+     */
+    private Integer ptPhaseType;
 
 }
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java
index 7dab68b7d..d2af66e06 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java
@@ -104,5 +104,7 @@ public class LineDetailDataVO {
      */
     @ApiModelProperty(name = "wiringDiagram",value = "接线图")
     private String wiringDiagram;
+    @ApiModelProperty(name = "ptPhaseType",value = "监测点接线相别（0，单相,1，三相，默认三相）")
+    private Integer ptPhaseType;
 
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
index 3c89b6fb3..911a355f6 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
@@ -146,6 +146,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         lineDetailDataVO.setOwnerDuty(lineDetail.getOwnerDuty());
         lineDetailDataVO.setOwnerTel(lineDetail.getOwnerTel());
         lineDetailDataVO.setWiringDiagram(lineDetail.getWiringDiagram());
+        lineDetailDataVO.setPtPhaseType(lineDetail.getPtPhaseType());
         return lineDetailDataVO;
     }
 
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 1f023fc9b..c976eab9d 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
@@ -77,7 +77,7 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
             RMpMonitorEvaluateDPO rMpMonitorEvaluateDPO = new RMpMonitorEvaluateDPO();
 
 
-             rMpMonitorEvaluateDPO = calculateRMpMonitorEvaluateDPO (rMpMonitorEvaluateDPO,fiveItems, pmsAbnormalRules, voltage,data.getPtType());
+             rMpMonitorEvaluateDPO = calculateRMpMonitorEvaluateDPO (rMpMonitorEvaluateDPO,fiveItems, pmsAbnormalRules, voltage,data);
             Date date = DateUtil.parse(dataDate);
 
             DataFlicker twoFlickerData = dataIntegrityRateInfluxService.getTwoFlickerData (temp, date, 5);
@@ -112,7 +112,7 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
      * @Author: clam
      * @Date: 2023/2/23
      */
-    private RMpMonitorEvaluateDPO calculateRMpMonitorEvaluateDPO(RMpMonitorEvaluateDPO rMpMonitorEvaluateDPO,List<DataVFiveItemDTO> fiveItems, List<PmsAbnormalRules> pmsAbnormalRules, Double voltage,String ptType) {
+    private RMpMonitorEvaluateDPO calculateRMpMonitorEvaluateDPO(RMpMonitorEvaluateDPO rMpMonitorEvaluateDPO,List<DataVFiveItemDTO> fiveItems, List<PmsAbnormalRules> pmsAbnormalRules, Double voltage,LineDetailDataVO data) {
 
         Integer freqCount = 0;
         Integer unbalanceCount = 0;
@@ -142,12 +142,14 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
                Double rmsLvrMin = fiveItem.getRmsLvrMin ();
 
                 Boolean rmsflag=false;
+               Boolean rmsLvrflag=false;
+               Boolean vUnbalanceflag=false;
 
                if(freqLimit.getLowerLimit ( ) <= freqMin&&freqMax <= freqLimit.getUpperLimit ( )){
                    freqCount++;
                }
                /*，监测点的接线方式，如果是星形接线这个指标要判断，角形界面则不判断，默认它是正常的*/
-               if(Objects.equals("0",ptType)){
+               if(Objects.equals("0",data.getPtType())){
                    if(rmsLimit.getLowerLimit ( ) * (voltage / 1.732) <= rmsMin&&rmsMax <= rmsLimit.getUpperLimit ( ) * (voltage / 1.732) ){
                        phaseVoltageCount++;
                        rmsflag =true;
@@ -156,22 +158,39 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
                    rmsflag =true;
                    phaseVoltageCount++;
                }
+               if(Objects.equals("1",data.getPtPhaseType())){
+                   if(rms_lvrLimit.getLowerLimit ( )*voltage <= rmsLvrMin&&rmsLvrMax <= rms_lvrLimit.getUpperLimit ( )*voltage){
+                       lineVoltageCount++;
+                       rmsLvrflag=true;
+                   }
 
-               if(rms_lvrLimit.getLowerLimit ( )*voltage <= rmsLvrMin&&rmsLvrMax <= rms_lvrLimit.getUpperLimit ( )*voltage){
+               }else {
+                   rmsLvrflag=true;
                    lineVoltageCount++;
+
                }
+               if(Objects.equals("1",data.getPtPhaseType())&&Objects.equals("0",data.getPtType())){
+                   if(v_unbalanceLimit.getLowerLimit ( ) <= vUnbalanceMin&&vUnbalanceMax <= v_unbalanceLimit.getUpperLimit ( )
+                   ){
+                       unbalanceCount++;
+                       vUnbalanceflag=true;
+                   }
+               }else {
+                   unbalanceCount++;
+                   vUnbalanceflag=true;
+               }
+
+
                if(v_thdLimit.getLowerLimit ( ) <= vThdMin&&vThdMax <= v_thdLimit.getUpperLimit ( )){
                    vThdCount++;
                }
-               if( v_unbalanceLimit.getLowerLimit ( ) <= vUnbalanceMin&&vUnbalanceMax <= v_unbalanceLimit.getUpperLimit ( )){
-                   unbalanceCount++;
-               }
+
 
                if (freqLimit.getLowerLimit ( ) <= freqMin&&freqMax <= freqLimit.getUpperLimit ( ) &&
                        rmsflag &&
-                       rms_lvrLimit.getLowerLimit ( )*voltage <= rmsLvrMin&&rmsLvrMax <= rms_lvrLimit.getUpperLimit ( )*voltage &&
+                       rmsLvrflag &&
                        v_thdLimit.getLowerLimit ( ) <= vThdMin&&vThdMax <= v_thdLimit.getUpperLimit ( ) &&
-                       v_unbalanceLimit.getLowerLimit ( ) <= vUnbalanceMin&&vUnbalanceMax <= v_unbalanceLimit.getUpperLimit ( )
+                       vUnbalanceflag
 
                ) {
                    effectiveMinuteCount++;