From 77b06515edaa46cbbb0e55fe5f37db09aa8991fd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 22 四月 2025 16:06:40 +0800
Subject: [PATCH] 调整后的功率因数与无功倒送量
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 15e77c9..4c97a10 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
@@ -366,15 +366,16 @@
@PostMapping("/net-factor/history")
@Operation(summary = "功率因数-根据nodeName获取最近1440min历史数据，月最大，最小值")
public CommonResult<PowerHistoryDTO> getPowerHistoryData(@RequestBody PowerNetFactorHisReqDTO dto) {
- String nodeName = dto.getNodeName();
- if (StringUtils.isBlank(nodeName)) {
+ log.info("PowerNetFactorHisReqDTO=" + JSONObject.toJSONString(dto));
+ String nodeCode = dto.getNodeCode();
+ if (StringUtils.isBlank(nodeCode)) {
return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST);
}
String queryType = dto.getQueryType();
if (StringUtils.isBlank(queryType)) {
return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST);
}
- PowerNetFactorEntity powerNetFactor = powerNetFactorService.getByNodeName(nodeName);
+ PowerNetFactorEntity powerNetFactor = powerNetFactorService.getByNodeCode(nodeCode);
PowerHistoryDTO result = new PowerHistoryDTO();
if (powerNetFactor == null) {
log.info("powerNetFactor is null");
@@ -463,7 +464,7 @@
}
@GetMapping("/adjust-factor")
- @Operation(summary = "负荷移植-调整后的功率因数与无功倒送量")
+ @Operation(summary = "功率因数-调整后的功率因数与无功倒送量")
public CommonResult<Map<String, Double>> getPowerAdjustFactor(@RequestParam Map<String, Object> params) {
List<PowerAdjustedFactorEntity> list = powerAdjustedFactorService.list(params);
List<PowerAdjustedFactorDTO> dtoList = ConvertUtils.sourceToTarget(list, PowerAdjustedFactorDTO.class);
@@ -474,11 +475,16 @@
List<String> points = new ArrayList<>();
Map<String, Object> dataMap = new HashMap<>();
for (PowerAdjustedFactorDTO dto : dtoList) {
- points.add(dto.getPointNo());
+ if (StringUtils.isNotBlank(dto.getPointNo())) {
+ points.add(dto.getPointNo());
+ }
}
- dataMap = dataPointApi.queryPointsRealValue(points);
+ if (!CollectionUtils.isEmpty(points)) {
+ dataMap = dataPointApi.queryPointsRealValue(points);
+ }
for (PowerAdjustedFactorDTO powerAdjustedFactorDTO : dtoList) {
- result.put(powerAdjustedFactorDTO.getName(), Double.parseDouble(dataMap.get(powerAdjustedFactorDTO.getPointNo()).toString()));
+ Double value = dataMap.get(powerAdjustedFactorDTO.getPointNo()) == null ? 0 : Double.parseDouble(dataMap.get(powerAdjustedFactorDTO.getPointNo()).toString());
+ result.put(powerAdjustedFactorDTO.getName(), value);
}
return success(result);
}
--
Gitblit v1.9.3