From 2c3da9cae92a5850adfe2ad629994caaeaaf1d11 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 23 五月 2025 14:02:17 +0800
Subject: [PATCH] power
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 dbf7fa0..ad21302 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
@@ -335,6 +335,10 @@
}
for (PowerGenStatusEntity entity : list) {
PowerGenStatusDTO dto = new PowerGenStatusDTO();
+ dto.setId(entity.getId());
+ dto.setName(entity.getName());
+ dto.setSort(entity.getSort());
+
List<String> points = new ArrayList<>();
if (StringUtils.isNotBlank(entity.getCurP())) {
points.add(entity.getCurP());
@@ -344,11 +348,11 @@
}
if (!CollectionUtils.isEmpty(points)) {
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
- if (pointsRealValue.get(dto.getCurP()) != null) {
- dto.setCurP(new BigDecimal(pointsRealValue.get(dto.getCurP()).toString()));
+ if (pointsRealValue.get(entity.getCurP()) != null) {
+ dto.setCurP(new BigDecimal(pointsRealValue.get(entity.getCurP()).toString()));
}
- if (pointsRealValue.get(dto.getCurQ()) != null) {
- dto.setCurQ(new BigDecimal(pointsRealValue.get(dto.getCurQ()).toString()));
+ if (pointsRealValue.get(entity.getCurQ()) != null) {
+ dto.setCurQ(new BigDecimal(pointsRealValue.get(entity.getCurQ()).toString()));
}
}
--
Gitblit v1.9.3