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

1.修改基础信息配置--井口配置模块,新增/修改接口,增加井口编号重复校验及必填项校验逻辑;
2.修改基础信息配置--井口配置模块,修改接口,解决部分字段丢失导致数据未更新问题;
3.修改基础信息配置--柴发设备配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
4.修改基础信息配置--储能设备配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
5.修改基础信息配置--光伏电站配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
6.修改基础信息配置--间开制度管理模块,设为基础制度/重新优化接口,增加业务逻辑初始化校准周期;
7.修改间开制度管理--定期校准模块重新优化接口,解决离网型线路优化时间超过一天问题;
8.修改系统管理Cloud模块,查询子集组织列表接口,增加查询逻辑,解决查询出重复数据问题;
9.修改间开制度管理--定期校准模块重新优化接口,解决离网型线路优化跨月导致数据异常问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -14,6 +14,7 @@ import pps.core.common.entity.BaseModel;
 import pps.core.space.entity.*;
 import pps.core.space.mapper.*;
 import pps.core.space.service.data.SpaceOptimizeDateDuration;
+import pps.core.space.service.data.SpaceOptimizeDateOutput;
 import pps.core.space.service.data.space_optimize_mid_period.GetSpaceOptimizeMidPeriodViewInput;
 import pps.core.space.service.data.space_optimize_mid_period.GetSpaceOptimizeMidPeriodViewOutput;
 import pps.core.space.service.data.space_optimize_mid_period.QuerySpaceOptimizeMidPeriodViewInput;
@@ -99,23 +100,30 @@ public class SpaceOptimizeMidPeriodService extends SpaceOptimizeBaseService {
         //查间开制度详情
         SpaceInstitutionDetailMapper detailMapper = context.getBean(SpaceInstitutionDetailMapper.class);
         SpaceInstitutionDetailEnt detailEnt = detailMapper.selectById(period.getInstitutionId());
+        DateTime beginOfWeek = DateUtil.beginOfWeek(period.getOptimizeDeadline());
+        if (beginOfWeek.compareTo(detailEnt.getInstitutionStartDate()) < 0) {
+            beginOfWeek = DateUtil.date(detailEnt.getInstitutionStartDate());
+        }
+        List<SpaceOptimizeDateOutput> optimizeDateList = ServiceUtil.getOptimizeDateList(beginOfWeek, period.getOptimizeDeadline());
+        output.setDateList(optimizeDateList);
         if (StringUtils.equals(String.valueOf(BusinessConstant.ONE), Optional.ofNullable(detailEnt.getGridTypeKey())
                 .orElse(String.valueOf(BusinessConstant.ZERO)))) {
+            int month;
+            if (CollUtil.isNotEmpty(optimizeDateList)) {
+                month = DateUtil.month(optimizeDateList.get(optimizeDateList.size() - 1).getDateTime());
+            } else {
                 Calendar calendar = Calendar.getInstance();
                 calendar.setTime(period.getOptimizeDeadline());
+                month = calendar.get(Calendar.MONTH);
+            }
             output.setStrategyDetailList(ServiceUtil.getStrategyDetailList(context,
                     GetBasePriceStrategyDetailInput.builder()
                             .lineId(period.getLineId())
-                            .strategyMonth(String.valueOf(calendar.get(Calendar.MONTH) + 1))
+                            .strategyMonth(String.valueOf(month + 1))
                             .build()));
         } else {
             output.setStrategyDetailList(new ArrayList<>(0));
         }
-        DateTime beginOfWeek = DateUtil.beginOfWeek(period.getOptimizeDeadline());
-        if (beginOfWeek.compareTo(detailEnt.getInstitutionStartDate()) < 0) {
-            beginOfWeek = DateUtil.date(detailEnt.getInstitutionStartDate());
-        }
-        output.setDateList(ServiceUtil.getOptimizeDateList(beginOfWeek, period.getOptimizeDeadline()));
         output.setGridTypeKey(detailEnt.getGridTypeKey());
         //查井口列表
         SpaceOptimizeMidWellheadMapper wellheadMapper = context.getBean(SpaceOptimizeMidWellheadMapper.class);