From 0bdd92857e4dd960d77acb714d25b7cc2ee0789b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 18 六月 2025 14:20:16 +0800
Subject: [PATCH] 所有关口进线的二级界面（表格/曲线）均增加（CCPP/135/CDQ/TRT/余热）的选项。
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 377 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 319 insertions(+), 58 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 c783374..48e62cc 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
@@ -8,8 +8,11 @@
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
+import com.iailab.framework.excel.core.util.ExcelUtils;
import com.iailab.module.ansteel.api.dto.*;
import com.iailab.module.ansteel.api.vo.PowerCapacitorHisPageReqVO;
+import com.iailab.module.ansteel.api.vo.PowerExportCosVO;
+import com.iailab.module.ansteel.api.vo.PowerExportPqVO;
import com.iailab.module.ansteel.api.vo.PowerMaxDemandMainPageReqVO;
import com.iailab.module.ansteel.common.constant.CommonConstant;
import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
@@ -33,6 +36,9 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -296,6 +302,13 @@
params.put("groupName", entity.getNodeName());
}
list = powerNetDropdownService.list(params);
+
+ // 追加公共 2025-06-18
+ Map<String, Object> paramsCom = new HashMap<>();
+ paramsCom.put("groupName", "COMMON1");
+ List<PowerNetDropdownEntity> comList = powerNetDropdownService.list(paramsCom);
+ list.addAll(comList);
+
List<String> points = list.stream().map(item -> {
return item.getCurCos();
}).collect(Collectors.toList());
@@ -722,9 +735,20 @@
log.info("PowerDemandEntity is null");
return success(result);
}
+ List<PowerNetDropdownEntity> list = new ArrayList<>();
Map<String, Object> params0 = new HashMap<>();
params0.put("groupName", entity.getName());
- List<PowerNetDropdownEntity> list = powerNetDropdownService.list(params0);
+ List<PowerNetDropdownEntity> list0 = powerNetDropdownService.list(params0);
+ 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)) {
+ list.addAll(list1);
+ }
+
List<String> points = list.stream().map(item -> {
return item.getCurCos();
}).collect(Collectors.toList());
@@ -839,10 +863,24 @@
return success(result);
}
+ /**
+ * 导出功率日累计
+ * 月报表导出：最大值、最小值、平均值、受电累计、返送累计
+ * 日功率因数二级界面：最大值、最小值、平均值、日功率因数
+ * 月功率因数二级界面：最大值、最小值、平均值、月功率因数
+ *
+ * @param response
+ * @param request
+ * @param dto
+ */
@PostMapping("/net-factor/export-day")
@Operation(summary = "功率因数-电网拓扑功率导出(功率日累计)")
- public CommonResult<List<PowerFactorExcelDTO>> getPowerFactorExportDay(@RequestBody PowerFactorExcelReqDTO dto) {
- List<PowerFactorExcelDTO> result = new ArrayList<>();
+ public void getPowerFactorExportDay(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody PowerFactorExcelReqDTO dto) throws IOException {
+
+ List<PowerExportPqVO> exportPqList = new ArrayList<>();
+ List<PowerExportCosVO> exportCos = new ArrayList<>();
+
if (dto.getStartTime() == null) {
dto.setStartTime(new Date());
}
@@ -870,6 +908,7 @@
Calendar curDay = Calendar.getInstance();
curDay.setTime(startTime);
do {
+ log.info("do excel");
PowerFactorExcelDTO excelDTO = new PowerFactorExcelDTO();
switch (queryType.toUpperCase()) {
case "P":
@@ -878,65 +917,119 @@
case "Q":
pointNo = powerNetFactorEntity.getCurQ();
break;
+ case "DAYCOS":
+ pointNoArr[0] = powerNetFactorEntity.getPDay();
+ pointNoArr[1] = powerNetFactorEntity.getQDay();
+ break;
+ case "MONTHCOS":
+ pointNoArr[0] = powerNetFactorEntity.getPMon();
+ pointNoArr[1] = powerNetFactorEntity.getQMon();
+ break;
default:
- return success(result);
- }
- if (StringUtils.isEmpty(pointNo)) {
- return success(result);
+ return;
}
- List<Double> valueList = new ArrayList<>();
ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
- apiPointValueQueryDTO.setPointNo(pointNo);
apiPointValueQueryDTO.setStart(curDay.getTime());
curDay.add(Calendar.DAY_OF_YEAR, 1);
apiPointValueQueryDTO.setEnd(curDay.getTime());
- List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
- for (ApiPointValueDTO pv : chartData) {
- Object[] data = new Object[2];
- data[0] = DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
- data[1] = pv.getV();
- valueList.add(pv.getV());
+ List<Double> valueList = new ArrayList<>();
+ Double lastValue = null;
+ if (StringUtils.isNotBlank(pointNo)) {
+ // 单点
+ apiPointValueQueryDTO.setPointNo(pointNo);
+ List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
+ for (ApiPointValueDTO pv : chartData) {
+ Object[] data = new Object[2];
+ data[0] = DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ data[1] = pv.getV();
+ valueList.add(pv.getV());
+ }
+ } else if (StringUtils.isNotBlank(pointNoArr[0]) && StringUtils.isNotBlank(pointNoArr[1])) {
+ List<String> categories = new ArrayList<>();
+
+ // P/Q
+ apiPointValueQueryDTO.setPointNo(pointNoArr[0]);
+ List<ApiPointValueDTO> chartDataP = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
+ Map<String, Double> dataMapP = new HashMap<>();
+ for (ApiPointValueDTO pv : chartDataP) {
+ categories.add(DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ dataMapP.put(DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND), pv.getV());
+ }
+
+ apiPointValueQueryDTO.setPointNo(pointNoArr[1]);
+ List<ApiPointValueDTO> chartDataQ = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
+ Map<String, Double> dataMapQ = new HashMap<>();
+ for (ApiPointValueDTO pv : chartDataQ) {
+ dataMapQ.put(DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND), pv.getV());
+ }
+ for (String cate : categories) {
+ Double cos = PowerUtil.calculateCos(dataMapP.get(cate), dataMapQ.get(cate));
+ valueList.add(cos);
+ }
+
}
-
- double day = 0;
double max = 0;
double min = 0;
double avg = 0;
- double fsl = 0;
if (!CollectionUtils.isEmpty(valueList)) {
- day = valueList.stream().mapToDouble(Double::doubleValue).sum();
max = valueList.stream().mapToDouble(Double::doubleValue).max().getAsDouble();
min = valueList.stream().mapToDouble(Double::doubleValue).min().getAsDouble();
avg = valueList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+ }
- if (powerNetFactorEntity.getCurFlag() != null && powerNetFactorEntity.getCurFlag().intValue() != 0) {
- for ( Double val : valueList) {
- if (new BigDecimal(val).compareTo(BigDecimal.ZERO) != powerNetFactorEntity.getCurFlag()) {
- // 未发生返送
- continue;
+ if ("P".equals(queryType.toUpperCase()) || "Q".equals(queryType.toUpperCase())) {
+ PowerExportPqVO evo = new PowerExportPqVO();
+ double sdl = 0;
+ double fsl = 0;
+ if (!CollectionUtils.isEmpty(valueList)) {
+ if (powerNetFactorEntity.getCurFlag() != null && powerNetFactorEntity.getCurFlag().intValue() != 0) {
+ for ( Double val : valueList) {
+ if (new BigDecimal(val).compareTo(BigDecimal.ZERO) != powerNetFactorEntity.getCurFlag()) {
+ // 未发生返送
+ sdl += val;
+ } else {
+ // 发生返送
+ fsl += val;
+ }
}
- fsl += val;
}
}
+ evo.setSdl(new BigDecimal(sdl).setScale(2, BigDecimal.ROUND_HALF_UP));
+ evo.setFsl(new BigDecimal(fsl).setScale(2, BigDecimal.ROUND_HALF_UP));
+ evo.setMax(new BigDecimal(max).setScale(2, BigDecimal.ROUND_HALF_UP));
+ evo.setMin(new BigDecimal(min).setScale(2, BigDecimal.ROUND_HALF_UP));
+ evo.setAvg(new BigDecimal(avg).setScale(2, BigDecimal.ROUND_HALF_UP));
+ evo.setDate(DateUtils.format(apiPointValueQueryDTO.getStart()));
+ exportPqList.add(evo);
+ } else if ("DAYCOS".equals(queryType.toUpperCase()) || "MONTHCOS".equals(queryType.toUpperCase())) {
+ double dayLast = 0;
+ if (!CollectionUtils.isEmpty(valueList)) {
+ dayLast = valueList.get(valueList.size() - 1);
+ }
+ PowerExportCosVO evo = new PowerExportCosVO();
+ evo.setCos(new BigDecimal(dayLast).setScale(2, BigDecimal.ROUND_HALF_UP));
+ evo.setMax(new BigDecimal(max).setScale(2, BigDecimal.ROUND_HALF_UP));
+ evo.setMin(new BigDecimal(min).setScale(2, BigDecimal.ROUND_HALF_UP));
+ evo.setAvg(new BigDecimal(avg).setScale(2, BigDecimal.ROUND_HALF_UP));
+ evo.setDate(DateUtils.format(apiPointValueQueryDTO.getStart()));
+ exportCos.add(evo);
}
- excelDTO.setDay(new BigDecimal(day).setScale(2, BigDecimal.ROUND_HALF_UP));
- excelDTO.setMax(new BigDecimal(max).setScale(2, BigDecimal.ROUND_HALF_UP));
- excelDTO.setMin(new BigDecimal(min).setScale(2, BigDecimal.ROUND_HALF_UP));
- excelDTO.setAvg(new BigDecimal(avg).setScale(2, BigDecimal.ROUND_HALF_UP));
-
- // 当查询为P, Q，且有返送flag时 计算 返送累计
- if (("P".equals(queryType.toUpperCase()) || "Q".equals(queryType.toUpperCase())) &&
- powerNetFactorEntity.getCurFlag() != null &&
- powerNetFactorEntity.getCurFlag().intValue() != 0) {
- excelDTO.setFsl(new BigDecimal(fsl).setScale(2, BigDecimal.ROUND_HALF_UP));
- }
-
- excelDTO.setDate(DateUtils.format(apiPointValueQueryDTO.getStart()));
} while (curDay.getTime().getTime() <= endTime.getTime());
- return success(result);
+
+ if ("P".equals(queryType.toUpperCase()) || "Q".equals(queryType.toUpperCase())) {
+ String name = powerNetFactorEntity.getNodeName() +
+ queryType.toUpperCase().replace("P", "有功").replace("Q", "无功") +
+ "功率报表.xls";
+ ExcelUtils.write(response, name, "功率数据", PowerExportPqVO.class, exportPqList);
+ } else if ("DAYCOS".equals(queryType.toUpperCase()) || "MONTHCOS".equals(queryType.toUpperCase())) {
+ String name = powerNetFactorEntity.getNodeName() +
+ queryType.toUpperCase().replace("DAYCOS", "日").replace("MONTHCOS", "月") +
+ "功率因数报表.xls";
+ ExcelUtils.write(response, name, "功率数据", PowerExportPqVO.class, exportPqList);
+ }
}
@PostMapping("/net-factor/history")
@@ -1061,6 +1154,136 @@
return success(result);
}
+ @PostMapping("/net-factor/export-history")
+ @Operation(summary = "功率因数-电网拓扑功率历史导出(多code)")
+ public void exportPowerHistoryList(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody PowerNetFactorHisReqDTO dto) throws IOException {
+ log.info("exportPowerHistoryList开始");
+ String firstCol = "时间";
+ List<String> column = new ArrayList<>();
+ column.add(firstCol);
+ List<List<Object>> exportData = new ArrayList<>();
+
+ List<String> nodeCodeList = dto.getNodeCodeList();
+ if (CollectionUtils.isEmpty(nodeCodeList)) {
+ return;
+ }
+ String queryType = dto.getQueryType();
+ if (StringUtils.isBlank(queryType)) {
+ return;
+ }
+ Calendar calendar0 = Calendar.getInstance();
+ calendar0.set(Calendar.MILLISECOND, 0);
+ calendar0.set(Calendar.SECOND, 0);
+ Date end0 = dto.getEndTime() == null ? calendar0.getTime() : dto.getEndTime();
+ calendar0.set(Calendar.MINUTE, 0);
+ calendar0.set(Calendar.HOUR_OF_DAY, 0);
+ Date start0 = dto.getStartTime() == null ? calendar0.getTime() : dto.getStartTime();
+
+ Map<String, Map<String, Object>> dataAll = new HashMap<>();
+ List<String> categories = DateUtils.getTimeScale(start0, end0, 60);
+ for (String nodeCode : nodeCodeList) {
+ PowerNetFactorQuery powerNetFactorQuery = null;
+ PowerNetFactorEntity powerNetFactorEntity = powerNetFactorService.getByNodeCode(nodeCode);
+ PowerNetDropdownEntity powerNetDropdownEntity = powerNetDropdownService.getByNodeCode(nodeCode);
+ if (powerNetFactorEntity != null) {
+ powerNetFactorQuery = ConvertUtils.sourceToTarget(powerNetFactorEntity, PowerNetFactorQuery.class);
+ } else if (powerNetDropdownEntity != null) {
+ powerNetFactorQuery = ConvertUtils.sourceToTarget(powerNetDropdownEntity, PowerNetFactorQuery.class);
+ }
+ if (powerNetFactorQuery == null) {
+ log.info("powerNetFactor is null");
+ continue;
+ }
+ column.add(powerNetFactorQuery.getNodeName());
+
+ log.info("开始查询，");
+ ApiPointValueQueryDTO apiPointValueQueryDTO = new ApiPointValueQueryDTO();
+ String pointNo = "";
+ String[] pointNoArr = new String[2];
+ switch (queryType.toUpperCase()) {
+ case "P":
+ pointNo = powerNetFactorQuery.getCurP();
+ break;
+ case "Q":
+ pointNo = powerNetFactorQuery.getCurQ();
+ break;
+ case "COS":
+ pointNo = powerNetFactorQuery.getCurCos();
+ break;
+ case "DAYCOS":
+ pointNoArr[0] = powerNetFactorEntity.getPDay();
+ pointNoArr[1] = powerNetFactorEntity.getQDay();
+ break;
+ case "MONTHCOS":
+ pointNoArr[0] = powerNetFactorEntity.getPMon();
+ pointNoArr[1] = powerNetFactorEntity.getQMon();
+ break;
+ default:
+ break;
+ }
+
+ //查询图表
+ apiPointValueQueryDTO.setEnd(end0);
+ apiPointValueQueryDTO.setStart(start0);
+ Map<String, Object> dataMap = new HashMap<>();
+
+ if (StringUtils.isNotBlank(pointNo)) {
+ log.info("查询功率");
+ apiPointValueQueryDTO.setPointNo(pointNo);
+ List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
+ for (ApiPointValueDTO pv : chartData) {
+ String key = DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+ Object val = pv.getV();
+ dataMap.put(key, val);
+ }
+ } else if (StringUtils.isNotBlank(pointNoArr[0]) && StringUtils.isNotBlank(pointNoArr[1])) {
+ log.info("查询累计功率");
+ apiPointValueQueryDTO.setPointNo(pointNoArr[0]);
+ List<ApiPointValueDTO> chartDataP = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
+ Map<String, Double> dataMapP = new HashMap<>();
+ for (ApiPointValueDTO pv : chartDataP) {
+ dataMapP.put(DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND), pv.getV());
+ }
+
+ apiPointValueQueryDTO.setPointNo(pointNoArr[1]);
+ List<ApiPointValueDTO> chartDataQ = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
+ Map<String, Double> dataMapQ = new HashMap<>();
+ for (ApiPointValueDTO pv : chartDataQ) {
+ dataMapQ.put(DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND), pv.getV());
+ }
+
+ for (String cate : categories) {
+ Double cos = PowerUtil.calculateCos(dataMapP.get(cate), dataMapQ.get(cate));
+ Object val = cos == null ? 0 : new BigDecimal(cos).setScale(2, BigDecimal.ROUND_HALF_UP);
+ dataMap.put(cate, val);
+ }
+
+ }
+ dataAll.put(powerNetFactorQuery.getNodeName(), dataMap);
+ }
+ log.info("column=" + JSONArray.toJSONString(column));
+ for (String cate : categories) {
+ List<Object> row = new ArrayList<>();
+ for (String col : column) {
+ if (firstCol.equals(col)) {
+ row.add(cate);
+ } else if (dataAll.get(col) == null) {
+ log.info(col + " is null");
+ row.add("");
+ } else if (dataAll.get(col).get(cate) == null) {
+ log.info(col + cate + " is null");
+ row.add("");
+ } else {
+ row.add(dataAll.get(col).get(cate));
+ }
+ }
+ exportData.add(row);
+ }
+ log.info("exportData.size=" + exportData.size());
+ ExcelUtils.write(response, "历史.xlsx", "历史数据", column, exportData);
+ }
+
@PostMapping("/net-factor/history-list")
@Operation(summary = "功率因数-电网拓扑功率历史(多code)")
public CommonResult<LinkedHashMap<String, PowerHistoryDTO>> getPowerHistoryList(@RequestBody PowerNetFactorHisReqDTO dto) {
@@ -1129,9 +1352,14 @@
apiPointValueQueryDTO.setEnd(end0);
apiPointValueQueryDTO.setStart(start0);
List<Object[]> dataList = new ArrayList<>();
+ List<Double> valueList = new ArrayList<>();
+ double max = 0;
+ double min = 0;
+ double avg = 0;
+ String maxTime = "";
+ String minTime = "";
if (StringUtils.isNotBlank(pointNo)) {
- List<Double> valueList = new ArrayList<>();
apiPointValueQueryDTO.setPointNo(pointNo);
List<ApiPointValueDTO> chartData = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
for (ApiPointValueDTO pv : chartData) {
@@ -1142,15 +1370,9 @@
valueList.add(pv.getV());
}
+ // 返送累计
double fsl = 0;
- double max = 0;
- double min = 0;
- double avg = 0;
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();
-
if (powerNetFactorQuery.getCurFlag() != null && powerNetFactorQuery.getCurFlag().intValue() != 0) {
for ( Double val : valueList) {
if (new BigDecimal(val).compareTo(BigDecimal.ZERO) != powerNetFactorQuery.getCurFlag()) {
@@ -1161,21 +1383,60 @@
}
}
}
-
- 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));
-
- // 当查询为P, Q，且有返送flag时 计算 返送累计
- if (("P".equals(queryType.toUpperCase()) || "Q".equals(queryType.toUpperCase())) &&
- powerNetFactorQuery.getCurFlag() != null &&
- powerNetFactorQuery.getCurFlag().intValue() != 0) {
- powerHistoryDTO.setFsl(new BigDecimal(fsl).setScale(2, BigDecimal.ROUND_HALF_UP));
+ powerHistoryDTO.setFsl(new BigDecimal(fsl).setScale(2, BigDecimal.ROUND_HALF_UP));
+ } else if (StringUtils.isNotBlank(pointNoArr[0]) && StringUtils.isNotBlank(pointNoArr[1])) {
+ apiPointValueQueryDTO.setPointNo(pointNoArr[0]);
+ List<ApiPointValueDTO> chartDataP = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
+ Map<String, Double> dataMapP = new HashMap<>();
+ for (ApiPointValueDTO pv : chartDataP) {
+ dataMapP.put(DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND), pv.getV());
}
- } else if (StringUtils.isNotBlank(pointNoArr[0]) && StringUtils.isNotBlank(pointNoArr[1])) {
+ apiPointValueQueryDTO.setPointNo(pointNoArr[1]);
+ List<ApiPointValueDTO> chartDataQ = dataPointApi.queryPointHistoryValue(apiPointValueQueryDTO);
+ Map<String, Double> dataMapQ = new HashMap<>();
+ for (ApiPointValueDTO pv : chartDataQ) {
+ dataMapQ.put(DateUtils.format(pv.getT(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND), pv.getV());
+ }
+ for (String cate : categories) {
+ Double cos = PowerUtil.calculateCos(dataMapP.get(cate), dataMapQ.get(cate));
+ if (cos == null) {
+ continue;
+ }
+ Object[] data = new Object[2];
+ data[0] = cate;
+ data[1] = cos;
+ dataList.add(data);
+ valueList.add(cos);
+ }
}
+
+ 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(nodeCode, powerHistoryDTO);
}
--
Gitblit v1.9.3