feat(能源管理系统): 测试问题修复

1.修改间开制度管理-长期间开优化模块详情接口,增加查询当月长期光伏预测功率数据逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -211,7 +211,7 @@ public class SpaceOptimizeBaseService {
         }
         //根据类型过滤井口:大间开,连抽井不优化
         Map<Boolean, List<SpaceInstitutionWellheadView>> wellheadViewMap = this.getWellheadViewList(spaceWellheadList, detail.getId());
-//获取井口间开时间段
+        //获取井口间开时间段
         Map<String, List<SpaceInstitutionDurationEnt>> durationMap = this.getDurationMap(context, detail.getId());
         //保存不需要优化的井口
         this.setUnOptimizeWellheadConfig(durationDTOList, unOptimizeDurationList, wellheadDTOList,
@@ -425,6 +425,20 @@ public class SpaceOptimizeBaseService {
         }
     }
 
+    /**
+     * 条件获取获取光伏预测各时段平均值列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link List}<{@link DynamicQueryPlantPredictedPowerOutput}>
+     */
+    public 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();
+    }
+
     /**
      * 创建间开优化信息
      *
@@ -967,20 +981,6 @@ public class SpaceOptimizeBaseService {
         });
     }
 
-    /**
-     * 条件获取获取光伏预测各时段平均值列表
-     *
-     * @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();
-    }
-
     /**
      * 条件查询时段储能电量平均值(模拟测试用)
      * todo: 模拟测试用,后续替换

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

 package pps.core.space.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailInput;
+import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerInput;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
+import pps.core.common.utils.BaseUtils;
 import pps.core.space.entity.*;
 import pps.core.space.mapper.*;
 import pps.core.space.service.data.SpaceOptimizeDateDuration;
@@ -38,7 +42,7 @@ import java.util.stream.Collectors;
  */
 @XService
 @XText("长期间开优化模块")
-public class SpaceOptimizeLongPeriodService {
+public class SpaceOptimizeLongPeriodService extends SpaceOptimizeBaseService {
 
     /**
      * 长期间开优化--分页列表
@@ -145,6 +149,18 @@ public class SpaceOptimizeLongPeriodService {
         } else {
             output.setWellheadList(new ArrayList<>(0));
         }
+        //查功率预测信息
+        DateTime date = DateUtil.date(period.getCreateTime());
+        output.setPowerGenerationList(
+                super.getAveragePowerGenerationListByPlantIds(context, DynamicQueryPlantPredictedPowerInput.builder()
+                        .plantIds(super.getOptimizeLineRelation(context, CollUtil.newArrayList(detailEnt))
+                                .getPlantIdsByLineIdMap()
+                                .get(detailEnt.getLineId()))
+                        .yearTime(String.valueOf(date.year()))
+                        .monthTime(BaseUtils.getMonthString(date.month() + 1))
+                        .dateType(BusinessConstant.ZERO)
+                        .build())
+        );
         return XSingleResult.success(output);
     }
 }
\ No newline at end of file

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_long_period/GetSpaceOptimizeLongPeriodViewOutput.java

@@ -2,6 +2,7 @@ package pps.core.space.service.data.space_optimize_long_period;
 
 import lombok.Data;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
+import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerOutput;
 import pps.core.space.service.data.SpaceOptimizeDateOutput;
 import pps.core.space.service.data.space_optimize_long_wellhead.GetSpaceOptimizeLongWellheadOutput;
 import xstartup.annotation.XText;
@@ -59,4 +60,10 @@ public class GetSpaceOptimizeLongPeriodViewOutput {
      */
     @XText("策略配置列表")
     List<GetBasePriceStrategyDetailOutput> strategyDetailList;
+
+    /**
+     * 功率预测列表
+     */
+    @XText("功率预测列表")
+    List<DynamicQueryPlantPredictedPowerOutput> powerGenerationList;
 }