From abf5e17d0b98e44b098874d207955e4c66a86e26 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 27 五月 2025 11:14:54 +0800
Subject: [PATCH] 月最大需量 查询方式修改
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 5d92ee2..fa0033d 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
@@ -644,7 +644,7 @@
}
if (!StringUtils.isEmpty(entity.getMaxDemand())) {
- ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
+ /*ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
apiPointValueQueryDTO.setStart(start);
apiPointValueQueryDTO.setEnd(end);
apiPointValueQueryDTO.setPointNo(entity.getMaxDemand());
@@ -652,6 +652,11 @@
if (maxValue != null) {
demandDTO.setMaxDemand(new BigDecimal(maxValue.get(VALUE).toString()));
demandDTO.setOccurTime(DateUtils.parse( maxValue.get(TIME).toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ }*/
+ PowerMaxdemandMainEntity maxdemandMainEntity = powerMaxDemandMainService.getMonthMax(entity.getCode(), start);
+ if (maxdemandMainEntity != null) {
+ demandDTO.setMaxDemand(maxdemandMainEntity.getMaxDemand());
+ demandDTO.setOccurTime(maxdemandMainEntity.getOccurTime());
}
}
result.add(demandDTO);
--
Gitblit v1.9.3