From 9e2337387854fb3d2e8301c4ac6a1767c78ec8bc Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Mon, 19 Aug 2024 14:16:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=97=B4=E8=B0=90=E6=B3=A2=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=202.=E8=B6=85=E6=A0=87=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../harmonic/mapper/mapping/RStatLimitTargetDMapper.xml     | 2 +-
 .../service/device/impl/LineWarningServiceImpl.java         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
index b1e558a3a..ef0a873b6 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
@@ -471,7 +471,7 @@
                      )
                  ) AS allOvertime
              FROM
-                 `r_stat_limit_target_d`
+                 `r_stat_limit_rate_d`
                     <where>
                         and time_id between #{startTime} and #{endTime}
                         <if test=" ids != null and ids.size > 0">
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
index ad7db7edb..6d4084067 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
@@ -61,7 +61,6 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -474,7 +473,6 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         if (Objects.equals(targetCode,DicDataEnum.INTERHARMONIC_VOLTAGE.getCode()) || Objects.equals(targetCode,DicDataEnum.TOTAL_INDICATOR.getCode())) {
             List<RStatLimitRateDPO> list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),9).getData();
             if (CollUtil.isNotEmpty(list)) {
-
                 list.forEach(item->{
                     String time = item.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
                     DataInHarmV dataInHarmV = getDataInHarmV(param.getLineId()
@@ -586,12 +584,14 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
                 method = clazz2.getMethod(methodName);
                 if (Objects.nonNull(dataHarmRateV)) {
                     value2 = (double) method.invoke(dataHarmRateV);
+                    describe.append(key).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2,value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
                 } else if (Objects.nonNull(dataI)) {
                     value2 = (double) method.invoke(dataI);
+                    describe.append(key).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2,value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
                 } else if (Objects.nonNull(dataInHarmV)) {
                     value2 = (double) method.invoke(dataInHarmV);
+                    describe.append((key - 0.5)).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2,value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
                 }
-                describe.append(key).append("次").append(targetName).append("CP95值最大幅值:").append(PubUtils.doubleRound(2,value2)).append("%,限值:").append(getOverLimitData(overlimit, getColum, key)).append("%,超标时间:").append(value * timeInterval).append("分钟;");
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }