From 2ab2683478533e5d01563dbaabc6b098cd43a105 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 23 五月 2025 13:40:04 +0800
Subject: [PATCH] 发电机组实时状态
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 ff3deed..dbf7fa0 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
@@ -328,28 +328,31 @@
@GetMapping("/gen-status/list")
@Operation(summary = "功率因数-发电机组实时状态")
public CommonResult<List<PowerGenStatusDTO>> getPowerGenStatusList(@RequestParam Map<String, Object> params) {
+ List<PowerGenStatusDTO> result = new ArrayList<>();
List<PowerGenStatusEntity> list = powerGenStatusDaoService.list(params);
- List<PowerGenStatusDTO> result = ConvertUtils.sourceToTarget(list, PowerGenStatusDTO.class);
- if (CollectionUtils.isEmpty(result)) {
+ if (CollectionUtils.isEmpty(list)) {
return success(result);
}
- for (PowerGenStatusDTO dto : result) {
+ for (PowerGenStatusEntity entity : list) {
+ PowerGenStatusDTO dto = new PowerGenStatusDTO();
List<String> points = new ArrayList<>();
- if (StringUtils.isNotBlank(dto.getCurP())) {
- points.add(dto.getCurP());
+ if (StringUtils.isNotBlank(entity.getCurP())) {
+ points.add(entity.getCurP());
}
- if (StringUtils.isNotBlank(dto.getCurQ())) {
- points.add(dto.getCurQ());
+ if (StringUtils.isNotBlank(entity.getCurQ())) {
+ points.add(entity.getCurQ());
}
if (!CollectionUtils.isEmpty(points)) {
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
if (pointsRealValue.get(dto.getCurP()) != null) {
- dto.setCurP(pointsRealValue.get(dto.getCurP()).toString());
+ dto.setCurP(new BigDecimal(pointsRealValue.get(dto.getCurP()).toString()));
}
if (pointsRealValue.get(dto.getCurQ()) != null) {
- dto.setCurQ(pointsRealValue.get(dto.getCurQ()).toString());
+ dto.setCurQ(new BigDecimal(pointsRealValue.get(dto.getCurQ()).toString()));
}
}
+
+ result.add(dto);
}
return success(result);
--
Gitblit v1.9.3