From 91b3f63b9963922071033814e0b88a8163595fbd Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 7 Nov 2024 09:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E8=AF=84=E4=BB=B7?=
 =?UTF-8?q?=E6=9C=89=E6=95=88=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C=E6=94=BE?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../line/RMpMonitorEvaluateDServiceImpl.java  | 100 +++++++++---------
 1 file changed, 50 insertions(+), 50 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 45bb66019..876e8094a 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
@@ -151,56 +151,56 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
                 vThdCount++;
                 effectiveMinuteCount++;
                 // 先注释掉 校验跑出监测点
-//                if (freqLimit.getLowerLimit() <= freqMin && freqMax <= freqLimit.getUpperLimit()) {
-//                    freqCount++;
-//                }
-//                /*，监测点的接线方式，如果是星形接线这个指标要判断，角形界面则不判断，默认它是正常的*/
-//                if (Objects.equals("0", data.getPtType())) {
-//                    if (rmsLimit.getLowerLimit() * (voltage / 1.732) <= rmsMin && rmsMax <= rmsLimit.getUpperLimit() * (voltage / 1.732)) {
-//                        phaseVoltageCount++;
-//                        rmsflag = true;
-//                    }
-//                } else {
-//                    rmsflag = true;
-//                    phaseVoltageCount++;
-//                }
-//                if (Objects.equals("1", data.getPtPhaseType())) {
-//                    if (rms_lvrLimit.getLowerLimit() * voltage <= rmsLvrMin && rmsLvrMax <= rms_lvrLimit.getUpperLimit() * voltage) {
-//                        lineVoltageCount++;
-//                        rmsLvrflag = true;
-//                    }
-//
-//                } 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 (freqLimit.getLowerLimit() <= freqMin && freqMax <= freqLimit.getUpperLimit() &&
-//                        rmsflag &&
-//                        rmsLvrflag &&
-//                        v_thdLimit.getLowerLimit() <= vThdMin && vThdMax <= v_thdLimit.getUpperLimit() &&
-//                        vUnbalanceflag
-//
-//                ) {
-//                    effectiveMinuteCount++;
-//                }
+                if (freqLimit.getLowerLimit() <= freqMin && freqMax <= freqLimit.getUpperLimit()) {
+                    freqCount++;
+                }
+                /*，监测点的接线方式，如果是星形接线这个指标要判断，角形界面则不判断，默认它是正常的*/
+                if (Objects.equals("0", data.getPtType())) {
+                    if (rmsLimit.getLowerLimit() * (voltage / 1.732) <= rmsMin && rmsMax <= rmsLimit.getUpperLimit() * (voltage / 1.732)) {
+                        phaseVoltageCount++;
+                        rmsflag = true;
+                    }
+                } else {
+                    rmsflag = true;
+                    phaseVoltageCount++;
+                }
+                if (Objects.equals("1", data.getPtPhaseType())) {
+                    if (rms_lvrLimit.getLowerLimit() * voltage <= rmsLvrMin && rmsLvrMax <= rms_lvrLimit.getUpperLimit() * voltage) {
+                        lineVoltageCount++;
+                        rmsLvrflag = true;
+                    }
+
+                } 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 (freqLimit.getLowerLimit() <= freqMin && freqMax <= freqLimit.getUpperLimit() &&
+                        rmsflag &&
+                        rmsLvrflag &&
+                        v_thdLimit.getLowerLimit() <= vThdMin && vThdMax <= v_thdLimit.getUpperLimit() &&
+                        vUnbalanceflag
+
+                ) {
+                    effectiveMinuteCount++;
+                }
             }
         }