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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -416,13 +416,8 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
                 endOfWeek = DateUtil.endOfDay(institutionEndDate);
             }
             String lineId = detail.getLineId();
-            SpaceOptimizeLineRelation relation = super.getOptimizeLineRelation(context, ListUtil.toList(detail));
-            //长期间开优化
-            this.institutionalOptimization(context, longPeriodDTOList, longWellheadDTOList, longDurationDTOList, longUnOptimizeDurationList,
-                    relation, detail, endOfMonth, currentTime, BusinessConstant.ZERO);
-            //中短期间开优化
-            this.institutionalOptimization(context, midPeriodDTOList, midWellheadDTOList, midDurationDTOList, midUnOptimizeDurationList,
-                    relation, detail, endOfWeek, currentTime, BusinessConstant.ONE);
+            String longExecutionCycle;
+            String midExecutionCycle;
             //逻辑删除已创建的长期优化数据
             SpaceOptimizeLongPeriodMapper longPeriodMapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
             List<SpaceOptimizeLongPeriodEnt> longPeriodEntList = longPeriodMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeLongPeriodEnt>()
@@ -431,8 +426,10 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
                     .eq(SpaceOptimizeLongPeriodEnt::getInstitutionId, institutionId)
                     .eq(SpaceOptimizeLongPeriodEnt::getLineId, lineId)
                     .eq(SpaceOptimizeLongPeriodEnt::getOptimizeDeadline, endOfMonth)
+                    .orderByDesc(BaseModel::getCreateTime)
             );
             if (CollUtil.isNotEmpty(longPeriodEntList)) {
+                longExecutionCycle = longPeriodEntList.get(0).getExecutionCycle();
                 List<String> longIds = longPeriodEntList.stream()
                         .map(BaseModel::getId)
                         .collect(Collectors.toList());
@@ -451,6 +448,8 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
                         .set(BaseModel::getIsDeleted, BusinessConstant.ZERO)
                         .in(SpaceOptimizeLongDurationEnt::getLongPeriodId, longIds)
                 );
+            } else {
+                longExecutionCycle = BaseUtils.getExecutionCycleForCalibration(currentTime, endOfMonth);
             }
             //逻辑删除已创建的中短期优化数据
             SpaceOptimizeMidPeriodMapper midPeriodMapper = context.getBean(SpaceOptimizeMidPeriodMapper.class);
@@ -460,8 +459,10 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
                     .eq(SpaceOptimizeMidPeriodEnt::getInstitutionId, institutionId)
                     .eq(SpaceOptimizeMidPeriodEnt::getLineId, lineId)
                     .eq(SpaceOptimizeMidPeriodEnt::getOptimizeDeadline, endOfWeek)
+                    .orderByDesc(BaseModel::getCreateTime)
             );
             if (CollUtil.isNotEmpty(midPeriodEntList)) {
+                midExecutionCycle = midPeriodEntList.get(0).getExecutionCycle();
                 List<String> midIds = midPeriodEntList.stream()
                         .map(BaseModel::getId)
                         .collect(Collectors.toList());
@@ -480,7 +481,17 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
                         .set(BaseModel::getIsDeleted, BusinessConstant.ZERO)
                         .in(SpaceOptimizeMidDurationEnt::getMidPeriodId, midIds)
                 );
+            } else {
+                midExecutionCycle = BaseUtils.getExecutionCycleForWeek(currentTime);
             }
+            //查电站关联信息
+            SpaceOptimizeLineRelation relation = super.getOptimizeLineRelation(context, ListUtil.toList(detail));
+            //长期间开优化
+            this.institutionalOptimization(context, longPeriodDTOList, longWellheadDTOList, longDurationDTOList, longUnOptimizeDurationList,
+                    relation, detail, endOfMonth, currentTime, BusinessConstant.ZERO, longExecutionCycle);
+            //中短期间开优化
+            this.institutionalOptimization(context, midPeriodDTOList, midWellheadDTOList, midDurationDTOList, midUnOptimizeDurationList,
+                    relation, detail, endOfWeek, currentTime, BusinessConstant.ONE, midExecutionCycle);
             //创建长期优化数据
             int size;
             SpaceOptimizeViewMapper optimizeViewMapper = context.getBean(SpaceOptimizeViewMapper.class);
@@ -667,11 +678,12 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
      * @param optimizeDeadline       优化截止日期
      * @param currentTime            当前时间
      * @param dateFlag               日期标志
+     * @param executionCycle         执行周期
      */
     private void institutionalOptimization(XContext context, List<SpaceOptimizePeriodDTO> periodDTOList, List<SpaceOptimizeWellheadDTO> wellheadDTOList,
                                            List<SpaceOptimizeDurationDTO> durationDTOList, List<SpaceOptimizeDurationDTO> unOptimizeDurationList,
                                            SpaceOptimizeLineRelation relation, SpaceInstitutionDetailEnt detail,
-                                           Date optimizeDeadline, DateTime currentTime, int dateFlag) {
+                                           Date optimizeDeadline, DateTime currentTime, int dateFlag, String executionCycle) {
         //取年份
         int year = currentTime.year();
         int monthIndex = currentTime.month();
@@ -679,12 +691,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
         int monthNum = monthIndex + 1;
         DynamicQueryPlantPredictedPowerInput plantPowerInput;
         DynamicQueryStoragePredictedPowerInput storagePowerinput;
-        String executionCycle;
-        if (0 == dateFlag) {
-            executionCycle = BaseUtils.getExecutionCycleForCalibration(currentTime, optimizeDeadline);
-        } else {
-            executionCycle = BaseUtils.getExecutionCycleForWeek(currentTime);
-        }
         //创建记录
         String periodId = super.createOptimizePeriod(periodDTOList, detail.getId(), detail.getLineId(), executionCycle, optimizeDeadline);
         switch (detail.getGridTypeKey()) {