From 3d3e5b0618f9f7cac1e2d41dd1089afcafcc55e8 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期四, 19 六月 2025 09:14:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 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 8194b81..7508701 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
@@ -16,6 +16,7 @@
import com.iailab.module.ansteel.api.vo.PowerMaxDemandMainPageReqVO;
import com.iailab.module.ansteel.common.constant.CommonConstant;
import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
+import com.iailab.module.ansteel.common.utils.CalendarUtil;
import com.iailab.module.ansteel.common.utils.DecimalUtil;
import com.iailab.module.ansteel.common.utils.PowerUtil;
import com.iailab.module.ansteel.power.entity.*;
@@ -739,13 +740,13 @@
Map<String, Object> params0 = new HashMap<>();
params0.put("groupName", entity.getName());
List<PowerNetDropdownEntity> list0 = powerNetDropdownService.list(params0);
- if (CollectionUtils.isEmpty(list0)) {
+ if (!CollectionUtils.isEmpty(list0)) {
list.addAll(list0);
}
Map<String, Object> params1 = new HashMap<>();
params1.put("groupName", "COMMON1");
List<PowerNetDropdownEntity> list1 = powerNetDropdownService.list(params1);
- if (CollectionUtils.isEmpty(list1)) {
+ if (!CollectionUtils.isEmpty(list1)) {
list.addAll(list1);
}
@@ -1600,6 +1601,7 @@
throw new IllegalArgumentException("不支持的queryType: " + queryType);
}
+
// 查询历史数据
ApiPointValueQueryDTO query = new ApiPointValueQueryDTO();
query.setPointNo(pointNo);
@@ -1614,10 +1616,13 @@
})
.collect(Collectors.toList());
+ List<Double> valueList = chartData.stream().map(pv -> {
+ return pv.getV();
+ }).collect(Collectors.toList());
powerHistoryDTO.setDataList(dataList);
//查询月最大最小值
- ApiPointValueQueryDTO apiPointValueQueryDTO1 = new ApiPointValueQueryDTO();
+ /*ApiPointValueQueryDTO apiPointValueQueryDTO1 = new ApiPointValueQueryDTO();
apiPointValueQueryDTO1.setStart(start1);
apiPointValueQueryDTO1.setEnd(new Date());
apiPointValueQueryDTO1.setPointNo(pointNo);
@@ -1628,7 +1633,40 @@
}
if (minV != null && minV.containsKey(pointNo)) {
powerHistoryDTO.setMin(new BigDecimal(minV.get(pointNo).toString()));
+ }*/
+
+
+ double max = 0;
+ double min = 0;
+ double avg = 0;
+ String maxTime = "";
+ String minTime = "";
+ if (!CollectionUtils.isEmpty(valueList)) {
+ // max = valueList.stream().mapToDouble(Double::doubleValue).max().getAsDouble();
+ // min = valueList.stream().mapToDouble(Double::doubleValue).min().getAsDouble();
+ avg = valueList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+ max = valueList.get(0).doubleValue();
+ min = valueList.get(0).doubleValue();
+ for (Object[] dataItem : dataList) {
+ String time = (String) dataItem[0];
+ double value = (double)dataItem[1];
+ if (value > max) {
+ max = value;
+ maxTime = time;
+ }
+ if (value < min) {
+ min = value;
+ minTime = time;
+ }
+ }
}
+
+ powerHistoryDTO.setMax(new BigDecimal(max).setScale(2, BigDecimal.ROUND_HALF_UP));
+ powerHistoryDTO.setMin(new BigDecimal(min).setScale(2, BigDecimal.ROUND_HALF_UP));
+ powerHistoryDTO.setAvg(new BigDecimal(avg).setScale(2, BigDecimal.ROUND_HALF_UP));
+ powerHistoryDTO.setMaxTime(maxTime);
+ powerHistoryDTO.setMinTime(minTime);
+ powerHistoryDTO.setDataList(dataList);
result.put(code, powerHistoryDTO);
}
@@ -1677,6 +1715,11 @@
log.info("code is blank");
return error(GlobalErrorCodeConstants.BAD_REQUEST);
}
+ // 默认只展示当月
+ if(reqVO.getStartTime() == null) {
+ reqVO.setStartTime(CalendarUtil.getMonthFirstDay());
+ }
+
PageResult<PowerMaxdemandMainEntity> page = powerMaxDemandMainService.page(reqVO);
PageResult<PowerMaxDemandMainDTO> result = BeanUtils.toBean(page, PowerMaxDemandMainDTO.class);
result.getList().forEach(dto0 -> {
--
Gitblit v1.9.3