From 4af6b1e2c41365936df308eea6fa50e269eca3b6 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 13 二月 2025 10:45:22 +0800
Subject: [PATCH] 预测累计
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 73 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 13 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 3bf35a3..1687d46 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
@@ -13,6 +13,7 @@
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.*;
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;
import com.iailab.module.model.common.enums.PreLineTypeEnum;
import com.iailab.module.model.enums.CommonConstant;
@@ -26,10 +27,9 @@
import com.iailab.module.model.mcs.pre.vo.MmItemOutputRespVO;
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.StScheduleModelEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
-import com.iailab.module.model.mcs.sche.service.StScheduleRecordService;
-import com.iailab.module.model.mcs.sche.service.StScheduleSchemeService;
-import com.iailab.module.model.mcs.sche.service.StScheduleSuggestService;
+import com.iailab.module.model.mcs.sche.service.*;
import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO;
import com.iailab.module.model.mdk.vo.ItemVO;
import com.iailab.module.model.mpk.service.ChartParamService;
@@ -107,6 +107,13 @@
@Autowired
private ElectricityPriceSegmentedService electricityPriceSegmentedService;
+ @Autowired
+ private StScheduleModelService stScheduleModelService;
+
+ @Autowired
+ private StScheduleModelSettingService stScheduleModelSettingService;
+
+
private int HOUR_MINS = 60;
@Override
@@ -121,6 +128,7 @@
PredictItemTreeDTO moduleOpt = new PredictItemTreeDTO();
moduleOpt.setId(item.getId());
moduleOpt.setLabel(item.getModulename());
+ moduleOpt.setDisabled(true);
List<PredictItemTreeDTO> children = new ArrayList<>();
List<ItemVO> itemList = mmPredictItemService.getByModuleId(item.getId());
itemList.forEach(item1 -> {
@@ -164,7 +172,7 @@
break;
}
}
- ItemVO predictItem = mmPredictItemService.getItemByIdFromCache(output.getItemid());
+ ItemVO predictItem = mmPredictItemService.getItemById(output.getItemid());
if (predictItem.getLastTime() != null) {
predictTime = predictItem.getLastTime();
} else {
@@ -204,7 +212,7 @@
viewDto.setRealData(getHisData(output.getPointid(), startTime, endTime));
viewDto.setPreDataN(mmItemResultService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
viewDto.setPreDataL(mmItemResultLastPointService.getData(output.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
-
+ viewDto.setCurData(mmItemResultJsonService.getData(output.getId(), predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, 3));
List<Double> values = new ArrayList<>();
if (!CollectionUtils.isEmpty(viewDto.getRealData())) {
List<Double> hisValues = new ArrayList<>();
@@ -308,6 +316,14 @@
viewDto.setRealData(getHisData(out.getPointid(), startTime, endTime));
}
viewDto.setPreDataN(mmItemResultService.getData(out.getId(), startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ //处理累计点
+ if (out.getIscumulant() == 1) {
+ if (StringUtils.isNotBlank(out.getCumulpoint())) {
+ viewDto.setCumulantRealData(getHisData(out.getPointid() + CommonDict.CUMULANT_SUFFIX, startTime, endTime));
+ }
+ viewDto.setCumulantPreData(mmItemResultService.getData(out.getId() + CommonDict.CUMULANT_SUFFIX, startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ }
+
viewMap.put(out.getResultName(), viewDto);
}
result.setStartTime(startTime);
@@ -394,8 +410,8 @@
}).collect(Collectors.toList());
dataView.setPreMax(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).max().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
dataView.setPreMin(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).min().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
- dataView.setPreLast(new BigDecimal(curList.get(curList.size() - 1)));
- dataView.setPreCumulant(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).sum()));
+ dataView.setPreLast(new BigDecimal(curList.get(curList.size() - 1)).setScale(2, BigDecimal.ROUND_HALF_UP));
+ dataView.setPreCumulant(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).sum()).setScale(2, BigDecimal.ROUND_HALF_UP));
}
String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ);
@@ -407,6 +423,29 @@
} else {
dataView.setAlarmMessage(alarmList.get(0).getContent());
}
+ }
+
+ try {
+ String adjValuePoint = chartParams.get(CommonConstant.ADJ_VALUE_POINT);
+ if (StringUtils.isNotBlank(adjValuePoint)) {
+ List<String> pointNos = new ArrayList<>();
+ pointNos.add(adjValuePoint);
+ Map<String, Object> adjValue = dataPointApi.queryPointsRealValue(pointNos);
+ dataView.setAdjValue(new BigDecimal(adjValue.get(adjValuePoint).toString()));
+ }
+
+ String adjValueArrPoint = chartParams.get(CommonConstant.ADJ_VALUE_ARR_POINT);
+ if (StringUtils.isNotBlank(adjValueArrPoint)) {
+ String[] adjPointArr = adjValueArrPoint.split(",");
+ Map<String, Object> adjValue = dataPointApi.queryPointsRealValue(Arrays.asList(adjPointArr));
+ BigDecimal[] adjValueArr = new BigDecimal[adjPointArr.length];
+ for(int i = 0; i < adjPointArr.length; i++) {
+ adjValueArr[i] = new BigDecimal(adjValue.get(adjPointArr[i]).toString());
+ }
+ dataView.setAdjValueArr(adjValueArr);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
}
result.setPredictTime(predictTime);
@@ -576,8 +615,8 @@
}
@Override
- public List<ScheduleSuggestRespDTO> listScheduleSuggest(Map<String, Object> params) {
- return Collections.emptyList();
+ public List<ScheduleSuggestRespDTO> listScheduleSuggest(ScheduleSuggestReqDTO vo) {
+ return stScheduleSuggestService.list(vo);
}
@Override
@@ -733,13 +772,21 @@
}
@Override
- public List<ElectricityPriceSegmentedDTO> getElectricityPriceList() {
- return electricityPriceSegmentedService.getElectricityPriceList();
+ public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year, String time) {
+ return electricityPriceSegmentedService.getElectricityPriceList(year, time);
}
@Override
- public Boolean createElectricityPrice(ElectricityPriceSegmentedDTO dto) {
- electricityPriceSegmentedService.create(dto);
+ public Boolean createElectricityPrice(List<ElectricityPriceSegmentedDTO> list) {
+ electricityPriceSegmentedService.deleteByITimeId(list.get(0).getITimeId());
+ list.forEach(dto -> electricityPriceSegmentedService.create(dto));
+ return true;
+ }
+
+ @Override
+ public Boolean updateScheduleModelSetting(String modelCode, String key, String value) {
+ StScheduleModelEntity model = stScheduleModelService.getByModelCode(modelCode);
+ stScheduleModelSettingService.updateByModelIdAndKey(model.getId(), key, value);
return true;
}
--
Gitblit v1.9.3