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

1.修改基础信息配置--组织机构管理模块,通过组织机构ID查询下级组织机构及线路列表接口,增加查询线路类型逻辑,添加返回值,修改接口文档并完成接口冒烟测试;
2.修改基础信息配置--基础间开配置模块,设为基础制度接口,添加限制条件,不能优化结束日期在当天之前的数据;
3.修改间开制度管理--长期/中短期间开优化功能,添加通过线路ID查询线路下储能设备列表接口,修改离网型制度优化逻辑;
4.修改基础信息配置--基础间开配置模块设为基础间开/重新校准接口,修改离网型制度优化逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/IBasePowerLineCloudService.java

@@ -8,6 +8,7 @@ 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_power_line_storage.DynamicQueryBasePowerLineStorageInput;
+import pps.cloud.base.service.data.base_power_line_storage.DynamicQueryBasePowerLineStorageOutput;
 import pps.cloud.base.service.data.base_power_line_storage.DynamicQueryBasePowerLineStorageViewOutput;
 import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
 import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
@@ -82,5 +83,16 @@ public interface IBasePowerLineCloudService {
      */
     @XText("输电线路配置Cloud模块--条件查询线路关联储能设备参数平均值")
     @XApiPost
-    XListResult<DynamicQueryBasePowerLineStorageViewOutput> queryPowerLineStorageListByLineIds(XContext context, DynamicQueryBasePowerLineStorageInput input);
+    XListResult<DynamicQueryBasePowerLineStorageViewOutput> queryPowerLineStorageAvgByLineIds(XContext context, DynamicQueryBasePowerLineStorageInput input);
+
+    /**
+     * 输电线路配置Cloud模块--条件查询线路关联储能设备信息
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XListResult}<{@link DynamicQueryBasePowerLineStorageOutput}>
+     */
+    @XText("输电线路配置Cloud模块--条件查询线路关联储能设备信息")
+    @XApiPost
+    XListResult<DynamicQueryBasePowerLineStorageOutput> queryPowerLineStorageListByLineIds(XContext context, DynamicQueryBasePowerLineStorageInput input);
 }

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_power_line_storage/DynamicQueryBasePowerLineStorageOutput.java

+package pps.cloud.base.service.data.base_power_line_storage;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+/**
+ * 输电线路储能配置
+ *
+ * @author ZWT
+ * @date 2023/08/25
+ */
+@Data
+public class DynamicQueryBasePowerLineStorageOutput {
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("储能设备ID")
+    private String storageId;
+}

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineCloudServiceImpl.java

@@ -11,17 +11,12 @@ 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_power_line_storage.DynamicQueryBasePowerLineStorageInput;
+import pps.cloud.base.service.data.base_power_line_storage.DynamicQueryBasePowerLineStorageOutput;
 import pps.cloud.base.service.data.base_power_line_storage.DynamicQueryBasePowerLineStorageViewOutput;
 import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
 import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
-import pps.core.base.entity.BasePowerLineEnt;
-import pps.core.base.entity.BasePowerLinePlantEnt;
-import pps.core.base.entity.BasePowerLineStorageView;
-import pps.core.base.entity.BasePowerLineWellheadView;
-import pps.core.base.mapper.BasePowerLineMapper;
-import pps.core.base.mapper.BasePowerLinePlantMapper;
-import pps.core.base.mapper.BasePowerLineStorageViewMapper;
-import pps.core.base.mapper.BasePowerLineWellheadViewMapper;
+import pps.core.base.entity.*;
+import pps.core.base.mapper.*;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XService;
@@ -30,7 +25,6 @@ import xstartup.base.util.XCopyUtils;
 import xstartup.data.XListResult;
 import xstartup.data.XSingleResult;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
@@ -56,8 +50,7 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
         BasePowerLineEnt entity = mapper.selectOne(new LambdaQueryWrapper<BasePowerLineEnt>()
                 .eq(BaseModel::getId, input.getId())
         );
-        GetBasePowerLineViewOutput output = XCopyUtils.copyNewObject(entity, GetBasePowerLineViewOutput.class);
-        return XSingleResult.success(output);
+        return XSingleResult.success(XCopyUtils.copyNewObject(entity, GetBasePowerLineViewOutput.class));
     }
 
     /**
@@ -90,8 +83,7 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
                 .eq(StringUtils.isNotBlank(strategyId), BasePowerLineEnt::getStrategyId, strategyId)
                 .orderByDesc(BaseModel::getModifyTime)
         );
-        List<DynamicQueryBasePowerLineOutput> lineOutputList = XCopyUtils.copyNewList(selectList, DynamicQueryBasePowerLineOutput.class);
-        return XListResult.success(lineOutputList);
+        return XListResult.success(XCopyUtils.copyNewList(selectList, DynamicQueryBasePowerLineOutput.class));
     }
 
     /**
@@ -110,13 +102,7 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
                         .wellheadIds(input.getWellheadIds())
                         .build()
         );
-        List<DynamicQueryBasePowerLineWellheadViewOutput> outputs;
-        if (CollUtil.isEmpty(wellheadViews)) {
-            outputs = new ArrayList<>(0);
-        } else {
-            outputs = XCopyUtils.copyNewList(wellheadViews, DynamicQueryBasePowerLineWellheadViewOutput.class);
-        }
-        return XListResult.success(outputs);
+        return XListResult.success(XCopyUtils.copyNewList(wellheadViews, DynamicQueryBasePowerLineWellheadViewOutput.class));
     }
 
     /**
@@ -137,16 +123,10 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
                         .eq(StringUtils.isNotBlank(plantId), BasePowerLinePlantEnt::getPlantId, plantId)
                         .in(CollUtil.isNotEmpty(lineIds), BasePowerLinePlantEnt::getLineId, lineIds)
         );
-        List<DynamicQueryBasePowerLinePlantOutput> outputs;
-        if (CollUtil.isEmpty(list)) {
-            outputs = new ArrayList<>(0);
-        } else {
-            outputs = XCopyUtils.copyNewList(
+        return XListResult.success(XCopyUtils.copyNewList(
                 list,
                 DynamicQueryBasePowerLinePlantOutput.class
-            );
-        }
-        return XListResult.success(outputs);
+        ));
     }
 
     /**
@@ -157,18 +137,32 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
      * @return {@link XListResult}<{@link DynamicQueryBasePowerLineStorageViewOutput}>
      */
     @Override
-    public XListResult<DynamicQueryBasePowerLineStorageViewOutput> queryPowerLineStorageListByLineIds(XContext context, DynamicQueryBasePowerLineStorageInput input) {
+    public XListResult<DynamicQueryBasePowerLineStorageViewOutput> queryPowerLineStorageAvgByLineIds(XContext context, DynamicQueryBasePowerLineStorageInput input) {
         BasePowerLineStorageViewMapper mapper = context.getBean(BasePowerLineStorageViewMapper.class);
         List<BasePowerLineStorageView> list = mapper.selectStorageAverageByLineIds(input.getLineIds());
-        List<DynamicQueryBasePowerLineStorageViewOutput> outputs;
-        if (CollUtil.isEmpty(list)) {
-            outputs = new ArrayList<>(0);
-        } else {
-            outputs = XCopyUtils.copyNewList(
+        return XListResult.success(XCopyUtils.copyNewList(
                 list,
                 DynamicQueryBasePowerLineStorageViewOutput.class
-            );
+        ));
     }
-        return XListResult.success(outputs);
+
+    /**
+     * 输电线路配置Cloud模块--条件查询线路关联储能设备信息
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XListResult}<{@link DynamicQueryBasePowerLineStorageOutput}>
+     */
+    @Override
+    public XListResult<DynamicQueryBasePowerLineStorageOutput> queryPowerLineStorageListByLineIds(XContext context, DynamicQueryBasePowerLineStorageInput input) {
+        BasePowerLineStorageMapper storageMapper = context.getBean(BasePowerLineStorageMapper.class);
+        List<BasePowerLineStorageEnt> list = storageMapper.selectList(new LambdaQueryWrapper<BasePowerLineStorageEnt>()
+                .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
+                .in(BasePowerLineStorageEnt::getLineId, input.getLineIds())
+        );
+        return XListResult.success(XCopyUtils.copyNewList(
+                list,
+                DynamicQueryBasePowerLineStorageOutput.class
+        ));
     }
 }
\ No newline at end of file

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

@@ -424,8 +424,8 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
             }
             SpaceOptimizeLineRelation relation = super.getOptimizeLineRelation(context, ListUtil.toList(detail));
             //长期间开优化
-            this.institutionalOptimization(context, longPeriodDTOList, longWellheadDTOList, longDurationDTOList, longUnOptimizeDurationList, relation,
-                    detail, BaseUtils.getExecutionCycleForMonth(currentTime), endOfMonth, monthNum,
+            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))
@@ -433,13 +433,13 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
                             .dateType(BusinessConstant.ZERO)
                             .build(),
                     DynamicQueryStoragePredictedPowerInput.builder()
-                            .storageIds(relation.getPlantIdsByLineIdMap().get(detail.getLineId()))
+                            .storageIds(relation.getStorageIdsByLineIdMap().get(lineId))
                             .yearTime(String.valueOf(lastYear))
                             .monthTime(BaseUtils.getMonthString(lastMonthNum))
                             .build());
             //中短期间开优化
-            this.institutionalOptimization(context, midPeriodDTOList, midWellheadDTOList, midDurationDTOList, midUnOptimizeDurationList, relation,
-                    detail, BaseUtils.getExecutionCycleForWeek(currentTime), endOfWeek, monthNum,
+            this.institutionalOptimization(context, midPeriodDTOList, midWellheadDTOList, midDurationDTOList, midUnOptimizeDurationList,
+                    relation, detail, BaseUtils.getExecutionCycleForWeek(currentTime), endOfWeek, monthNum,
                     DynamicQueryPlantPredictedPowerInput.builder()
                             .plantIds(relation.getPlantIdsByLineIdMap().get(lineId))
                             .startTime(DateUtil.beginOfWeek(currentTime).toString(BusinessConstant.DATE_FORMAT_DAY))
@@ -447,7 +447,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
                             .dateType(BusinessConstant.ONE)
                             .build(),
                     DynamicQueryStoragePredictedPowerInput.builder()
-                            .storageIds(relation.getPlantIdsByLineIdMap().get(lineId))
+                            .storageIds(relation.getStorageIdsByLineIdMap().get(lineId))
                             .startTime(DateUtil.offsetDay(currentTime, -7).toString(BusinessConstant.DATE_FORMAT_DAY))
                             .endTime(currentTime.toString(BusinessConstant.DATE_FORMAT_DAY))
                             .build()

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

@@ -13,6 +13,7 @@ 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_power_line_storage.DynamicQueryBasePowerLineStorageInput;
+import pps.cloud.base.service.data.base_power_line_storage.DynamicQueryBasePowerLineStorageOutput;
 import pps.cloud.base.service.data.base_power_line_storage.DynamicQueryBasePowerLineStorageViewOutput;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailInput;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
@@ -113,7 +114,8 @@ public class SpaceOptimizeBaseService {
                                 )
                 )
                 //取线路关联所有储能电站计算平均功率
-                .storageAvgMap(this.getPowerLineStorageListByLineIds(context, lineIds))
+                .storageAvgMap(this.getPowerLineStorageAvgByLineIds(context, lineIds))
+                .storageIdsByLineIdMap(this.getPowerLineStorageListByLineIds(context, lineIds))
                 .build();
     }
 
@@ -959,9 +961,9 @@ public class SpaceOptimizeBaseService {
      * @param lineIds 线路ID
      * @return {@link Map}<{@link String}, {@link List}<{@link DynamicQueryBasePowerLineStorageViewOutput}>>
      */
-    private Map<String, List<DynamicQueryBasePowerLineStorageViewOutput>> getPowerLineStorageListByLineIds(XContext context, Set<String> lineIds) {
+    private Map<String, List<DynamicQueryBasePowerLineStorageViewOutput>> getPowerLineStorageAvgByLineIds(XContext context, Set<String> lineIds) {
         IBasePowerLineCloudService cloudService = context.getBean(IBasePowerLineCloudService.class);
-        XListResult<DynamicQueryBasePowerLineStorageViewOutput> result = cloudService.queryPowerLineStorageListByLineIds(context,
+        XListResult<DynamicQueryBasePowerLineStorageViewOutput> result = cloudService.queryPowerLineStorageAvgByLineIds(context,
                 DynamicQueryBasePowerLineStorageInput.builder()
                         .lineIds(lineIds)
                         .build()
@@ -978,6 +980,34 @@ public class SpaceOptimizeBaseService {
         return collect;
     }
 
+    /**
+     * 查询线路下所有储能设备ID
+     *
+     * @param context 上下文
+     * @param lineIds 线路ID
+     * @return {@link Map}<{@link String}, {@link List}<{@link String}>>
+     */
+    private Map<String, List<String>> getPowerLineStorageListByLineIds(XContext context, Set<String> lineIds) {
+        IBasePowerLineCloudService cloudService = context.getBean(IBasePowerLineCloudService.class);
+        XListResult<DynamicQueryBasePowerLineStorageOutput> result = cloudService.queryPowerLineStorageListByLineIds(context,
+                DynamicQueryBasePowerLineStorageInput.builder()
+                        .lineIds(lineIds)
+                        .build());
+        result.throwIfFail();
+        List<DynamicQueryBasePowerLineStorageOutput> list = result.getResult();
+        Map<String, List<String>> collect;
+        if (CollUtil.isEmpty(list)) {
+            collect = new HashMap<>(0);
+        } else {
+            collect = list.stream()
+                    .collect(
+                            Collectors.groupingBy(DynamicQueryBasePowerLineStorageOutput::getLineId,
+                                    Collectors.mapping(DynamicQueryBasePowerLineStorageOutput::getStorageId, Collectors.toList()))
+                    );
+        }
+        return collect;
+    }
+
     /**
      * 为间开井口列表设置发电功率
      *

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

@@ -84,7 +84,7 @@ public class SpaceOptimizeLongCloudServiceImpl extends SpaceOptimizeBaseService
                     super.offGridOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList, relation.getWellheadsByInstitutionIdIdMap().get(detail.getId()),
                             relation.getStorageAvgMap(), detail, periodId,
                             DynamicQueryStoragePredictedPowerInput.builder()
-                                    .storageIds(relation.getPlantIdsByLineIdMap().get(detail.getLineId()))
+                                    .storageIds(relation.getStorageIdsByLineIdMap().get(detail.getLineId()))
                                     .yearTime(String.valueOf(lastYear))
                                     .monthTime(lastMonth)
                                     .build(),

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

@@ -81,7 +81,7 @@ public class SpaceOptimizeMidCloudServiceImpl extends SpaceOptimizeBaseService i
                     super.offGridOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList,
                             relation.getWellheadsByInstitutionIdIdMap().get(detail.getId()), relation.getStorageAvgMap(), detail, periodId,
                             DynamicQueryStoragePredictedPowerInput.builder()
-                                    .storageIds(relation.getPlantIdsByLineIdMap().get(detail.getLineId()))
+                                    .storageIds(relation.getStorageIdsByLineIdMap().get(detail.getLineId()))
                                     .startTime(DateUtil.beginOfWeek(lastWeek).toString(BusinessConstant.DATE_FORMAT_DAY))
                                     .endTime(DateUtil.endOfWeek(lastWeek).toString(BusinessConstant.DATE_FORMAT_DAY))
                                     .build(),

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

@@ -36,4 +36,9 @@ public class SpaceOptimizeLineRelation {
      * 储能设备参数平均值Map
      */
     Map<String, List<DynamicQueryBasePowerLineStorageViewOutput>> storageAvgMap;
+
+    /**
+     * 储能设备Map
+     */
+    Map<String, List<String>> storageIdsByLineIdMap;
 }