From 1ecada5de50a79b5fc9ecca17e47e32dd07a692c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 06 五月 2025 18:20:29 +0800
Subject: [PATCH] 功率因数-电网拓扑预警信息

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
index e80f133..cc1ca27 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
@@ -249,32 +249,32 @@
         if (CollectionUtils.isEmpty(dtoList)) {
             return success(result);
         }
-        for (PowerNetFactorDTO dto : dtoList) {
+        for (PowerNetFactorEntity entity : list) {
             List<String> points = new ArrayList<>();
             String message = "";
-            if (StringUtils.isNotBlank(dto.getCurQ())) {
-                points.add(dto.getCurQ());
+            if (StringUtils.isNotBlank(entity.getCurQ())) {
+                points.add(entity.getCurQ());
             }
-            if (StringUtils.isNotBlank(dto.getCurCos())) {
-                points.add(dto.getCurCos());
+            if (StringUtils.isNotBlank(entity.getCurCos())) {
+                points.add(entity.getCurCos());
             }
             if (CollectionUtils.isEmpty(points)) {
                 continue;
             }
 
             Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
-            if (pointsRealValue.get(dto.getCurQ()) != null) {
-                BigDecimal curQ = new BigDecimal(pointsRealValue.get(dto.getCurQ()).toString());
-                if (curQ.compareTo(BigDecimal.ZERO) == dto.getCurFlag()) {
-                    message = dto.getNodeName() + "发生无功返送;";
+            if (pointsRealValue.get(entity.getCurQ()) != null) {
+                BigDecimal curQ = new BigDecimal(pointsRealValue.get(entity.getCurQ()).toString());
+                if (curQ.compareTo(BigDecimal.ZERO) == entity.getCurFlag()) {
+                    message = entity.getNodeName() + "发生无功返送;";
                 }
             }
-            if (pointsRealValue.get(dto.getCurCos()) != null) {
-                BigDecimal curCos = new BigDecimal(pointsRealValue.get(dto.getCurCos()).toString());
-                if (curCos.compareTo(dto.getLimitH()) > 0) {
-                    message += dto.getNodeName() + "功率因数超上限";
-                } else if (curCos.compareTo(dto.getLimitL()) < 0) {
-                    message += dto.getNodeName() + "功率因数超下限";
+            if (pointsRealValue.get(entity.getCurCos()) != null) {
+                BigDecimal curCos = new BigDecimal(pointsRealValue.get(entity.getCurCos()).toString());
+                if (entity.getLimitH() != null && curCos.compareTo(entity.getLimitH()) > 0) {
+                    message += entity.getNodeName() + "功率因数超上限";
+                } else if (entity.getLimitL() != null && curCos.compareTo(entity.getLimitL()) < 0) {
+                    message += entity.getNodeName() + "功率因数超下限";
                 }
             }
             if (!message.isEmpty()) {

--
Gitblit v1.9.3