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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeMidCloudServiceImpl.java

@@ -21,7 +21,6 @@ import xstartup.helper.XTransactionHelper;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 中短期间开优化Cloud模块
@@ -46,7 +45,6 @@ public class SpaceOptimizeMidCloudServiceImpl extends SpaceOptimizeBaseService i
         //取生效中的基础间开
         List<SpaceInstitutionDetailEnt> detailEntList = super.getEffectiveSpaceInstitution(context, startWeek);
         SpaceOptimizeLineRelation relation = super.getOptimizeLineRelation(context, detailEntList);
-        Map<String, List<String>> plantIdsByLineIdMap = relation.getPlantIdsByLineIdMap();
         //月份要加一
         int monthNum = date.month() + 1;
         DateTime lastWeek = DateUtil.lastWeek();
@@ -71,7 +69,7 @@ public class SpaceOptimizeMidCloudServiceImpl extends SpaceOptimizeBaseService i
                     super.gridConnectedOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList,
                             relation.getWellheadsByInstitutionIdIdMap().get(detail.getId()), detail, monthNum, periodId,
                             DynamicQueryPlantPredictedPowerInput.builder()
-                                    .plantIds(plantIdsByLineIdMap.get(lineId))
+                                    .plantIds(relation.getPlantIdsByLineIdMap().get(lineId))
                                     .startTime(startWeek)
                                     .endTime(nextWeek)
                                     .dateType(BusinessConstant.ONE)
@@ -83,12 +81,12 @@ public class SpaceOptimizeMidCloudServiceImpl extends SpaceOptimizeBaseService i
                     super.offGridOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList,
                             relation.getWellheadsByInstitutionIdIdMap().get(detail.getId()), relation.getStorageAvgMap(), detail, periodId,
                             DynamicQueryStoragePredictedPowerInput.builder()
-                                    .storageIds(plantIdsByLineIdMap.get(detail.getLineId()))
+                                    .storageIds(relation.getPlantIdsByLineIdMap().get(detail.getLineId()))
                                     .startTime(DateUtil.beginOfWeek(lastWeek).toString(BusinessConstant.DATE_FORMAT_DAY))
                                     .endTime(DateUtil.endOfWeek(lastWeek).toString(BusinessConstant.DATE_FORMAT_DAY))
                                     .build(),
                             DynamicQueryPlantPredictedPowerInput.builder()
-                                    .plantIds(plantIdsByLineIdMap.get(lineId))
+                                    .plantIds(relation.getPlantIdsByLineIdMap().get(lineId))
                                     .startTime(startWeek)
                                     .endTime(nextWeek)
                                     .dateType(BusinessConstant.ONE)