From 94a5f0a2c84738d81844670c80f8de62a8223267 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 13 二月 2025 14:29:19 +0800
Subject: [PATCH] 数据分析 添加预测累计
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index 3e8e7da..aea343c 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -259,6 +259,14 @@
viewDto.setMaxValue(new BigDecimal(values.stream().mapToDouble(Double::doubleValue).max().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
viewDto.setMinValue(new BigDecimal(values.stream().mapToDouble(Double::doubleValue).min().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
}
+ //处理预测累计
+ if (output.getIscumulant() == 1) {
+ if (StringUtils.isNotBlank(output.getCumulpoint())) {
+ viewDto.setCumulantRealData(getHisData(output.getCumulpoint(), startTime, endTime));
+ }
+ viewDto.setCumulantPreData(mmItemResultService.getData(output.getId() + CommonDict.CUMULANT_SUFFIX, startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ }
+
dataViewList.add(viewDto);
}
result.setStartTime(startTime);
@@ -316,7 +324,7 @@
viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime));
}
viewDto.setPreDataN(mmItemResultService.getData(out.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
- //处理累计点
+ //处理预测累计
if (out.getIscumulant() == 1) {
if (StringUtils.isNotBlank(out.getCumulpoint())) {
viewDto.setCumulantRealData(getHisData(out.getCumulpoint(), startTime, endTime));
@@ -529,6 +537,9 @@
*/
private List<Object[]> getHisData(String pointId, Date startTime, Date endTime) {
List<Object[]> result = new ArrayList<>();
+ if (StringUtils.isBlank(pointId)) {
+ return result;
+ }
ApiPointDTO pointDTO = dataPointApi.getInfoById(pointId);
ApiPointValueQueryDTO queryPointDto = new ApiPointValueQueryDTO();
queryPointDto.setPointNo(pointDTO.getPointNo());
--
Gitblit v1.9.3