From 95f70b50547e4c40c0c86a7159f12a96d8f1f428 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Mon, 29 May 2023 18:21:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=91=8A=E8=AD=A6=E9=A2=91?=
 =?UTF-8?q?=E6=AC=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/RStatLimitTargetDMapper.java       | 22 ++++-
 .../mapping/RStatLimitTargetDMapper.xml       | 87 +++++++++++++++++++
 .../service/impl/HarmonicServiceImpl.java     | 25 +++---
 3 files changed, 123 insertions(+), 11 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLimitTargetDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLimitTargetDMapper.java
index 67d604a52..cd1599808 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLimitTargetDMapper.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLimitTargetDMapper.java
@@ -17,14 +17,34 @@ import java.util.List;
 public interface RStatLimitTargetDMapper extends BaseMapper<RStatLimitTargetDPO> {
 
     /**
-     * 谐波查询
+     * 谐波电压查询
      * @return
      */
     List<RStatLimitTargetDPO> getSumV(@Param("ids") List<String> list,
                              @Param("startTime") String startTime,
                              @Param("endTime") String endTime);
 
+    /**
+     * 谐波电压相加查询
+     * @return
+     */
+    Integer getSumAddV(@Param("ids") List<String> list,
+                                      @Param("startTime") String startTime,
+                                      @Param("endTime") String endTime);
+
+    /**
+     * 谐波电流查询
+     * @return
+     */
     List<RStatLimitTargetDPO> getSumI(@Param("ids") List<String> list,
                                       @Param("startTime") String startTime,
                                       @Param("endTime") String endTime);
+
+    /**
+     * 谐波电流相加查询
+     * @return
+     */
+    Integer getSumAddI(@Param("ids") List<String> list,
+                                      @Param("startTime") String startTime,
+                                      @Param("endTime") String endTime);
 }
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 eb23fcac1..06489bce2 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
@@ -97,4 +97,91 @@
         GROUP BY
         my_index
     </select>
+    <select id="getSumAddV" resultType="java.lang.Integer">
+        SELECT
+        sum( uaberrance_overtime ) +
+        sum( uharm_2_overtime ) +
+        sum( uharm_3_overtime ) +
+        sum( uharm_4_overtime ) +
+        sum( uharm_5_overtime ) +
+        sum( uharm_6_overtime ) +
+        sum( uharm_7_overtime ) +
+        sum( uharm_8_overtime ) +
+        sum( uharm_9_overtime ) +
+        sum( uharm_10_overtime )+
+        sum( uharm_11_overtime )+
+        sum( uharm_12_overtime )+
+        sum( uharm_13_overtime )+
+        sum( uharm_14_overtime )+
+        sum( uharm_15_overtime )+
+        sum( uharm_16_overtime )+
+        sum( uharm_17_overtime )+
+        sum( uharm_18_overtime )+
+        sum( uharm_19_overtime )+
+        sum( uharm_20_overtime )+
+        sum( uharm_21_overtime )+
+        sum( uharm_22_overtime )+
+        sum( uharm_23_overtime )+
+        sum( uharm_24_overtime )+
+        sum( uharm_25_overtime )
+        FROM
+        r_stat_limit_target_d
+        <where>
+            <if test=" ids != null and ids.size > 0">
+                AND my_index IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test=" startTime != null and startTime !=''">
+                AND  time_id >= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND  time_id &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
+    <select id="getSumAddI" resultType="java.lang.Integer">
+        SELECT
+        sum( iharm_2_overtime ) +
+        sum( iharm_3_overtime ) +
+        sum( iharm_4_overtime ) +
+        sum( iharm_5_overtime ) +
+        sum( iharm_6_overtime ) +
+        sum( iharm_7_overtime ) +
+        sum( iharm_8_overtime ) +
+        sum( iharm_9_overtime ) +
+        sum( iharm_10_overtime ) +
+        sum( iharm_11_overtime ) +
+        sum( iharm_12_overtime ) +
+        sum( iharm_13_overtime ) +
+        sum( iharm_14_overtime ) +
+        sum( iharm_15_overtime ) +
+        sum( iharm_16_overtime ) +
+        sum( iharm_17_overtime ) +
+        sum( iharm_18_overtime ) +
+        sum( iharm_19_overtime ) +
+        sum( iharm_20_overtime ) +
+        sum( iharm_21_overtime ) +
+        sum( iharm_22_overtime ) +
+        sum( iharm_23_overtime ) +
+        sum( iharm_24_overtime ) +
+        sum( iharm_25_overtime )
+        FROM
+        r_stat_limit_target_d
+        <where>
+            <if test=" ids != null and ids.size > 0">
+                AND my_index IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test=" startTime != null and startTime !=''">
+                AND  time_id >= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND  time_id &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java
index e58257800..b1ca62f4f 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.config.GeneralInfo;
@@ -24,6 +25,7 @@ import com.njcn.harmonic.pojo.vo.HarmonicLineVO;
 import com.njcn.harmonic.pojo.vo.HarmonicSubstationVO;
 import com.njcn.harmonic.pojo.vo.PollutionVO;
 import com.njcn.harmonic.service.IHarmonicService;
+import com.njcn.influxdb.utils.InfluxDbUtils;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.web.utils.RequestUtil;
 import lombok.AllArgsConstructor;
@@ -552,21 +554,24 @@ public class HarmonicServiceImpl implements IHarmonicService {
      * @return
      */
     private Integer getWarningInfo(List<String> lineList, String startTime, String endTime, String type) {
-        List<RStatLimitTargetDPO> sum=new ArrayList<>();
+        Integer result = 0;
         if (Objects.equals(type, DicDataEnum.XBDY_ENUM.getCode())){
-             sum = targetDMapper.getSumV(lineList, startTime, endTime);
+            Integer sumAddV = targetDMapper.getSumAddV(lineList, startTime, endTime);
+            if(ObjectUtil.isNotNull(sumAddV)){
+                result=sumAddV;
+            }else{
+                result=-1;
+            }
 
         } else if (Objects.equals(type, DicDataEnum.XBDL_ENUM.getCode())){
-            sum = targetDMapper.getSumV(lineList, startTime, endTime);
+            Integer sumAddI = targetDMapper.getSumAddI(lineList, startTime, endTime);
+            if(ObjectUtil.isNotNull(sumAddI)){
+                result=sumAddI;
+            }else{
+                result=-1;
+            }
 
         }
-        int result = 0;
-        if(CollUtil.isNotEmpty(sum)){
-            result=sum.get(0).getUharm2Overtime();
-        }else{
-            result=-1;
-        }
-
         return result;
     }