From f7426b7804ad1ee1bfb3f1520ad035bcda54f852 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 28 四月 2025 17:34:25 +0800
Subject: [PATCH] 无功优化模型
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 17 ++---------------
1 files changed, 2 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 c161ca8..fd34f95 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
@@ -467,11 +467,8 @@
if (StringUtils.isNotBlank(dto.getActivePower())) {
points.add(dto.getActivePower());
}
-
if (!CollectionUtils.isEmpty(points)) {
-
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
-
if (pointsRealValue.get(dto.getCurDemand()) != null) {
dto.setCurDemand(pointsRealValue.get(dto.getCurDemand()).toString());
}
@@ -490,22 +487,12 @@
Date start = calendar.getTime();
ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
apiPointValueQueryDTO.setStart(start);
- apiPointValueQueryDTO.setEnd(new Date());
apiPointValueQueryDTO.setPointNo(dto.getMaxDemand());
- List<ApiPointValueDTO> monthValues = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
- double max = 0;
- for (int i = 0; i < monthValues.size() - 1; i++) {
- if (max < monthValues.get(i).getV()) {
- max = monthValues.get(i).getV();
- }
- }
- dto.setMaxDemand(String.valueOf(max));
+ Object maxValue = dataPointApi.queryPointMaxValue(apiPointValueQueryDTO);
+ dto.setMaxDemand(maxValue == null ? "" : maxValue.toString());
}
-
-
}
-
return success(result);
}
--
Gitblit v1.9.3