iailab-plat.git

			@@ -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()));

	iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/PreDataViewRespDTO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -131,4 +131,7 @@

			@Schema(description = "累计预测值")
			private List<Object[]> cumulantPreData;

			@Schema(description = "累计预测值最后一个值")
			private BigDecimal cumulantPreLast;
			}