From c3c7a6918f0e2dfe597c339117e4185b641be95f Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 24 二月 2025 15:10:19 +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 | 102 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 92 insertions(+), 10 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 6f9fc91..7a3a97b 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,14 +27,15 @@
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.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.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;
import com.iailab.module.model.mpk.service.ChartService;
+import com.iailab.module.model.mpk.service.ElectricityPriceSegmentedService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -103,6 +105,18 @@
@Autowired
private InfluxDBService influxDBService;
+ @Autowired
+ private ElectricityPriceSegmentedService electricityPriceSegmentedService;
+
+ @Autowired
+ private StScheduleModelService stScheduleModelService;
+
+ @Autowired
+ private StScheduleModelSettingService stScheduleModelSettingService;
+
+ @Autowired
+ private StAdjustConfigService stAdjustConfigService;
+
private int HOUR_MINS = 60;
@Override
@@ -117,6 +131,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 -> {
@@ -160,7 +175,7 @@
break;
}
}
- ItemVO predictItem = mmPredictItemService.getItemByIdFromCache(output.getItemid());
+ ItemVO predictItem = mmPredictItemService.getItemById(output.getItemid());
if (predictItem.getLastTime() != null) {
predictTime = predictItem.getLastTime();
} else {
@@ -200,7 +215,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<>();
@@ -247,6 +262,14 @@
viewDto.setMaxValue(new BigDecimal(values.stream().mapToDouble(Double::doubleValue).max().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
viewDto.setMinValue(new BigDecimal(values.stream().mapToDouble(Double::doubleValue).min().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
}
+ //处理预测累计
+ if (output.getIscumulant() == 1) {
+ if (StringUtils.isNotBlank(output.getCumulpoint())) {
+ viewDto.setCumulantRealData(getHisData(output.getCumulpoint(), startTime, endTime));
+ }
+ viewDto.setCumulantPreData(mmItemResultService.getData(output.getId() + CommonDict.CUMULANT_SUFFIX, startTime, endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ }
+
dataViewList.add(viewDto);
}
result.setStartTime(startTime);
@@ -304,6 +327,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.getCumulpoint(), 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);
@@ -366,7 +397,7 @@
} else {
dataView.setRealData(new ArrayList<>());
}
- dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat));
+ dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat, 3));
dataView.setLineType(lineType.getCode());
switch (lineType) {
case TN:
@@ -390,8 +421,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);
@@ -403,6 +434,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);
@@ -486,6 +540,9 @@
*/
private List<Object[]> getHisData(String pointId, Date startTime, Date endTime) {
List<Object[]> result = new ArrayList<>();
+ if (StringUtils.isBlank(pointId)) {
+ return result;
+ }
ApiPointDTO pointDTO = dataPointApi.getInfoById(pointId);
ApiPointValueQueryDTO queryPointDto = new ApiPointValueQueryDTO();
queryPointDto.setPointNo(pointDTO.getPointNo());
@@ -572,8 +629,8 @@
}
@Override
- public List<ScheduleSuggestRespDTO> listScheduleSuggest(Map<String, Object> params) {
- return Collections.emptyList();
+ public List<ScheduleSuggestRespDTO> listScheduleSuggest(ScheduleSuggestReqDTO vo) {
+ return stScheduleSuggestService.list(vo);
}
@Override
@@ -728,6 +785,31 @@
return result;
}
+ @Override
+ public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year, String time) {
+ return electricityPriceSegmentedService.getElectricityPriceList(year, time);
+ }
+
+ @Override
+ 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;
+ }
+
+ @Override
+ public List<StAdjustConfigDetDTO> getAdjustConfigListByModelId(String modelId) {
+ List<StAdjustConfigDetEntity> list = stAdjustConfigService.getDetByModelId(modelId);
+ return ConvertUtils.sourceToTarget(list, StAdjustConfigDetDTO.class);
+ }
+
/**
* 计算功率因数 p²/（根号：p²+Q²）
**/
--
Gitblit v1.9.3