From 4b677f722568b022be3aef6a2d29599c0e00d1af Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 01 四月 2025 13:31:41 +0800
Subject: [PATCH] 修改建议状态

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java |   19 ++++++++++++++++++-
 1 files changed, 18 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 40e0d25..0911d2f 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
@@ -28,7 +28,6 @@
 import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmConfigSaveReqVO;
 import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmMessageSaveReqVO;
 import com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO;
-import com.iailab.module.model.mcs.sche.entity.StAdjustConfigDetEntity;
 import com.iailab.module.model.mcs.sche.entity.StScheduleModelEntity;
 import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
 import com.iailab.module.model.mcs.sche.service.*;
@@ -422,6 +421,19 @@
             default:
                 break;
         }
+
+        //处理预测累计
+        if (outPut.getIscumulant() != null && outPut.getIscumulant() == 1) {
+            /*if (StringUtils.isNotBlank(outPut.getCumulpoint())) {
+                dataView.setCumulantRealData(getHisData(outPut.getCumulpoint(), startTime, endTime));
+            }*/
+            List<Object[]> cumulantPreList = mmItemResultService.getData(outPut.getId() + CommonDict.CUMULANT_SUFFIX, startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+            dataView.setCumulantPreData(cumulantPreList);
+            if (!CollectionUtils.isEmpty(cumulantPreList)) {
+                dataView.setCumulantPreLast(new BigDecimal(cumulantPreList.get(cumulantPreList.size() - 1)[1].toString()).setScale(2, BigDecimal.ROUND_HALF_UP));
+            }
+        }
+
         if (!CollectionUtils.isEmpty(dataView.getRealData())) {
             Object[] rdo = dataView.getRealData().get(dataView.getRealData().size() - 1);
             dataView.setCurrValue(new BigDecimal(rdo[1].toString()));
@@ -865,6 +877,11 @@
         return mmItemResultLastPointService.getData(reqVO.getOutputid(),reqVO.getStartTime(),reqVO.getEndTime(),reqVO.getTimeFormat());
     }
 
+    @Override
+    public Boolean updateSuggestStatus(StAlarmAndSuggestReqVO reqVO) {
+        return stScheduleSuggestService.updateSuggestStatus(reqVO);
+    }
+
     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