From f3324a02aa29c14db4f40b30b77cab7bd7b57711 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Fri, 21 Apr 2023 17:08:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=8E=8B=E5=81=8F=E5=B7=AE=E7=AE=97?=
 =?UTF-8?q?=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysql/Impl/line/LimitRateService.java     | 33 ++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java
index 22dbf8ebb..f989a2030 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java
@@ -375,7 +375,7 @@ public class LimitRateService  extends MppServiceImpl<LimitRatePOMapper, LimitRa
     }
 
     /**
-     * 功能描述:获取influxDB -> data_v -> 电压偏差 -> 最大值 && 最小值
+     * 功能描述:获取influxDB -> data_v -> 电压偏差 -> 最大值
      *
      * @param lineIndex 监测点lineIndex
      * @param startTime 开始时间
@@ -387,7 +387,7 @@ public class LimitRateService  extends MppServiceImpl<LimitRatePOMapper, LimitRa
         StringBuilder stringBuilder = new StringBuilder ( );
         stringBuilder.append ("line_id='").append (lineIndex).append ("' and ").append (InfluxDBPublicParam.TIME + " >= '").
                 append (startTime).append ("' and ").append (InfluxDBPublicParam.TIME).append (" <= '").append (endTime).
-                append ("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and (value_type = 'MIN' or value_type = 'MAX') and quality_flag = '0' ").
+                append ("' and (phasic_type = 'A' or phasic_type = 'B' or phasic_type = 'C') and value_type = 'MAX' and quality_flag = '0' ").
                 append (InfluxDBPublicParam.TIME_ZONE);
         String sql = "SELECT * FROM " + InfluxDBPublicParam.DATA_V + " WHERE " + stringBuilder;
         QueryResult sqlResult = influxDbUtils.query (sql);
@@ -738,19 +738,17 @@ public class LimitRateService  extends MppServiceImpl<LimitRatePOMapper, LimitRa
                 }
             }
         }
-        //电压上偏差、电压下偏差
+        //电压上偏差、电压下偏差(根据vl_dev的正负判断是用哪个值判断越限)
         if (!CollectionUtils.isEmpty (dataVPODevList)) {
-            Map<String, List<DataVPO>> devMap = dataVPODevList.stream ( ).collect (Collectors.groupingBy (DataVPO::getValueType));
-            List<DataVPO> maxList = devMap.get ("MAX");
-            for (DataVPO item : maxList) {
-                if (item.getVuDev ( ) > overlimit.getVoltageDev ( )) {
-                    uDev++;
-                }
-            }
-            List<DataVPO> minList = devMap.get ("MIN");
-            for (DataVPO item : minList) {
-                if (item.getVlDev ( ) < overlimit.getUvoltageDev ( )) {
-                    uDev++;
+            for (DataVPO item : dataVPODevList) {
+                if (item.getVlDev() >= 0){
+                    if (item.getVlDev() > overlimit.getVoltageDev()){
+                        uDev++;
+                    }
+                } else {
+                    if (Math.abs(item.getVlDev()) > Math.abs(overlimit.getUvoltageDev())){
+                        uDev++;
+                    }
                 }
             }
         }
@@ -1149,11 +1147,8 @@ public class LimitRateService  extends MppServiceImpl<LimitRatePOMapper, LimitRa
         //电压上偏差、电压下偏差
         for (Instant time:map8.keySet()) {
             List<DataVPO> list = map8.get(time);
-            Map<String,List<DataVPO>> devMap = list.stream().collect(Collectors.groupingBy(DataVPO::getValueType));
-            List<DataVPO> maxList = devMap.get("MAX");
-            List<DataVPO> minList = devMap.get("MIN");
-            List<DataVPO> l1 = maxList.stream().filter(s->s.getVuDev()>overlimit.getVoltageDev()).collect(Collectors.toList());
-            List<DataVPO> l2 = minList.stream().filter(s->s.getVlDev()<overlimit.getUvoltageDev()).collect(Collectors.toList());
+            List<DataVPO> l1 = list.stream().filter(s->s.getVlDev()>=0&&s.getVlDev()>overlimit.getVoltageDev()).collect(Collectors.toList());
+            List<DataVPO> l2 = list.stream().filter(s->s.getVlDev()<0&&Math.abs(s.getVlDev())>Math.abs(overlimit.getUvoltageDev())).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l1) || !CollectionUtils.isEmpty(l2)){
                 uDev++;
             }