From 6e38f4eca3dfe5a11f3a97bf6bce487a90c0a93d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 07 五月 2025 11:10:57 +0800
Subject: [PATCH] 查询月最大最小值
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 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 b492ecc..3df8ba4 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
@@ -173,50 +173,46 @@
}
// 设置电流状态
+ powerNetFactorDTO.setStatus(0);
if (powerNetFactorDTO.getCurA() != null) {
BigDecimal curA = powerNetFactorDTO.getCurA();
if (entity.getLimitL() != null && curA.compareTo(entity.getLimitL()) < 0) {
powerNetFactorDTO.setStatus(1);
} else if (entity.getLimitH() != null && curA.compareTo(entity.getLimitH()) > 0) {
powerNetFactorDTO.setStatus(1);
- } else {
- powerNetFactorDTO.setStatus(0);
}
}
// 设置功率因数状态
+ powerNetFactorDTO.setQstatus(0);
if (cosFlag && powerNetFactorDTO.getCurCos() != null) {
BigDecimal curCos = powerNetFactorDTO.getCurCos();
if (entity.getCosLimitL() != null && curCos.compareTo(entity.getCosLimitL()) < 0) {
- powerNetFactorDTO.setQStatus(1);
+ powerNetFactorDTO.setQstatus(1);
} else if (entity.getCosLimitH() != null && curCos.compareTo(entity.getCosLimitH()) > 0) {
- powerNetFactorDTO.setQStatus(1);
- } else {
- powerNetFactorDTO.setQStatus(0);
+ powerNetFactorDTO.setQstatus(1);
}
}
// 设置有功预警状态
+ powerNetFactorDTO.setPstatus(0);
if (powerNetFactorDTO.getCurP() != null) {
BigDecimal curP = powerNetFactorDTO.getCurP();
if (entity.getPLimitL() != null && curP.compareTo(entity.getPLimitL()) < 0) {
- powerNetFactorDTO.setPStatus(1);
+ powerNetFactorDTO.setPstatus(1);
} else if (entity.getPLimitH() != null && curP.compareTo(entity.getPLimitH()) > 0) {
- powerNetFactorDTO.setPStatus(1);
- } else {
- powerNetFactorDTO.setPStatus(0);
+ powerNetFactorDTO.setPstatus(1);
}
}
// 设置无功预警状态
+ powerNetFactorDTO.setQstatus(0);
if (powerNetFactorDTO.getCurQ() != null) {
BigDecimal curQ = powerNetFactorDTO.getCurQ();
if (entity.getQLimitL() != null && curQ.compareTo(entity.getQLimitL()) < 0) {
- powerNetFactorDTO.setQStatus(1);
+ powerNetFactorDTO.setQstatus(1);
} else if (entity.getQLimitH() != null && curQ.compareTo(entity.getQLimitH()) > 0) {
- powerNetFactorDTO.setQStatus(1);
- } else {
- powerNetFactorDTO.setQStatus(0);
+ powerNetFactorDTO.setQstatus(1);
}
}
result.add(powerNetFactorDTO);
@@ -870,10 +866,9 @@
apiPointValueQueryDTO1.setStart(start1);
apiPointValueQueryDTO1.setEnd(new Date());
apiPointValueQueryDTO1.setPointNo(pointNo);
- List<ApiPointValueDTO> monthChartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
- List<Double> monthValues = new ArrayList<>();
- if (CollectionUtils.isEmpty(monthChartData)) {
- monthValues = monthChartData.stream().map(item -> item.getV()).collect(Collectors.toList());
+ List<ApiPointValueDTO> monthChartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO1);
+ if (!CollectionUtils.isEmpty(monthChartData)) {
+ List<Double> monthValues = monthChartData.stream().map(item -> item.getV()).collect(Collectors.toList());
powerHistoryDTO.setMax(monthValues.stream().max(Double::compareTo).get());
powerHistoryDTO.setMin(monthValues.stream().min(Double::compareTo).get());
}
--
Gitblit v1.9.3