From 62b4657386aa9b72bc3144d404033821587fd3aa Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 15 四月 2025 23:37:20 +0800
Subject: [PATCH] 焦化工序-异常溯源

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java |   70 ++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 34 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 e3aeb13..0c9b980 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
@@ -80,50 +80,52 @@
         return success(result);
     }
 
-    /*
+    /**
      * 判断 curCos 是否超上下限
      * {nodeName}功率因数超上限/下限。
-     *
+     * <p>
      * 判断 curQ
      * {nodeName}发生无功返送
-     *
-     * */
-
+     */
     @GetMapping("/net-factor/alarm")
     @Operation(summary = "功率因数-电网拓扑预警信息")
-    public CommonResult<String> getPowerNetFactorAlarm(@RequestParam Map<String, Object> params) {
-        String result = "";
-        PowerNetFactorDTO dto = powerNetFactorService.selectById(params);
-        if (Objects.isNull(dto)) {
+    public CommonResult<List<String>> getPowerNetFactorAlarm(@RequestParam Map<String, Object> params) {
+        List<String> result = new ArrayList<>();
+        List<PowerNetFactorEntity> list = powerNetFactorService.list(params);
+        List<PowerNetFactorDTO> dtoList = ConvertUtils.sourceToTarget(list, PowerNetFactorDTO.class);
+        if (CollectionUtils.isEmpty(dtoList)) {
             return success(result);
         }
-        List<String> points = new ArrayList<>();
-        if (StringUtils.isNotBlank(dto.getCurQ())) {
-            points.add(dto.getCurQ());
-        }
-        if (CollectionUtils.isEmpty(points)) {
-            return success(result);
-        }
-        Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
-        if (pointsRealValue.get(dto.getCurQ()) == null) {
-            return success(result);
-        }
-        BigDecimal curQ = new BigDecimal(pointsRealValue.get(dto.getCurQ()).toString());
-        if (dto.getCurFlag().compareTo(BigDecimal.ZERO) > 0) {
-            if (curQ.compareTo(BigDecimal.ZERO) > 0) {
-                result = dto.getNodeName() + "发生无功返送;";
+        for (PowerNetFactorDTO dto : dtoList) {
+            List<String> points = new ArrayList<>();
+            String message = "";
+            if (StringUtils.isNotBlank(dto.getCurQ())) {
+                points.add(dto.getCurQ());
             }
-        } else {
-            if (curQ.compareTo(BigDecimal.ZERO) < 0) {
-                result = dto.getNodeName() + "发生无功返送;";
+            if (StringUtils.isNotBlank(dto.getCurCos())) {
+                points.add(dto.getCurCos());
             }
-        }
-        if (dto.getStatus() > 0) {
-            BigDecimal curCos = new BigDecimal(dto.getCurCos());
-            if (curCos.compareTo(dto.getLimitH()) > 0) {
-                result += dto.getNodeName() + "功率因数超上限";
-            }else if (curCos.compareTo(dto.getLimitL()) < 0) {
-                result += dto.getNodeName() + "功率因数超下限";
+            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(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 (!message.isEmpty()) {
+                result.add(message);
             }
         }
         return success(result);

--
Gitblit v1.9.3