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

1.开发间开优化长期间开优化定时任务,完成并网流程绿电消纳优先策略;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -158,7 +158,7 @@ public class SpaceOptimizeLongCloudServiceImpl implements ISpaceOptimizeLongClou
                     //光伏出力峰值大于等于井口总功率:绿电消纳优先策略
                     if (compare >= BusinessConstant.ZERO) {
                         //---------------------------------绿电消纳策略---------------------------------
-                        this.greenElectricityConsumptionStrategy(longDurationList, wellheadViewList, longWellheadList, avgPowerList, durationMap, detail, longPeriodId);
+                        this.greenElectricityConsumptionStrategy(longDurationList, longWellheadList, wellheadViewList, avgPowerList, durationMap, detail, longPeriodId);
                     } else {
                         //遍历井口,按发电功率大于等于光伏出力峰值条件分组
                         Map<Boolean, List<SpaceInstitutionWellheadView>> collect = spaceWellheadList.stream()
@@ -179,8 +179,8 @@ public class SpaceOptimizeLongCloudServiceImpl implements ISpaceOptimizeLongClou
                         else {
                             //---------------------------------井口优化---------------------------------
                             List<SpaceInstitutionWellheadView> highWellheadList = collect.get(true);
-
-
+                            this.greenElectricityConsumptionStrategy(longDurationList, longWellheadList, highWellheadList, avgPowerList, durationMap, detail, longPeriodId);
+                            this.peakEliminationAndValleyLevelingStrategy(context, longWellheadList, longDurationList, lowWellheadList, durationMap, detail, lineId, monthNum, longPeriodId);
                         }
                     }
                     break;
@@ -343,15 +343,15 @@ public class SpaceOptimizeLongCloudServiceImpl implements ISpaceOptimizeLongClou
      * 绿电消纳策略
      *
      * @param longDurationList 长期清单
-     * @param wellheadViewList 井口视图列表
      * @param longWellheadList 长井口列表
+     * @param wellheadViewList 井口视图列表
      * @param avgPowerList     平均功率列表
      * @param durationMap      持续时间图
      * @param detail           细节
      * @param longPeriodId     长周期id
      */
-    private void greenElectricityConsumptionStrategy(List<SpaceOptimizeLongDurationView> longDurationList, List<SpaceInstitutionWellheadView> wellheadViewList,
-                                                     List<SpaceOptimizeLongWellheadView> longWellheadList, List<DynamicQueryPlantPredictedPowerOutput> avgPowerList,
+    private void greenElectricityConsumptionStrategy(List<SpaceOptimizeLongDurationView> longDurationList, List<SpaceOptimizeLongWellheadView> longWellheadList,
+                                                     List<SpaceInstitutionWellheadView> wellheadViewList, List<DynamicQueryPlantPredictedPowerOutput> avgPowerList,
                                                      Map<String, List<SpaceInstitutionDurationEnt>> durationMap, SpaceInstitutionDetailEnt detail, String longPeriodId) {
         //---------------------------------井口优化---------------------------------
         //时间差