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

1.开发间开优化长期间开优化定时任务,完成并网流程绿电消纳优先策略;
2.开发间开优化长期间开优化定时任务,完成并网流程消峰平谷策略;
3.开发间开优化中短期间开优化定时任务,创建定时任务并添加配置;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C10-task/pps-core-task/src/main/java/pps/core/task/job/SpaceOptimizeMidJob.java

 package pps.core.task.job;
 
+import pps.cloud.space.service.ISpaceOptimizeMidCloudService;
 import pps.core.task.constant.CronConstant;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
@@ -27,6 +28,9 @@ public class SpaceOptimizeMidJob implements XJob {
     @XCronTrigger(value = CronConstant.EVERY_MONDAY)
     @Override
     public XServiceResult execute(XContext xContext) {
+        ISpaceOptimizeMidCloudService service = xContext.getBean(ISpaceOptimizeMidCloudService.class);
+        XServiceResult result = service.optimizeLongJob(xContext);
+        result.throwIfFail();
         return XServiceResult.OK;
     }
 }

C11-space/pps-cloud-space/src/main/java/pps/cloud/space/service/ISpaceOptimizeMidCloudService.java

+package pps.cloud.space.service;
+
+import xstartup.annotation.XService;
+import xstartup.annotation.XText;
+import xstartup.base.XContext;
+import xstartup.data.XServiceResult;
+
+/**
+ * 中短期间开优化Cloud模块
+ *
+ * @author ZWT
+ * @date 2023/09/13 14:03
+ */
+@XService
+@XText("中短期间开优化Cloud模块")
+public interface ISpaceOptimizeMidCloudService {
+
+    /**
+     * 中短期间开优化Cloud模块--定时任务
+     *
+     * @param context 上下文
+     * @return {@link XServiceResult}
+     */
+    @XText("中短期间开优化Cloud模块--定时任务")
+    XServiceResult optimizeLongJob(XContext context);
+}
\ No newline at end of file

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

@@ -7,15 +7,9 @@ import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang3.StringUtils;
-import pps.cloud.base.service.IBasePowerLineCloudService;
-import pps.cloud.base.service.IBaseWellheadCloudService;
-import pps.cloud.base.service.data.base_power_line_plant.DynamicQueryBasePowerLinePlantInput;
 import pps.cloud.base.service.data.base_power_line_plant.DynamicQueryBasePowerLinePlantOutput;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailInput;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
-import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
-import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
-import pps.cloud.prediction.service.IPlantPredictedPowerCloudService;
 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.space.service.ISpaceOptimizeLongCloudService;
@@ -28,7 +22,6 @@ import pps.core.space.mapper.*;
 import pps.core.space.utils.ServiceUtil;
 import xstartup.annotation.XService;
 import xstartup.base.XContext;
-import xstartup.data.XListResult;
 import xstartup.data.XServiceResult;
 import xstartup.helper.XTransactionHelper;
 
@@ -77,9 +70,9 @@ public class SpaceOptimizeLongCloudServiceImpl implements ISpaceOptimizeLongClou
             //未发现可优化井口
             return XServiceResult.error(context, BusinessError.DidNotFindWellhead);
         }
-        this.setServiceRatingForSpaceWellheadList(context, spaceWellheadList);
+        ServiceUtil.setServiceRatingForSpaceWellheadList(context, spaceWellheadList);
         //取线路关联的所有光伏电站ID
-        List<DynamicQueryBasePowerLinePlantOutput> plantList = this.getPowerLinePlantListByLineIds(context, lineIds);
+        List<DynamicQueryBasePowerLinePlantOutput> plantList = ServiceUtil.getPowerLinePlantListByLineIds(context, lineIds);
         if (CollUtil.isEmpty(plantList)) {
             //未发现可用光伏电站
             return XServiceResult.error(context, BusinessError.DidNotFindPlant);
@@ -112,7 +105,7 @@ public class SpaceOptimizeLongCloudServiceImpl implements ISpaceOptimizeLongClou
                 //并网型优化
                 case "1":
                     //获取当前制度对应的光伏预测数据列表
-                    List<DynamicQueryPlantPredictedPowerOutput> avgPowerList = this.getAveragePowerGenerationListByPlantIds(context,
+                    List<DynamicQueryPlantPredictedPowerOutput> avgPowerList = ServiceUtil.getAveragePowerGenerationListByPlantIds(context,
                             DynamicQueryPlantPredictedPowerInput.builder()
                                     .plantIds(
                                             plantList.stream()
@@ -579,67 +572,4 @@ public class SpaceOptimizeLongCloudServiceImpl implements ISpaceOptimizeLongClou
         durationViewUnOptimize.setCloseWellTime(durationEnt.getCloseWellTime());
         unOptimizeDurationList.add(durationViewUnOptimize);
     }
-
-    /**
-     * 条件获取获取光伏预测各时段平均值列表
-     *
-     * @param context 上下文
-     * @param input   输入
-     * @return {@link List}<{@link DynamicQueryPlantPredictedPowerOutput}>
-     */
-    private List<DynamicQueryPlantPredictedPowerOutput> getAveragePowerGenerationListByPlantIds(XContext context, DynamicQueryPlantPredictedPowerInput input) {
-        IPlantPredictedPowerCloudService cloudService = context.getBean(IPlantPredictedPowerCloudService.class);
-        XListResult<DynamicQueryPlantPredictedPowerOutput> result = cloudService.queryAveragePowerGenerationListByParam(context, input);
-        result.throwIfFail();
-        return result.getResult();
-    }
-
-    /**
-     * 按线路ID集合获取电站列表
-     *
-     * @param context 上下文
-     * @param lineIds 线路ID
-     * @return {@link List}<{@link DynamicQueryBasePowerLinePlantOutput}>
-     */
-    private List<DynamicQueryBasePowerLinePlantOutput> getPowerLinePlantListByLineIds(XContext context, Set<String> lineIds) {
-        IBasePowerLineCloudService cloudService = context.getBean(IBasePowerLineCloudService.class);
-        XListResult<DynamicQueryBasePowerLinePlantOutput> result = cloudService.queryPowerLinePlantListByParam(context,
-                DynamicQueryBasePowerLinePlantInput.builder()
-                        .lineIds(lineIds)
-                        .build()
-        );
-        result.throwIfFail();
-        return result.getResult();
-    }
-
-    /**
-     * 为间开井口列表设置发电功率
-     *
-     * @param context           上下文
-     * @param spaceWellheadList 空间井口清单
-     */
-    private void setServiceRatingForSpaceWellheadList(XContext context, List<SpaceInstitutionWellheadView> spaceWellheadList) {
-        IBaseWellheadCloudService cloudService = context.getBean(IBaseWellheadCloudService.class);
-        XListResult<DynamicQueryBaseWellheadOutput> result = cloudService.queryBaseWellheadListByParam(context,
-                DynamicQueryBaseWellheadInput.builder()
-                        .wellheadIds(spaceWellheadList.stream()
-                                .map(SpaceInstitutionWellheadView::getWellheadId)
-                                .collect(Collectors.toList())
-                        )
-                        .build());
-        result.throwIfFail();
-        List<DynamicQueryBaseWellheadOutput> wellheadOutputList = result.getResult();
-        if (CollUtil.isEmpty(wellheadOutputList)) {
-            return;
-        }
-        spaceWellheadList.forEach(s -> {
-            s.setServiceRating(
-                    wellheadOutputList.stream()
-                            .filter(w -> StringUtils.equals(s.getWellheadId(), w.getId()))
-                            .findAny()
-                            .map(DynamicQueryBaseWellheadOutput::getServiceRating)
-                            .orElse(BigDecimal.ZERO)
-            );
-        });
-    }
 }
\ No newline at end of file

C11-space/pps-core-space/src/main/java/pps/core/space/utils/ServiceUtil.java

@@ -6,22 +6,32 @@ import cn.hutool.core.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import pps.cloud.base.service.IBasePowerLineCloudService;
 import pps.cloud.base.service.IBasePriceStrategyCloudService;
+import pps.cloud.base.service.IBaseWellheadCloudService;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
 import pps.cloud.base.service.data.base_power_line.GetBasePowerLineInput;
 import pps.cloud.base.service.data.base_power_line.GetBasePowerLineViewOutput;
+import pps.cloud.base.service.data.base_power_line_plant.DynamicQueryBasePowerLinePlantInput;
+import pps.cloud.base.service.data.base_power_line_plant.DynamicQueryBasePowerLinePlantOutput;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailInput;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
+import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
+import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
+import pps.cloud.prediction.service.IPlantPredictedPowerCloudService;
+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.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.SystemDictionaryService;
 import pps.cloud.system.service.data.*;
 import pps.core.common.constant.BusinessConstant;
+import pps.core.space.entity.SpaceInstitutionWellheadView;
 import pps.core.space.service.data.SpaceOptimizeDateDuration;
 import pps.core.space.service.data.SpaceOptimizeDateOutput;
 import xstartup.base.XContext;
 import xstartup.data.XListResult;
 import xstartup.data.XSingleResult;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -142,6 +152,69 @@ public class ServiceUtil {
         return result.getResult();
     }
 
+    /**
+     * 按线路ID集合获取电站列表
+     *
+     * @param context 上下文
+     * @param lineIds 线路ID
+     * @return {@link List}<{@link DynamicQueryBasePowerLinePlantOutput}>
+     */
+    public static List<DynamicQueryBasePowerLinePlantOutput> getPowerLinePlantListByLineIds(XContext context, Set<String> lineIds) {
+        IBasePowerLineCloudService cloudService = context.getBean(IBasePowerLineCloudService.class);
+        XListResult<DynamicQueryBasePowerLinePlantOutput> result = cloudService.queryPowerLinePlantListByParam(context,
+                DynamicQueryBasePowerLinePlantInput.builder()
+                        .lineIds(lineIds)
+                        .build()
+        );
+        result.throwIfFail();
+        return result.getResult();
+    }
+
+    /**
+     * 为间开井口列表设置发电功率
+     *
+     * @param context           上下文
+     * @param spaceWellheadList 空间井口清单
+     */
+    public static void setServiceRatingForSpaceWellheadList(XContext context, List<SpaceInstitutionWellheadView> spaceWellheadList) {
+        IBaseWellheadCloudService cloudService = context.getBean(IBaseWellheadCloudService.class);
+        XListResult<DynamicQueryBaseWellheadOutput> result = cloudService.queryBaseWellheadListByParam(context,
+                DynamicQueryBaseWellheadInput.builder()
+                        .wellheadIds(spaceWellheadList.stream()
+                                .map(SpaceInstitutionWellheadView::getWellheadId)
+                                .collect(Collectors.toList())
+                        )
+                        .build());
+        result.throwIfFail();
+        List<DynamicQueryBaseWellheadOutput> wellheadOutputList = result.getResult();
+        if (CollUtil.isEmpty(wellheadOutputList)) {
+            return;
+        }
+        spaceWellheadList.forEach(s -> {
+            s.setServiceRating(
+                    wellheadOutputList.stream()
+                            .filter(w -> StringUtils.equals(s.getWellheadId(), w.getId()))
+                            .findAny()
+                            .map(DynamicQueryBaseWellheadOutput::getServiceRating)
+                            .orElse(BigDecimal.ZERO)
+            );
+        });
+    }
+
+    /**
+     * 条件获取获取光伏预测各时段平均值列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link List}<{@link DynamicQueryPlantPredictedPowerOutput}>
+     */
+    public static List<DynamicQueryPlantPredictedPowerOutput> getAveragePowerGenerationListByPlantIds(XContext context, DynamicQueryPlantPredictedPowerInput input) {
+        IPlantPredictedPowerCloudService cloudService = context.getBean(IPlantPredictedPowerCloudService.class);
+        XListResult<DynamicQueryPlantPredictedPowerOutput> result = cloudService.queryAveragePowerGenerationListByParam(context, input);
+        result.throwIfFail();
+        return result.getResult();
+    }
+
     /**
      * 获取优化日期列表
      *

C12-prediction/pps-cloud-prediction/src/main/java/pps/cloud/prediction/service/data/plant_predicted_power_data/DynamicQueryPlantPredictedPowerInput.java

@@ -31,4 +31,10 @@ public class DynamicQueryPlantPredictedPowerInput {
 
     @XText("月")
     private String monthTime;
+
+    @XText("开始时间")
+    private String startTime;
+
+    @XText("结束时间")
+    private String endTime;
 }

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/PlantPredictedPowerCloudServiceImpl.java

@@ -38,6 +38,8 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
         List<String> plantIds = input.getPlantIds();
         String yearTime = input.getYearTime();
         String monthTime = input.getMonthTime();
+        String startTime = input.getStartTime();
+        String endTime = input.getEndTime();
         PlantPredictedPowerDataMapper mapper = context.getBean(PlantPredictedPowerDataMapper.class);
         List<PlantPredictedPowerDataEnt> list = mapper.selectList(
                 new QueryWrapper<PlantPredictedPowerDataEnt>()
@@ -51,6 +53,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
                         .in(CollUtil.isNotEmpty(plantIds), PlantPredictedPowerDataEnt::getPlantId, plantIds)
                         .eq(StringUtils.isNotBlank(yearTime), PlantPredictedPowerDataEnt::getYearTime, yearTime)
                         .eq(StringUtils.isNotBlank(monthTime), PlantPredictedPowerDataEnt::getMonthTime, monthTime)
+                        .between(!StringUtils.isAnyBlank(startTime, endTime), PlantPredictedPowerDataEnt::getDataDate, startTime, endTime)
                         .groupBy(PlantPredictedPowerDataEnt::getYearTime,
                                 PlantPredictedPowerDataEnt::getMonthTime,
                                 PlantPredictedPowerDataEnt::getHourTime,