From 594a8983a040ff81ad800e788f9e0da541e726f4 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 15 四月 2025 22:23:38 +0800
Subject: [PATCH] 电网拓扑预警信息
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 44 ++++++++++++++++++++------------------------
1 files changed, 20 insertions(+), 24 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 8260a43..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,15 +80,13 @@
return success(result);
}
- /*
+ /**
* 判断 curCos 是否超上下限
* {nodeName}功率因数超上限/下限。
- *
+ * <p>
* 判断 curQ
* {nodeName}发生无功返送
- *
- * */
-
+ */
@GetMapping("/net-factor/alarm")
@Operation(summary = "功率因数-电网拓扑预警信息")
public CommonResult<List<String>> getPowerNetFactorAlarm(@RequestParam Map<String, Object> params) {
@@ -99,39 +97,37 @@
return success(result);
}
for (PowerNetFactorDTO dto : dtoList) {
- String message = "";
List<String> points = new ArrayList<>();
+ String message = "";
if (StringUtils.isNotBlank(dto.getCurQ())) {
points.add(dto.getCurQ());
}
+ if (StringUtils.isNotBlank(dto.getCurCos())) {
+ points.add(dto.getCurCos());
+ }
if (CollectionUtils.isEmpty(points)) {
- return success(result);
+ continue;
}
+
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) {
- message = dto.getNodeName() + "发生无功返送;";
- }
- } else {
- if (curQ.compareTo(BigDecimal.ZERO) < 0) {
+ 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() + "发生无功返送;";
}
}
- BigDecimal curCos = new BigDecimal(dto.getCurCos());
- if (curCos.compareTo(dto.getLimitH()) > 0) {
- message += dto.getNodeName() + "功率因数超上限";
- }else if (curCos.compareTo(dto.getLimitL()) < 0) {
- 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(!"".equals(message)) {
+ if (!message.isEmpty()) {
result.add(message);
}
}
-
return success(result);
}
--
Gitblit v1.9.3