From f54781eb70297acc4ab3c6ae883e6b41cac9b644 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Wed, 9 Apr 2025 18:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=93=E9=A1=B9=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/majornetwork/Impl/SpThroughServiceImpl.java    | 5 ++---
 .../activepowerrange/impl/PowerStatisticsServiceImpl.java  | 7 +------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/SpThroughServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/SpThroughServiceImpl.java
index 57f369091..f2a1ed056 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/SpThroughServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/SpThroughServiceImpl.java
@@ -44,14 +44,13 @@ public class SpThroughServiceImpl extends MppServiceImpl<SpThroughMapper, SpThro
             String treeId = dicTreeId(spThroughParam);
             DictData dip = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
             if (ObjectUtil.isNotNull(dip)) {
-                spThroughVO.setHighPressure(eventCount(spThroughParam, treeId, dip) + "");
+                spThroughVO.setLowPressure(eventCount(spThroughParam, treeId, dip) + "");
             }
             DictData rise = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_RISE.getCode()).getData();
             if (ObjectUtil.isNotNull(rise)) {
-                spThroughVO.setLowPressure(eventCount(spThroughParam, treeId, rise) + "");
+                spThroughVO.setHighPressure(eventCount(spThroughParam, treeId, rise) + "");
             }
         }
-
         return spThroughVO;
     }
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/activepowerrange/impl/PowerStatisticsServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/activepowerrange/impl/PowerStatisticsServiceImpl.java
index 4bceadeb5..074a81a2c 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/activepowerrange/impl/PowerStatisticsServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/activepowerrange/impl/PowerStatisticsServiceImpl.java
@@ -53,10 +53,7 @@ import java.util.stream.Collectors;
 public class PowerStatisticsServiceImpl implements PowerStatisticsService {
 
     private final RActivePowerRangeService rActivePowerRangeService;
-    private final CommonService commonService;
-    private final DecimalFormat df = new DecimalFormat(Param.DECIMAL_FORMATSTR);
     private final DecimalFormat dftwo = new DecimalFormat(Param.DECIMAL_FORMATTWOSTR);
-    private final EpdFeignClient epdFeignClient;
     private final DataVFeignClient dataVFeignClient;
     private final DataIFeignClient dataIFeignClient;
     private final DataPltFeignClient dataPltFeignClient;
@@ -140,8 +137,6 @@ public class PowerStatisticsServiceImpl implements PowerStatisticsService {
                     }
                 }
             }
-
-
         }
         return record.stream().sorted(Comparator.comparing(PowerStatisticsTargetVO::getTime)).collect(Collectors.toList());
     }
@@ -298,7 +293,7 @@ public class PowerStatisticsServiceImpl implements PowerStatisticsService {
         if (timeCross.contains(time)) {
             return 1;
         }
-        return 1;
+        return 0;
     }
 
     /**