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

1.开发间开优化长期间开优化定时任务,了解长期并网型流程算法;
2.定时任务模块新增CRON常量类,定义常用表达式;
3.基础信息管理--井口配置Cloud模块,添加通过井口ID集合获取井口列表接口,完成接口冒烟测试;
4.基础信息管理--输电线路配置Cloud模块,添加通过线路ID集合获取线路配置光伏电站列表接口,完成接口冒烟测试;
5.光伏预测--光伏预测Cloud模块,添加条件查询获取光伏预测时间段平均值列表接口,完成接口冒烟测试;
6.修改prediction模块pom引用,添加接口;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -121,8 +121,19 @@ public class SpaceOptimizeLongCloudServiceImpl implements ISpaceOptimizeLongClou
                             .map(SpaceInstitutionWellheadView::getServiceRating)
                             .reduce(BigDecimal.ZERO, BigDecimal::add);
                     int compare = powerMax.compareTo(wellheadTotalPower);
-                    if (compare >= BusinessConstant.ZERO) {
                     //光伏出力峰值大于等于井口总功率:绿电消纳优先策略
+                    if (compare >= BusinessConstant.ZERO) {
+                        //根据类型过滤井口:大间开,连抽井不优化
+                        List<String> wellheadIds = spaceWellheadList.stream()
+                                .filter(w -> StringUtils.equals(detail.getId(), w.getInstitutionId()) &&
+                                        StringUtils.equals("INTERVAL", w.getRunTypeKey()) &&
+                                        StringUtils.equals("0", w.getIntervalTypeKey()))
+                                .map(SpaceInstitutionWellheadView::getWellheadId)
+                                .collect(Collectors.toList());
+                        if (CollUtil.isEmpty(wellheadIds)) {
+                            continue;
+                        }
+
 
                     } else {
                         //遍历井口,按发电功率大于等于光伏出力峰值条件分组

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

@@ -41,10 +41,8 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
         PlantPredictedPowerDataMapper mapper = context.getBean(PlantPredictedPowerDataMapper.class);
         List<PlantPredictedPowerDataEnt> list = mapper.selectList(
                 new QueryWrapper<PlantPredictedPowerDataEnt>()
-                        .select("data_date",
-                                "year_time",
+                        .select("year_time",
                                 "month_time",
-                                "day_time",
                                 "hour_time",
                                 "min_time",
                                 "AVG( power ) AS power")
@@ -53,10 +51,8 @@ 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)
-                        .groupBy(PlantPredictedPowerDataEnt::getDataDate,
-                                PlantPredictedPowerDataEnt::getYearTime,
+                        .groupBy(PlantPredictedPowerDataEnt::getYearTime,
                                 PlantPredictedPowerDataEnt::getMonthTime,
-                                PlantPredictedPowerDataEnt::getDayTime,
                                 PlantPredictedPowerDataEnt::getHourTime,
                                 PlantPredictedPowerDataEnt::getMinTime)
         );