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

@@ -96,20 +96,6 @@ public class BaseUtils {
         return StringUtils.replace(UUID.randomUUID().toString(), "-", "");
     }
 
-    /**
-     * 获取月份执行周期
-     *
-     * @param date 日期
-     * @return {@link String}
-     */
-    public static String getExecutionCycleForMonth(Date date) {
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(DateUtil.format(DateUtil.beginOfDay(date), BusinessConstant.DATE_FORMAT_DAY_C))
-                .append('-')
-                .append(DateUtil.format(DateUtil.endOfMonth(date), BusinessConstant.DATE_FORMAT_DAY_C));
-        return stringBuilder.toString();
-    }
-
     /**
      * 获取周执行周期
      *
@@ -134,7 +120,7 @@ public class BaseUtils {
      */
     public static String getExecutionCycleForCalibration(Date date, int offset) {
         StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(DateUtil.format(DateUtil.beginOfDay(date), BusinessConstant.DATE_FORMAT_DAY_C))
+        stringBuilder.append(DateUtil.format(date, BusinessConstant.DATE_FORMAT_DAY_C))
                 .append('-')
                 .append(DateUtil.format(DateUtil.offsetDay(date, offset), BusinessConstant.DATE_FORMAT_DAY_C));
         return stringBuilder.toString();
@@ -149,9 +135,9 @@ public class BaseUtils {
      */
     public static String getExecutionCycleForCalibration(Date startDate, Date endDate) {
         StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(DateUtil.format(DateUtil.beginOfDay(startDate), BusinessConstant.DATE_FORMAT_DAY_C))
+        stringBuilder.append(DateUtil.format(startDate, BusinessConstant.DATE_FORMAT_DAY_C))
                 .append('-')
-                .append(DateUtil.format(DateUtil.beginOfDay(endDate), BusinessConstant.DATE_FORMAT_DAY_C));
+                .append(DateUtil.format(endDate, BusinessConstant.DATE_FORMAT_DAY_C));
         return stringBuilder.toString();
     }
 

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

@@ -677,13 +677,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
         int monthIndex = currentTime.month();
         //月份要加一
         int monthNum = monthIndex + 1;
-        //上一月
-        int lastMonthNum = monthIndex;
-        int lastYear = year;
-        if (monthIndex == 0) {
-            lastMonthNum = 12;
-            lastYear = year - 1;
-        }
         DynamicQueryPlantPredictedPowerInput plantPowerInput;
         DynamicQueryStoragePredictedPowerInput storagePowerinput;
         String executionCycle;
@@ -717,6 +710,13 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
                 break;
             //离网型优化
             case "0":
+                //上一月
+                int lastMonthNum = monthIndex;
+                int lastYear = year;
+                if (monthIndex == 0) {
+                    lastMonthNum = 12;
+                    lastYear = year - 1;
+                }
                 if (0 == dateFlag) {
                     plantPowerInput = DynamicQueryPlantPredictedPowerInput.builder()
                             .plantIds(relation.getPlantIdsByLineIdMap().get(detail.getLineId()))

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

@@ -20,6 +20,7 @@ import xstartup.data.XServiceResult;
 import xstartup.helper.XTransactionHelper;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -61,12 +62,15 @@ public class SpaceOptimizeLongCloudServiceImpl extends SpaceOptimizeBaseService
         List<SpaceOptimizeWellheadDTO> wellheadDTOList = new ArrayList<>(64);
         List<SpaceOptimizeDurationDTO> durationDTOList = new ArrayList<>(128);
         List<SpaceOptimizeDurationDTO> unOptimizeDurationList = new ArrayList<>(128);
-        String executionCycleForMonth = BaseUtils.getExecutionCycleForMonth(date);
-        DateTime optimizeDeadline = DateUtil.endOfMonth(date);
         //优化
         for (SpaceInstitutionDetailEnt detail : detailEntList) {
+            Date institutionEndDate = detail.getInstitutionEndDate();
+            DateTime optimizeDeadline = DateUtil.endOfMonth(date);
+            if (optimizeDeadline.compareTo(institutionEndDate) > 0) {
+                optimizeDeadline = DateUtil.endOfDay(institutionEndDate);
+            }
             //创建记录
-            String periodId = super.createOptimizePeriod(periodDTOList, detail.getId(), detail.getLineId(), executionCycleForMonth, optimizeDeadline);
+            String periodId = super.createOptimizePeriod(periodDTOList, detail.getId(), detail.getLineId(), BaseUtils.getExecutionCycleForCalibration(date, optimizeDeadline), optimizeDeadline);
             switch (detail.getGridTypeKey()) {
                 //并网型优化
                 case "1":

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

@@ -20,6 +20,7 @@ import xstartup.data.XServiceResult;
 import xstartup.helper.XTransactionHelper;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -53,14 +54,18 @@ public class SpaceOptimizeMidCloudServiceImpl extends SpaceOptimizeBaseService i
         List<SpaceOptimizeDurationDTO> durationDTOList = new ArrayList<>(128);
         List<SpaceOptimizeDurationDTO> unOptimizeDurationList = new ArrayList<>(128);
         String executionCycleForWeek = BaseUtils.getExecutionCycleForWeek(date);
-        //优化截止日期
-        DateTime optimizeDeadline = DateUtil.endOfWeek(date);
         //日期查询范围结束条件,下周一
         String nextWeek = DateUtil.beginOfWeek(DateUtil.nextWeek()).toString(BusinessConstant.DATE_FORMAT_DAY);
         //优化
         for (SpaceInstitutionDetailEnt detail : detailEntList) {
             String detailId = detail.getId();
             String lineId = detail.getLineId();
+            Date institutionEndDate = detail.getInstitutionEndDate();
+            //优化截止日期
+            DateTime optimizeDeadline = DateUtil.endOfWeek(date);
+            if (optimizeDeadline.compareTo(institutionEndDate) > 0) {
+                optimizeDeadline = DateUtil.endOfDay(institutionEndDate);
+            }
             //创建记录
             String periodId = super.createOptimizePeriod(periodDTOList, detailId, lineId, executionCycleForWeek, optimizeDeadline);
             switch (detail.getGridTypeKey()) {