From 4c1658f05f5be04b135920366ad4c417fad0c491 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 10 四月 2025 09:48:36 +0800
Subject: [PATCH] 增加真实值为空判断
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java | 2 +-
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 21 +++++++++++++--------
2 files changed, 14 insertions(+), 9 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 268ec05..bf0c67d 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
@@ -402,20 +402,25 @@
dataView.setRangeL(rangeL);
dataView.setLimitH(limitH);
dataView.setLimitL(limitL);
+
+ Map<String, Object> realDataMap = new HashMap<>();
if (StringUtils.isNotBlank(outPut.getPointid())) {
dataView.setRealData(getHisData(outPut.getPointid(), startTime, endTime, timeFormat));
+ dataView.getRealData().forEach(item -> {
+ realDataMap.put(item[0].toString(), item[1]);
+ });
} else {
dataView.setRealData(new ArrayList<>());
}
+ if (!CollectionUtils.isEmpty(realDataMap)) {
+ Object curReal = realDataMap.get(DateUtils.format(predictTime, timeFormat)) == null ?
+ dataView.getRealData().get(dataView.getRealData().size() - 1) : realDataMap.get(DateUtils.format(predictTime, timeFormat));
+ // 当前值T0 + 当前预测值 20250409
+ dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat, 3, true, curReal));
+ } else {
+ dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat, 3));
+ }
- Map<String, Object> realDataMap = new HashMap<>();
- dataView.getRealData().forEach(item -> {
- realDataMap.put(item[0].toString(), item[1]);
- });
- Object curReal = realDataMap.get(DateUtils.format(predictTime, timeFormat)) == null ? dataView.getPreDataL().get(dataView.getPreDataL().size() - 1) : realDataMap.get(DateUtils.format(predictTime, timeFormat));
-
- // 当前值T0 + 当前预测值 20250409
- dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat, 3, true, curReal));
// 调整预测值
dataView.setAdjData(stAdjustResultService.getData(outPut.getId(),predictTime,timeFormat));
dataView.setLineType(lineType.getCode());
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java
index 2541302..39478f2 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java
@@ -64,8 +64,8 @@
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictTime);
valueList.forEach(value -> {
- Object[] dv = {DateUtils.format(calendar.getTime(), timeFormat), new BigDecimal(value).setScale(scale, BigDecimal.ROUND_HALF_UP)};
calendar.add(Calendar.MINUTE, 1);
+ Object[] dv = {DateUtils.format(calendar.getTime(), timeFormat), new BigDecimal(value).setScale(scale, BigDecimal.ROUND_HALF_UP)};
result.add(dv);
});
return result;
--
Gitblit v1.9.3