From 892da32f145c958f0ad9467eb442ed457984005d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 07 五月 2025 10:52:01 +0800
Subject: [PATCH] 功率因数-电网拓扑

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDTO.java            |    3 +++
 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java |    5 +++++
 2 files changed, 8 insertions(+), 0 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 eb2139f..b492ecc 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
@@ -117,8 +117,10 @@
                 if (StringUtils.isNotBlank(entity.getCurCos())) {
                     points.add(entity.getCurCos());
                 }
+                log.info("points=" + points);
                 if (!CollectionUtils.isEmpty(points)) {
                     Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
+                    log.info("pointsRealValue=" + pointsRealValue);
                     if (pointsRealValue.get(entity.getCurA()) != null) {
                         powerNetFactorDTO.setCurA(new BigDecimal(pointsRealValue.get(entity.getCurA()).toString()));
                     }
@@ -135,6 +137,7 @@
                 }
             } catch (Exception ex) {
                 log.info(entity.getNodeName() + "获取当前值异常" + ex.getMessage());
+                ex.printStackTrace();
             }
 
             try {
@@ -166,6 +169,7 @@
                 }
             } catch (Exception ex) {
                 log.info(entity.getNodeName() + "获取预测值异常," + ex.getMessage());
+                ex.printStackTrace();
             }
 
             // 设置电流状态
@@ -215,6 +219,7 @@
                     powerNetFactorDTO.setQStatus(0);
                 }
             }
+            result.add(powerNetFactorDTO);
         }
         return success(result);
     }
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDTO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDTO.java
index bb30840..3f89cc9 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDTO.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDTO.java
@@ -1,5 +1,6 @@
 package com.iailab.module.ansteel.api.dto;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -65,9 +66,11 @@
     private Integer sort;
 
     @Schema(description = "有功是否超限(0:正常,1:超限)")
+    @JSONField(name="pStatus")
     private Integer pStatus;
 
     @Schema(description = "无功是否超限(0:正常,1:超限)")
+    @JSONField(name="qStatus")
     private Integer qStatus;
 
     @Schema(description = "功率因数是否超限(0:正常,1:超限)")

--
Gitblit v1.9.3