From 60e664bd398e908206d00eb8e17c3b4796c70df1 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 24 三月 2025 18:42:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 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 159aabd..b4b3cfa 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.*;
@@ -200,6 +199,7 @@
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictTime);
calendar.add(Calendar.HOUR_OF_DAY, 1);
+ calendar.add(Calendar.MINUTE, 1);
endTime = calendar.getTime();
}
@@ -353,6 +353,7 @@
return result;
}
+
@Override
public PreDataSingleChartRespVO getPreDataSingleChart(PreDataSingleChartReqVO reqVO) {
PreDataSingleChartRespVO result = new PreDataSingleChartRespVO();
@@ -420,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()));
@@ -437,7 +451,8 @@
String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ);
if (StringUtils.isNotBlank(alarmObj)) {
- List<AlarmMessageRespDTO> alarmList = ConvertUtils.sourceToTarget(mmPredictAlarmMessageService.getList(alarmObj, predictTime), AlarmMessageRespDTO.class);
+ String alarmTitle = chartParams.get(CommonConstant.ALARM_TITLE);
+ List<AlarmMessageRespDTO> alarmList = ConvertUtils.sourceToTarget(mmPredictAlarmMessageService.getList(alarmObj, predictTime, alarmTitle), AlarmMessageRespDTO.class);
dataView.setAlarmList(alarmList);
if (CollectionUtils.isEmpty(alarmList)) {
dataView.setAlarmMessage("暂无预警信息");
@@ -821,12 +836,6 @@
}
@Override
- public List<StAdjustConfigDetDTO> getAdjustConfigListByModelId(String modelId) {
- List<StAdjustConfigDetEntity> list = stAdjustConfigService.getDetByModelId(modelId);
- return ConvertUtils.sourceToTarget(list, StAdjustConfigDetDTO.class);
- }
-
- @Override
public Boolean updateAlarmConfig(String alarmObj,String upperLimit,String lowerLimit) {
MmPredictAlarmConfigSaveReqVO reqVO = new MmPredictAlarmConfigSaveReqVO();
reqVO.setAlarmObj(alarmObj);
@@ -847,6 +856,27 @@
return true;
}
+ @Override
+ public MmItemOutputDTO getItemOutputByItemid(String itemid, String resultstr, String resultIndex) {
+ return ConvertUtils.sourceToTarget(mmItemOutputService.getByItemid(itemid,resultstr,resultIndex),MmItemOutputDTO.class);
+ }
+
+ @Override
+ public List<Object[]> getItemResult(PreItemResultReqVO reqVO) {
+
+ return mmItemResultService.getData(reqVO.getOutputid(),reqVO.getStartTime(),reqVO.getEndTime(),reqVO.getTimeFormat());
+ }
+
+ @Override
+ public PredictItemVO getPredictItemByItemNo(String itemNo) {
+ return ConvertUtils.sourceToTarget(mmPredictItemService.getItemByItemNo(itemNo),PredictItemVO.class);
+ }
+
+ @Override
+ public List<Object[]> getItemResultLastPoint(PreItemResultReqVO reqVO) {
+ return mmItemResultLastPointService.getData(reqVO.getOutputid(),reqVO.getStartTime(),reqVO.getEndTime(),reqVO.getTimeFormat());
+ }
+
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