From 3722c4ed5f266c455be1e16998803ca8dfef5ecd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 14 一月 2025 16:44:49 +0800
Subject: [PATCH] 预测累计值

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 cb22a4f..8927321 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
@@ -357,7 +357,7 @@
         } else {
             dataView.setRealData(new ArrayList<>());
         }
-        // dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat));
+        dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat));
         switch (lineType) {
             case TN:
                 dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), startTime, endTime, timeFormat));
@@ -370,13 +370,15 @@
                 break;
         }
 
-        if (!CollectionUtils.isEmpty(dataView.getPreDataN())) {
-            List<Double> curList = dataView.getPreDataN().stream().map(t -> {
+        if (!CollectionUtils.isEmpty(dataView.getCurData())) {
+            List<Double> curList = dataView.getCurData().stream().map(t -> {
                 return new Double(t[1].toString());
             }).collect(Collectors.toList());
             dataView.setPreMax(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).max().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
             dataView.setPreMin(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).min().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
             dataView.setPreLast(new BigDecimal(curList.get(curList.size() - 1)));
+            dataView.setPreCumulant(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).sum())
+                    .divide(new BigDecimal(HOUR_MINS), 2, BigDecimal.ROUND_HALF_UP));
         }
 
         String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ);

--
Gitblit v1.9.3