From 8dfd1ac7e9c5f0d513b22bcb9647f10a2b931b17 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 22 四月 2025 14:27:55 +0800
Subject: [PATCH] 功率因数
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDTO.java | 3 +++
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 7 ++++---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorHisReqDTO.java | 2 +-
3 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 15e77c9..1a36338 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.getByNodeName(nodeCode);
PowerHistoryDTO result = new PowerHistoryDTO();
if (powerNetFactor == null) {
log.info("powerNetFactor is null");
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDTO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDTO.java
index de50e82..b769dc2 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDTO.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDTO.java
@@ -22,6 +22,9 @@
@Schema(description = "分组名称")
private String groupName;
+ @Schema(description = "节点编号")
+ private String nodeCode;
+
@Schema(description = "节点名称")
private String nodeName;
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorHisReqDTO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorHisReqDTO.java
index 043ead5..8f6e168 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorHisReqDTO.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorHisReqDTO.java
@@ -15,7 +15,7 @@
public class PowerNetFactorHisReqDTO implements Serializable {
private static final long serialVersionUID = 1L;
- private String nodeName;
+ private String nodeCode;
private String queryType;
--
Gitblit v1.9.3