From 8aadcbe920f02806b9fa363b386d3d6c693c5c56 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 07 二月 2025 16:49:03 +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 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 11 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..dbb6db9 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
@@ -26,10 +26,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;
@@ -106,6 +105,13 @@
@Autowired
private ElectricityPriceSegmentedService electricityPriceSegmentedService;
+
+ @Autowired
+ private StScheduleModelService stScheduleModelService;
+
+ @Autowired
+ private StScheduleModelSettingService stScheduleModelSettingService;
+
private int HOUR_MINS = 60;
@@ -394,8 +400,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 +413,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 +605,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 +762,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