From 601ae475e079d5261e02512dee2a76fbaac152bb Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 6 Mar 2025 09:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../line/RMpMonitorEvaluateDServiceImpl.java  | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 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 c5bce4146..a6ffee48d 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
@@ -156,28 +156,27 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
                 }
                 /*，监测点的接线方式，如果是星形接线这个指标要判断，角形界面则不判断，默认它是正常的*/
                 //河北没有线电压修改成先改成全部都是有效的线电压
-                phaseVoltageCount++;
-                rmsflag = true;
-//                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;
-                    }
 
+                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()
                     ) {