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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C00-common/pps-common/src/main/java/pps/core/common/utils/BaseUtils.java

@@ -140,6 +140,21 @@ public class BaseUtils {
         return stringBuilder.toString();
     }
 
+    /**
+     * 获取校准执行周期
+     *
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return {@link String}
+     */
+    public static String getExecutionCycleForCalibration(Date startDate, Date endDate) {
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append(DateUtil.format(DateUtil.beginOfDay(startDate), BusinessConstant.DATE_FORMAT_DAY_C))
+                .append('-')
+                .append(DateUtil.format(DateUtil.beginOfDay(endDate), BusinessConstant.DATE_FORMAT_DAY_C));
+        return stringBuilder.toString();
+    }
+
     /**
      * 获取时差分钟
      *

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

@@ -408,7 +408,13 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
             List<SpaceOptimizeDurationDTO> midDurationDTOList = new ArrayList<>(128);
             List<SpaceOptimizeDurationDTO> midUnOptimizeDurationList = new ArrayList<>(128);
             DateTime endOfMonth = DateUtil.endOfMonth(currentTime);
+            if (endOfMonth.compareTo(institutionEndDate) > 0) {
+                endOfMonth = DateUtil.endOfDay(institutionEndDate);
+            }
             DateTime endOfWeek = DateUtil.endOfWeek(currentTime);
+            if (endOfWeek.compareTo(institutionEndDate) > 0) {
+                endOfWeek = DateUtil.endOfDay(institutionEndDate);
+            }
             String lineId = detail.getLineId();
             SpaceOptimizeLineRelation relation = super.getOptimizeLineRelation(context, ListUtil.toList(detail));
             //长期间开优化
@@ -682,7 +688,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
         DynamicQueryStoragePredictedPowerInput storagePowerinput;
         String executionCycle;
         if (0 == dateFlag) {
-            executionCycle = BaseUtils.getExecutionCycleForMonth(currentTime);
+            executionCycle = BaseUtils.getExecutionCycleForCalibration(currentTime, optimizeDeadline);
         } else {
             executionCycle = BaseUtils.getExecutionCycleForWeek(currentTime);
         }