From 8f66412c606a65bd53be1c90396840e03488e639 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 1 Feb 2024 15:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../line/RMpMonitorEvaluateDServiceImpl.java  | 107 ++++++++++--------
 1 file changed, 57 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 31b00a755..01ae1d4e1 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
@@ -195,56 +195,63 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
                 Boolean rmsLvrflag = false;
                 Boolean vUnbalanceflag = false;
 
-                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++;
-                }
+                freqCount++;
+                unbalanceCount++;
+                phaseVoltageCount++;
+                lineVoltageCount++;
+                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++;
+//                }
             }
         }