From d203f8d334afe827c5a38f657dd6574a792a93a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Fri, 2 Feb 2024 14:42:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=83=8C=E6=99=AF=E8=B0=90=E6=B3=A2=E5=8F=98?=
 =?UTF-8?q?=E7=94=B5=E7=AB=99bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RStatBusbarHarmonicServiceImpl.java  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
index a3c37eaf5..971041c66 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
@@ -88,21 +88,21 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
                         vo.setBusbarId(po.getBusbarId());
                         vo.setDataDate(po.getDataDate());
                         vo.setVEffectiveMax(po.getVEffectiveMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setVEffectiveMin(po.getVEffectiveMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setVEffectiveAvg(po.getVEffectiveAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setVEffective95(po.getVEffective95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setVThdMax(po.getVThdMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setVThdMin(po.getVThdMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setVThdAvg(po.getVThdAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setVThd95(po.getVThd95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setUnbalanceMax(po.getUnbalanceMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setUnbalanceMin(po.getUnbalanceMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setUnbalanceAvg(po.getUnbalanceAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setUnbalance95(po.getUnbalance95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setFlickerMax(po.getFlickerMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setFlickerMin(po.getFlickerMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setFlickerAvg(po.getFlickerAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
-                        vo.setFlicker95(po.getFlicker95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVEffectiveMin(po.getVEffectiveMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMin()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVEffectiveAvg(po.getVEffectiveAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveAvg()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVEffective95(po.getVEffective95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffective95()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVThdMax(po.getVThdMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVThdMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVThdMin(po.getVThdMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVThdMin()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVThdAvg(po.getVThdAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVThdAvg()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVThd95(po.getVThd95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVThd95()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setUnbalanceMax(po.getUnbalanceMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getUnbalanceMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setUnbalanceMin(po.getUnbalanceMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getUnbalanceMin()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setUnbalanceAvg(po.getUnbalanceAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getUnbalanceAvg()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setUnbalance95(po.getUnbalance95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getUnbalance95()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setFlickerMax(po.getFlickerMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getFlickerMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setFlickerMin(po.getFlickerMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getFlickerMin()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setFlickerAvg(po.getFlickerAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getFlickerAvg()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setFlicker95(po.getFlicker95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getFlicker95()).setScale(2, RoundingMode.HALF_UP).doubleValue());
                         break;
                     }
                 }