From 285dd1aff222671e9ff243731183795f7c511d1d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 24 三月 2025 12:44:09 +0800
Subject: [PATCH] 累计预测值

---
 iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java |    3 +++
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java                 |   13 +++++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java
index 48602c3..df7a604 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java
@@ -131,4 +131,7 @@
 
     @Schema(description = "累计预测值")
     private List<Object[]> cumulantPreData;
+
+    @Schema(description = "累计预测值")
+    private Object cumulantPreValue;
 }
\ No newline at end of file
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 8230371..a24443b 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
@@ -426,6 +426,19 @@
             default:
                 break;
         }
+
+        //处理预测累计
+        if (outPut.getIscumulant() != null && outPut.getIscumulant() == 1) {
+            if (StringUtils.isNotBlank(outPut.getCumulpoint())) {
+                dataView.setCumulantRealData(getHisData(outPut.getCumulpoint(), predictTime, endTime));
+            }
+            List<Object[]> cumulantPreList = mmItemResultService.getData(outPut.getId() + CommonDict.CUMULANT_SUFFIX, predictTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+            dataView.setCumulantPreData(cumulantPreList);
+            if (!CollectionUtils.isEmpty(cumulantPreList)) {
+                dataView.setCumulantPreValue(cumulantPreList.get(cumulantPreList.size() - 1)[1]);
+            }
+        }
+
         if (!CollectionUtils.isEmpty(dataView.getRealData())) {
             Object[] rdo = dataView.getRealData().get(dataView.getRealData().size() - 1);
             dataView.setCurrValue(new BigDecimal(rdo[1].toString()));

--
Gitblit v1.9.3