From e2e7669d47dd68963230aae5efc62727b305d908 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Fri, 26 Jun 2026 11:52:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=99=90=E5=80=BC=E8=B4=9F=E5=BA=8F=E7=94=B5?=
 =?UTF-8?q?=E6=B5=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/device/biz/utils/COverlimitUtil.java | 6 ++----
 .../device/pq/controller/LineIntegrityDataController.java   | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java
index dc2679b00..21098e425 100644
--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java
@@ -53,7 +53,7 @@ public class COverlimitUtil {
         uHarm(overlimit, voltageLevel);
         threeVoltageUnbalance(overlimit);
         interharmonicCurrent(overlimit, voltageLevel);
-
+        negativeSequenceCurrent(overlimit, voltageLevel, shortCapacity);
         //谐波电流限值
         int lineType;
         if (voltageLevel >= DicDataEnum.KV220.getValue()) {
@@ -72,7 +72,6 @@ public class COverlimitUtil {
         }
         // 1. 配网 lineType = 1
         if (Objects.equals(lineType, RunFlagEnum.PW_FLAG.getStatus())) {
-            overlimit.setINeg(PLACEHOLDER);
             Float[] iHarmTem = new Float[49];
 
             // 配网-电网侧(powerFlag=0) / 配网Ⅱ类：直接基准限值，不折算
@@ -103,8 +102,7 @@ public class COverlimitUtil {
             else {
                 iHarm(overlimit, voltageLevel, pc, dc, sc);
             }
-            // 主网统一计算负序电流
-            negativeSequenceCurrent(overlimit, voltageLevel, sc);
+
         }
         return overlimit;
     }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java
index 61e0468c3..a5f54d2f6 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java
@@ -90,7 +90,7 @@ public class LineIntegrityDataController extends BaseController {
         String methodDescribe = getMethodDescribe("getIntegrityByLineIds");
         if(CollUtil.isNotEmpty(lineIds)){
             QueryWrapper<RStatIntegrityD> queryWrapper = new QueryWrapper<>();
-            queryWrapper.select("sum(real_time) as realTime,sum(due_time) as dueTime,avg(real_time/due_time) as integrityData","line_index").in("line_index",lineIds).between("time_id",startTime,endTime).groupBy("line_index");
+            queryWrapper.select("sum(real_time) as realTime,sum(due_time) as dueTime,avg(real_time*1.0/due_time) as integrityData","line_index").in("line_index",lineIds).between("time_id",startTime,endTime).groupBy("line_index");
             List<RStatIntegrityD> rStatIntegrityDList = irStatIntegrityDService.list(queryWrapper);
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatIntegrityDList, methodDescribe);
         }