Commit 8bd5b6c9 authored by ZWT's avatar ZWT

feat(能源管理系统): 间开优化定时任务

1.开发间开优化定期校准定时任务,配置表达式修改定时任务配置文件,创建cloud模块方法;
2.开发间开优化定期校准定时任务,完成业务逻辑开发;
3.修改间开制度管理模块定期校准新增功能,增加初始化校准历史业务逻辑;
4.开发间开优化短期间开优化定时任务,配置表达式修改定时任务配置文件,创建cloud模块方法;
5.修改长期间开优化定时任务,添加离网型线路数据处理逻辑;
6.创建储能预测电量数据(模拟数据测试用)表,生成对应代码,添加条件查询各时段储能预测数据Cloud模块接口;
7.修改长期间开优化定时任务,增加离网型算法计算储能可用时长逻辑;
8.修改长期间开优化定时任务,优化部分sql查询语句查询逻辑,优化代码结构;
9.光伏预测Cloud模块查询预测发电量接口修改,增加查询长期发电量逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 64208192
...@@ -721,14 +721,13 @@ public class SpaceOptimizeBaseService { ...@@ -721,14 +721,13 @@ public class SpaceOptimizeBaseService {
* @param plantIdsByLineIdMap 按线id图植物id * @param plantIdsByLineIdMap 按线id图植物id
* @param detail 细节 * @param detail 细节
* @param periodId 期间id * @param periodId 期间id
* @param lastYear 去年 * @param input 输入
* @param lastMonth 上个月
*/ */
public void offGridOptimization(XContext context, List<SpaceOptimizeWellheadDTO> wellheadDTOList, List<SpaceOptimizeDurationDTO> durationDTOList, public void offGridOptimization(XContext context, List<SpaceOptimizeWellheadDTO> wellheadDTOList, List<SpaceOptimizeDurationDTO> durationDTOList,
List<SpaceOptimizeDurationDTO> unOptimizeDurationList, List<SpaceInstitutionWellheadView> spaceWellheadList, List<SpaceOptimizeDurationDTO> unOptimizeDurationList, List<SpaceInstitutionWellheadView> spaceWellheadList,
List<DynamicQueryPlantPredictedPowerOutput> avgPowerList, Map<String, List<DynamicQueryBasePowerLineStorageViewOutput>> storageAvgMap, List<DynamicQueryPlantPredictedPowerOutput> avgPowerList, Map<String, List<DynamicQueryBasePowerLineStorageViewOutput>> storageAvgMap,
Map<String, List<String>> plantIdsByLineIdMap, SpaceInstitutionDetailEnt detail, Map<String, List<String>> plantIdsByLineIdMap, SpaceInstitutionDetailEnt detail,
String periodId, int lastYear, String lastMonth) { String periodId, DynamicQueryStoragePredictedPowerInput input) {
String detailId = detail.getId(); String detailId = detail.getId();
String lineId = detail.getLineId(); String lineId = detail.getLineId();
//根据类型过滤井口:大间开,连抽井不优化 //根据类型过滤井口:大间开,连抽井不优化
...@@ -862,13 +861,7 @@ public class SpaceOptimizeBaseService { ...@@ -862,13 +861,7 @@ public class SpaceOptimizeBaseService {
return; return;
} }
//查获取前一个月该时间点储能剩余电量,求平均数 //查获取前一个月该时间点储能剩余电量,求平均数
List<DynamicQueryStoragePredictedPowerOutput> averageEnergyStorageList = this.getAverageEnergyStorageListByParam(context, List<DynamicQueryStoragePredictedPowerOutput> averageEnergyStorageList = this.getAverageEnergyStorageListByParam(context, input);
DynamicQueryStoragePredictedPowerInput.builder()
.storageIds(plantIdsByLineIdMap.get(lineId))
.yearTime(String.valueOf(lastYear))
.monthTime(lastMonth)
.build()
);
if (CollUtil.isEmpty(averageEnergyStorageList)) { if (CollUtil.isEmpty(averageEnergyStorageList)) {
//没有储能发电量,无法计算 //没有储能发电量,无法计算
return; return;
......
...@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil; ...@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
import pps.cloud.base.service.data.base_power_line_storage.DynamicQueryBasePowerLineStorageViewOutput; import pps.cloud.base.service.data.base_power_line_storage.DynamicQueryBasePowerLineStorageViewOutput;
import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerInput; import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerInput;
import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerOutput; import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerOutput;
import pps.cloud.prediction.service.data.storage_predicted_power_data.DynamicQueryStoragePredictedPowerInput;
import pps.cloud.space.service.ISpaceOptimizeLongCloudService; import pps.cloud.space.service.ISpaceOptimizeLongCloudService;
import pps.core.common.constant.BusinessConstant; import pps.core.common.constant.BusinessConstant;
import pps.core.common.utils.BaseUtils; import pps.core.common.utils.BaseUtils;
...@@ -90,7 +91,12 @@ public class SpaceOptimizeLongCloudServiceImpl extends SpaceOptimizeBaseService ...@@ -90,7 +91,12 @@ public class SpaceOptimizeLongCloudServiceImpl extends SpaceOptimizeBaseService
//离网型优化 //离网型优化
case "0": case "0":
super.offGridOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList, spaceWellheadList, super.offGridOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList, spaceWellheadList,
avgPowerList, storageAvgMap, plantIdsByLineIdMap, detail, periodId, lastYear, lastMonth); avgPowerList, storageAvgMap, plantIdsByLineIdMap, detail, periodId,
DynamicQueryStoragePredictedPowerInput.builder()
.storageIds(plantIdsByLineIdMap.get(detail.getLineId()))
.yearTime(String.valueOf(lastYear))
.monthTime(lastMonth)
.build());
break; break;
default: default:
//电网类型不存在 //电网类型不存在
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment