From f0670785bd3909a066fcd28a4e2110f6534c7434 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 六月 2025 14:38:25 +0800
Subject: [PATCH] 当前值T0 + 当前预测值
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 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 c3a27ba..f5cc81a 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
@@ -12,6 +12,7 @@
import com.iailab.module.data.common.ApiDataQueryDTO;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.*;
+import com.iailab.module.model.api.mdk.dto.MdkPredictDataDTO;
import com.iailab.module.model.api.mdk.dto.StScheduleRecordVO;
import com.iailab.module.model.common.enums.CommonDict;
import com.iailab.module.model.common.enums.DataTypeEnum;
@@ -36,6 +37,7 @@
import com.iailab.module.model.mcs.sche.vo.StScheduleRecordRespVO;
import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestOperationRecordReqVO;
+import com.iailab.module.model.mdk.vo.DataValueVO;
import com.iailab.module.model.mdk.vo.ItemVO;
import com.iailab.module.model.mpk.service.ChartParamService;
import com.iailab.module.model.mpk.service.ChartService;
@@ -132,6 +134,9 @@
@Autowired
private StSuggestOperationRecordService stSuggestOperationRecordService;
+
+ @Autowired
+ private StSuggestSnapshotConfDetService stSuggestSnapshotConfDetService;
@Override
public List<PredictItemTreeDTO> getPredictItemTree() {
@@ -305,7 +310,7 @@
}
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));
+ dataView.getRealData().get(dataView.getRealData().size() - 1)[1] : realDataMap.get(DateUtils.format(predictTime, timeFormat));
// 当前值T0 + 当前预测值 20250409
dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat, decimalPlaces, true, curReal));
} else {
@@ -746,6 +751,12 @@
}
@Override
+ public List<MdkPredictDataDTO> getPredictTnValue(PredictTnValueReqVO reqVO) {
+ List<DataValueVO> list = mmItemResultService.getPredictValue(reqVO.getOutId(), new Date(reqVO.getStartTime()), new Date(reqVO.getEndTime()));
+ return ConvertUtils.sourceToTarget(list, MdkPredictDataDTO.class);
+ }
+
+ @Override
public List<StScheduleRecordVO> getLastScheduleData(String scheduleCode, Integer limit) {
if (StringUtils.isBlank(scheduleCode)) {
return null;
@@ -874,6 +885,11 @@
}
@Override
+ public Boolean cancelUseSuggest(StAlarmAndSuggestReqVO reqVO) {
+ return stScheduleSuggestService.cancelUseSuggest(reqVO);
+ }
+
+ @Override
public Boolean ignoreSuggest(StAlarmAndSuggestReqVO reqVO) {
return stScheduleSuggestService.ignoreSuggest(reqVO);
}
@@ -924,6 +940,11 @@
return stSuggestSnapshotRecordService.getAllChartData(suggestId);
}
+ @Override
+ public Boolean updateSuggestSnapshotConfDetByExt1(StSuggestSnapshotConfDetSaveReqVO updateReqVO) {
+ return stSuggestSnapshotConfDetService.updateByExt1(updateReqVO);
+ }
+
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