From 7ec8705d416b06db5d68b43d5c8cf83713e2d156 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 06 五月 2025 16:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 535c830..abe2985 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
@@ -850,7 +850,7 @@
}
for (String code : dto.getCodeList()) {
- PowerDemandEntity powerDemand = powerDemandService.getByCode(dto.getCode());
+ PowerDemandEntity powerDemand = powerDemandService.getByCode(code);
if (powerDemand == null) {
log.info("未找到code对应的数据: {}", dto.getCode());
return success(new LinkedHashMap<>());
@@ -874,7 +874,7 @@
query.setPointNo(pointNo);
query.setStart(startTime);
query.setEnd(endTime);
- log.info("开始查询实测需量/有功功率历史数据，测点: {}", pointNo);
+ log.info("开始查询实测需量有功功率历史数据，测点: {}", pointNo);
List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(query);
List<Object[]> dataList = chartData.stream()
.map(pv -> new Object[]{
--
Gitblit v1.9.3