From fed257d4ee8c5f09affe0fb4611933d1f7ec724e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 14 一月 2025 23:19:39 +0800
Subject: [PATCH] 获取最后预测值

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 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..ebe9567 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,8 @@
         } else {
             dataView.setRealData(new ArrayList<>());
         }
-        // dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat));
+        dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat));
+        dataView.setLineType(lineType.getCode());
         switch (lineType) {
             case TN:
                 dataView.setPreDataN(mmItemResultService.getData(outPut.getId(), startTime, endTime, timeFormat));
@@ -369,14 +370,20 @@
             default:
                 break;
         }
+        if (!CollectionUtils.isEmpty(dataView.getRealData())) {
+            Object[] rdo = dataView.getRealData().get(dataView.getRealData().size() - 1);
+            dataView.setCurrValue(new BigDecimal(rdo[1].toString()));
+        }
 
-        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);
@@ -626,6 +633,31 @@
         return result;
     }
 
+    public Map<String, BigDecimal> getPredictLastValue(PredictLastValueReqVO reqVO) {
+        Map<String, BigDecimal> result = new HashMap<>(reqVO.getItemNos().size());
+        if (CollectionUtils.isEmpty(reqVO.getItemNos())) {
+            return result;
+        }
+        List<String[]> itemNos = reqVO.getItemNos();
+        for (String[] itemNo : itemNos) {
+            String key = itemNo[0] + "_" + itemNo[1] + "_" + itemNo[2];
+            ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemNo[0]);
+            if (predictItem == null || predictItem.getLastTime() == null) {
+                result.put(key, BigDecimal.ZERO);
+            }
+            MmItemOutputEntity outPut = mmItemOutputService.getByItemid(predictItem.getId(), itemNo[1], itemNo[2]);
+
+            Date predictTime = predictItem.getLastTime();
+            List<Object[]> curData = mmItemResultJsonService.getData(outPut.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+            if(CollectionUtils.isEmpty(curData)) {
+                result.put(key, BigDecimal.ZERO);
+            } else {
+                result.put(key, new BigDecimal(curData.get(curData.size() - 1)[1].toString()));
+            }
+        }
+        return result;
+    }
+
     private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
         Date[] result = new Date[3];
         Date predictTime = predictItem.getLastTime();

--
Gitblit v1.9.3