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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -2,16 +2,19 @@ package pps.core.space.service;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import pps.core.space.entity.SpaceInstitutionDetailEnt;
 import pps.core.space.entity.SpaceOptimizeShortDurationView;
 import pps.core.space.entity.SpaceOptimizeShortPeriodEnt;
 import pps.core.space.entity.SpaceOptimizeShortWellheadEnt;
+import pps.core.space.mapper.SpaceInstitutionDetailMapper;
 import pps.core.space.mapper.SpaceOptimizeShortDurationViewMapper;
 import pps.core.space.mapper.SpaceOptimizeShortPeriodMapper;
 import pps.core.space.mapper.SpaceOptimizeShortWellheadMapper;
-import pps.core.space.service.data.space_optimize_short_duration.GetSpaceOptimizeShortDurationOutput;
+import pps.core.space.service.data.SpaceOptimizeDateDuration;
 import pps.core.space.service.data.space_optimize_short_period.GetSpaceOptimizeShortPeriodViewInput;
 import pps.core.space.service.data.space_optimize_short_period.GetSpaceOptimizeShortPeriodViewOutput;
 import pps.core.space.service.data.space_optimize_short_wellhead.GetSpaceOptimizeShortWellheadViewOutput;
+import pps.core.space.utils.ServiceUtil;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
@@ -56,6 +59,10 @@ public class SpaceOptimizeShortPeriodService {
         );
         GetSpaceOptimizeShortPeriodViewOutput output = new GetSpaceOptimizeShortPeriodViewOutput();
         if (Objects.nonNull(period)) {
+            //查间开制度详情
+            SpaceInstitutionDetailMapper detailMapper = context.getBean(SpaceInstitutionDetailMapper.class);
+            SpaceInstitutionDetailEnt detailEnt = detailMapper.selectById(period.getInstitutionId());
+            output.setGridTypeKey(detailEnt.getGridTypeKey());
             String shortPeriodId = period.getId();
             //查井口列表
             SpaceOptimizeShortWellheadMapper wellheadMapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
@@ -71,12 +78,12 @@ public class SpaceOptimizeShortPeriodService {
                         .build()
                 );
                 if (CollUtil.isNotEmpty(durationViewList)) {
-                    Map<String, List<GetSpaceOptimizeShortDurationOutput>> collect = XCopyUtils.copyNewList(durationViewList, GetSpaceOptimizeShortDurationOutput.class)
+                    Map<String, List<SpaceOptimizeDateDuration>> collect = XCopyUtils.copyNewList(durationViewList, SpaceOptimizeDateDuration.class)
                             .stream()
-                            .collect(Collectors.groupingBy(GetSpaceOptimizeShortDurationOutput::getWellheadId));
+                            .collect(Collectors.groupingBy(SpaceOptimizeDateDuration::getWellheadId));
                     wellheadViewOutputs.forEach(w -> {
                         if (collect.containsKey(w.getWellheadId())) {
-                            w.setDurationList(collect.get(w.getWellheadId()));
+                            w.setDurationList(ServiceUtil.getAllDateDuration(collect.get(w.getWellheadId())));
                         } else {
                             w.setDurationList(new ArrayList<>(0));
                         }

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

@@ -15,6 +15,12 @@ import java.util.List;
 @Data
 public class GetSpaceOptimizeShortPeriodViewOutput {
 
+    /**
+     * 电网类型key
+     */
+    @XText("电网类型key(字典获取)")
+    private String gridTypeKey;
+
     /**
      * 井口列表
      */

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

 package pps.core.space.service.data.space_optimize_short_wellhead;
 
 import lombok.Data;
-import pps.core.space.service.data.space_optimize_short_duration.GetSpaceOptimizeShortDurationOutput;
+import pps.core.space.service.data.SpaceOptimizeDateDuration;
 import xstartup.annotation.XText;
 
 import java.util.List;
@@ -25,5 +25,5 @@ public class GetSpaceOptimizeShortWellheadViewOutput {
      * 井口时段配置
      */
     @XText("井口时段配置")
-    private List<GetSpaceOptimizeShortDurationOutput> durationList;
+    private List<SpaceOptimizeDateDuration> durationList;
 }