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/SpaceInstitutionDetailService.java

@@ -13,7 +13,7 @@ import pps.cloud.base.service.IBasePowerLineCloudService;
 import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
 import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
 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.storage_predicted_power_data.DynamicQueryStoragePredictedPowerInput;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
 import pps.core.common.session.PpsUserSession;
@@ -372,35 +372,45 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
             String lineId = detail.getLineId();
             //取年份
             int year = currentTime.year();
+            int monthIndex = currentTime.month();
             //月份要加一
-            int monthNum = currentTime.month() + 1;
-            String month;
-            if (monthNum < BusinessConstant.TEN) {
-                month = "0" + monthNum;
-            } else {
-                month = String.valueOf(monthNum);
+            int monthNum = monthIndex + 1;
+            //上一月
+            int lastMonthNum = monthIndex;
+            int lastYear = year;
+            if (monthIndex == 0) {
+                lastMonthNum = 12;
+                lastYear = year - 1;
             }
-            SpaceOptimizeLineRelation wellheadAndPlant = super.getWellheadAndPlant(context, ListUtil.toList(detail));
+            SpaceOptimizeLineRelation relation = super.getOptimizeLineRelation(context, ListUtil.toList(detail));
             //长期间开优化
-            List<DynamicQueryPlantPredictedPowerOutput> longAvgPowerList = super.getAveragePowerGenerationListByPlantIds(context,
-                    DynamicQueryPlantPredictedPowerInput.builder()
-                            .plantIds(wellheadAndPlant.getPlantIdsByLineIdMap().get(lineId))
+            this.institutionalOptimization(context, longPeriodDTOList, longWellheadDTOList, longDurationDTOList, longUnOptimizeDurationList, relation,
+                    detail, BaseUtils.getExecutionCycleForMonth(currentTime), endOfMonth, monthNum, DynamicQueryPlantPredictedPowerInput.builder()
+                            .plantIds(relation.getPlantIdsByLineIdMap().get(lineId))
                             .yearTime(String.valueOf(year))
-                            .monthTime(month)
-                            .build()
-            );
-            this.institutionalOptimization(context, longPeriodDTOList, longWellheadDTOList, longDurationDTOList, longUnOptimizeDurationList, wellheadAndPlant,
-                    longAvgPowerList, detail, BaseUtils.getExecutionCycleForMonth(currentTime), endOfMonth, monthNum);
+                            .monthTime(BaseUtils.getMonthString(monthNum))
+                            .dateType(BusinessConstant.ZERO)
+                            .build(),
+                    DynamicQueryStoragePredictedPowerInput.builder()
+                            .storageIds(relation.getPlantIdsByLineIdMap().get(detail.getLineId()))
+                            .yearTime(String.valueOf(lastYear))
+                            .monthTime(BaseUtils.getMonthString(lastMonthNum))
+                            .build());
             //中短期间开优化
-            List<DynamicQueryPlantPredictedPowerOutput> midAvgPowerList = super.getAveragePowerGenerationListByPlantIds(context,
+            this.institutionalOptimization(context, midPeriodDTOList, midWellheadDTOList, midDurationDTOList, midUnOptimizeDurationList, relation,
+                    detail, BaseUtils.getExecutionCycleForWeek(currentTime), endOfWeek, monthNum,
                     DynamicQueryPlantPredictedPowerInput.builder()
-                            .plantIds(wellheadAndPlant.getPlantIdsByLineIdMap().get(lineId))
+                            .plantIds(relation.getPlantIdsByLineIdMap().get(lineId))
                             .startTime(DateUtil.beginOfWeek(currentTime).toString(BusinessConstant.DATE_FORMAT_DAY))
                             .endTime(DateUtil.beginOfWeek(DateUtil.nextWeek()).toString(BusinessConstant.DATE_FORMAT_DAY))
+                            .dateType(BusinessConstant.ONE)
+                            .build(),
+                    DynamicQueryStoragePredictedPowerInput.builder()
+                            .storageIds(relation.getPlantIdsByLineIdMap().get(lineId))
+                            .startTime(DateUtil.offsetDay(currentTime, -7).toString(BusinessConstant.DATE_FORMAT_DAY))
+                            .endTime(currentTime.toString(BusinessConstant.DATE_FORMAT_DAY))
                             .build()
             );
-            this.institutionalOptimization(context, midPeriodDTOList, midWellheadDTOList, midDurationDTOList, midUnOptimizeDurationList, wellheadAndPlant,
-                    midAvgPowerList, detail, BaseUtils.getExecutionCycleForWeek(currentTime), endOfWeek, monthNum);
             //逻辑删除已创建的长期优化数据
             SpaceOptimizeLongPeriodMapper longPeriodMapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
             List<SpaceOptimizeLongPeriodEnt> longPeriodEntList = longPeriodMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeLongPeriodEnt>()
@@ -665,7 +675,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
         mapper.updateById(entity);
     }
 
-
     /**
      * 制度优化
      *
@@ -674,30 +683,32 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
      * @param wellheadDTOList        井口dtolist
      * @param durationDTOList        持续时间dtolist
      * @param unOptimizeDurationList 取消优化工期列表
-     * @param avgPowerList           平均功率列表
+     * @param relation               关系
      * @param detail                 细节
      * @param executionCycle         执行周期
      * @param optimizeDeadline       优化截止日期
      * @param monthNum               月份
+     * @param plantPowerInput        电厂功率输入
+     * @param storagePowerinput      存储电源输入
      */
     private void institutionalOptimization(XContext context, List<SpaceOptimizePeriodDTO> periodDTOList, List<SpaceOptimizeWellheadDTO> wellheadDTOList,
                                            List<SpaceOptimizeDurationDTO> durationDTOList, List<SpaceOptimizeDurationDTO> unOptimizeDurationList,
-                                           SpaceOptimizeLineRelation wellheadAndPlant, List<DynamicQueryPlantPredictedPowerOutput> avgPowerList, SpaceInstitutionDetailEnt detail,
-                                           String executionCycle, Date optimizeDeadline, int monthNum) {
-        String detailId = detail.getId();
-        String lineId = detail.getLineId();
-        List<SpaceInstitutionWellheadView> spaceWellheadList = wellheadAndPlant.getSpaceWellheadList();
-        SpaceInstitutionDurationMapper durationMapper = context.getBean(SpaceInstitutionDurationMapper.class);
+                                           SpaceOptimizeLineRelation relation, SpaceInstitutionDetailEnt detail,
+                                           String executionCycle, Date optimizeDeadline, int monthNum,
+                                           DynamicQueryPlantPredictedPowerInput plantPowerInput, DynamicQueryStoragePredictedPowerInput storagePowerinput) {
         //创建记录
-        String periodId = super.createOptimizePeriod(periodDTOList, detailId, lineId, executionCycle, optimizeDeadline);
+        String periodId = super.createOptimizePeriod(periodDTOList, detail.getId(), detail.getLineId(), executionCycle, optimizeDeadline);
         switch (detail.getGridTypeKey()) {
             //并网型优化
             case "1":
-                super.gridConnectedOptimization(context, durationMapper, wellheadDTOList, durationDTOList, unOptimizeDurationList,
-                        spaceWellheadList, avgPowerList, detail, monthNum, detailId, periodId, lineId);
+                super.gridConnectedOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList,
+                        relation.getSpaceWellheadList(), detail, monthNum, periodId, plantPowerInput);
                 break;
             //离网型优化
             case "0":
+                super.offGridOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList, relation.getSpaceWellheadList(),
+                        relation.getStorageAvgMap(), detail, periodId,
+                        storagePowerinput, plantPowerInput);
                 break;
             default:
                 //电网类型不存在

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

@@ -81,7 +81,7 @@ public class SpaceOptimizeBaseService {
      * @param detailEntList 详细ent列表
      * @return {@link SpaceOptimizeLineRelation}
      */
-    public SpaceOptimizeLineRelation getWellheadAndPlant(XContext context, List<SpaceInstitutionDetailEnt> detailEntList) {
+    public SpaceOptimizeLineRelation getOptimizeLineRelation(XContext context, List<SpaceInstitutionDetailEnt> detailEntList) {
         Set<String> lineIds = new HashSet<>(32);
         Set<String> institutionIds = new HashSet<>(32);
         for (SpaceInstitutionDetailEnt spaceInstitutionDetailEnt : detailEntList) {
@@ -740,7 +740,6 @@ public class SpaceOptimizeBaseService {
             return;
         }
         //获取井口间开时间段
-        SpaceInstitutionDurationMapper durationMapper = context.getBean(SpaceInstitutionDurationMapper.class);
         Map<String, List<SpaceInstitutionDurationEnt>> durationMap = this.getDurationMap(context, detail.getId());
         if (CollUtil.isEmpty(durationMap)) {
             //没有设置时间段,无法优化

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

@@ -44,7 +44,7 @@ public class SpaceOptimizeLongCloudServiceImpl extends SpaceOptimizeBaseService
         DateTime date = DateUtil.date();
         //取生效中的基础间开
         List<SpaceInstitutionDetailEnt> detailEntList = super.getEffectiveSpaceInstitution(context, date.toString(BusinessConstant.DATE_FORMAT_DAY));
-        SpaceOptimizeLineRelation relation = super.getWellheadAndPlant(context, detailEntList);
+        SpaceOptimizeLineRelation relation = super.getOptimizeLineRelation(context, detailEntList);
         Map<String, List<String>> plantIdsByLineIdMap = relation.getPlantIdsByLineIdMap();
         //取年份
         int year = date.year();
@@ -57,8 +57,8 @@ public class SpaceOptimizeLongCloudServiceImpl extends SpaceOptimizeBaseService
             lastMonthNum = 12;
             lastYear = year - 1;
         }
-        String month = BaseUtils.getMonthString(lastMonthNum);
-        String lastMonth = BaseUtils.getMonthString(date.month());
+        String month = BaseUtils.getMonthString(date.month());
+        String lastMonth = BaseUtils.getMonthString(lastMonthNum);
         List<SpaceOptimizePeriodDTO> periodDTOList = new ArrayList<>(32);
         List<SpaceOptimizeWellheadDTO> wellheadDTOList = new ArrayList<>(64);
         List<SpaceOptimizeDurationDTO> durationDTOList = new ArrayList<>(128);

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

@@ -45,7 +45,7 @@ public class SpaceOptimizeMidCloudServiceImpl extends SpaceOptimizeBaseService i
         String startWeek = date.toString(BusinessConstant.DATE_FORMAT_DAY);
         //取生效中的基础间开
         List<SpaceInstitutionDetailEnt> detailEntList = super.getEffectiveSpaceInstitution(context, startWeek);
-        SpaceOptimizeLineRelation relation = super.getWellheadAndPlant(context, detailEntList);
+        SpaceOptimizeLineRelation relation = super.getOptimizeLineRelation(context, detailEntList);
         Map<String, List<String>> plantIdsByLineIdMap = relation.getPlantIdsByLineIdMap();
         //月份要加一
         int monthNum = date.month() + 1;