feat(能源管理系统): 基础信息配置,间开制度管理

1.优化基础信息配置-柴发设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
2.优化基础信息配置-储能设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
3.优化基础信息配置-井口设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
4.优化基础信息配置-光伏电站模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
5.修改间开制度管理-长期间开优化模块详情接口,增加查询已优化时间周期逻辑,修改接口文档完成冒烟测试;
6.修改间开制度管理-中短期间开优化模块详情接口,增加查询已优化时间周期逻辑,修改接口文档完成冒烟测试;
7.修改间开制度管理业务操作工具类,增加通过开始时间和结束时间获取时间区间的方法;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -93,6 +93,7 @@ public class SpaceOptimizeLongPeriodService {
             return XSingleResult.error(context, XError.NotFound);
         }
         GetSpaceOptimizeLongPeriodViewOutput output = XCopyUtils.copyNewObject(period, GetSpaceOptimizeLongPeriodViewOutput.class);
+        output.setDateList(ServiceUtil.getOptimizeDateList(period.getCreateTime(), period.getOptimizeDeadline()));
         //查间开制度详情
         SpaceInstitutionDetailMapper detailMapper = context.getBean(SpaceInstitutionDetailMapper.class);
         SpaceInstitutionDetailEnt detailEnt = detailMapper.selectById(period.getInstitutionId());

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

@@ -93,6 +93,7 @@ public class SpaceOptimizeMidPeriodService {
             return XSingleResult.error(context, XError.NotFound);
         }
         GetSpaceOptimizeMidPeriodViewOutput output = XCopyUtils.copyNewObject(period, GetSpaceOptimizeMidPeriodViewOutput.class);
+        output.setDateList(ServiceUtil.getOptimizeDateList(period.getCreateTime(), period.getOptimizeDeadline()));
         //查间开制度详情
         SpaceInstitutionDetailMapper detailMapper = context.getBean(SpaceInstitutionDetailMapper.class);
         SpaceInstitutionDetailEnt detailEnt = detailMapper.selectById(period.getInstitutionId());

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

+package pps.core.space.service.data;
+
+import cn.hutool.core.date.DateTime;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+/**
+ * 已优化日期列表
+ *
+ * @author ZWT
+ * @date 2023/09/12
+ */
+@Data
+public class SpaceOptimizeDateOutput {
+
+    @XText("优化日期")
+    private DateTime dateTime;
+
+    @XText("优化状态编码(0_已优化;1_未优化)")
+    private Integer optimizeCode;
+
+    @XText("优化状态值")
+    private String optimizeValue;
+}

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

@@ -2,6 +2,7 @@ package pps.core.space.service.data.space_optimize_long_period;
 
 import lombok.Data;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
+import pps.core.space.service.data.SpaceOptimizeDateOutput;
 import pps.core.space.service.data.space_optimize_long_wellhead.GetSpaceOptimizeLongWellheadOutput;
 import xstartup.annotation.XText;
 
@@ -35,6 +36,12 @@ public class GetSpaceOptimizeLongPeriodViewOutput {
     @XText("优化截止日期")
     private Date optimizeDeadline;
 
+    /**
+     * 已优化日期列表
+     */
+    @XText("已优化日期列表")
+    List<SpaceOptimizeDateOutput> dateList;
+
     /**
      * 井口信息
      */

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

@@ -2,6 +2,7 @@ package pps.core.space.service.data.space_optimize_mid_period;
 
 import lombok.Data;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
+import pps.core.space.service.data.SpaceOptimizeDateOutput;
 import pps.core.space.service.data.space_optimize_mid_wellhead.GetSpaceOptimizeMidWellheadOutput;
 import xstartup.annotation.XText;
 
@@ -35,6 +36,12 @@ public class GetSpaceOptimizeMidPeriodViewOutput {
     @XText("优化截止日期")
     private Date optimizeDeadline;
 
+    /**
+     * 已优化日期列表
+     */
+    @XText("已优化日期列表")
+    List<SpaceOptimizeDateOutput> dateList;
+
     /**
      * 策略配置列表
      */

C11-space/pps-core-space/src/main/java/pps/core/space/utils/ServiceUtil.java

 package pps.core.space.utils;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
 import pps.cloud.base.service.IBasePowerLineCloudService;
 import pps.cloud.base.service.IBasePriceStrategyCloudService;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
@@ -14,10 +16,13 @@ import pps.cloud.system.service.SysOrganizationCloudService;
 import pps.cloud.system.service.SystemAreaService;
 import pps.cloud.system.service.SystemDictionaryService;
 import pps.cloud.system.service.data.*;
+import pps.core.common.constant.BusinessConstant;
+import pps.core.space.service.data.SpaceOptimizeDateOutput;
 import xstartup.base.XContext;
 import xstartup.data.XListResult;
 import xstartup.data.XSingleResult;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -185,4 +190,25 @@ public class ServiceUtil {
         result.throwIfFail();
         return result.getResult();
     }
+
+    /**
+     * 获取优化日期列表
+     *
+     * @param begin 开始
+     * @param end   终止
+     * @return {@link List}<{@link SpaceOptimizeDateOutput}>
+     */
+    public static List<SpaceOptimizeDateOutput> getOptimizeDateList(Date begin, Date end) {
+        return DateUtil.rangeToList(
+                        DateUtil.beginOfDay(begin),
+                        DateUtil.endOfDay(end),
+                        DateField.DAY_OF_YEAR).stream()
+                .map(r -> {
+                    SpaceOptimizeDateOutput spaceOptimizeDateOutput = new SpaceOptimizeDateOutput();
+                    spaceOptimizeDateOutput.setDateTime(r);
+                    spaceOptimizeDateOutput.setOptimizeCode(BusinessConstant.ZERO);
+                    spaceOptimizeDateOutput.setOptimizeValue("已优化");
+                    return spaceOptimizeDateOutput;
+                }).collect(Collectors.toList());
+    }
 }
\ No newline at end of file