feat(零碳): 长庆

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;
2.长庆演示,首页展示大屏功能修改,修改线路详情接口,增加查询日平均用电量逻辑,同时重构查询日产液量和日发电量逻辑,更新接口文档并完成接口冒烟测试,同时生成用例;
3.长庆极短期间开优化随动算法功能开发,设置自定义参数,初步完成极短时间,间开时间段优化测试功能;
4.间开制度管理模块,间开制度关联井口信息表表结构修改,增加"单次最高开井时长(h)","单次最低开井时长(h)","单次最高关井时长(h)","单次最低关井时长(h)"字段,同时修改数据表对应代码实体及表单参数,修改部分相关模块功能查询修改逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -400,10 +400,10 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                     //偏移开/关井时间
                     if (CollUtil.isNotEmpty(optimizeDurationDTOList)) {
                         SpaceOptimizeDurationDTO durationDTO = optimizeDurationDTOList.get(optimizeDurationDTOList.size() - 1);
-                        Date lastOpenTime = durationDTO.getOpenTime();
+                        Date lastOpenTime = optimizeDurationDTOList.get(0).getOpenTime();
                         Date lastCloseTime = durationDTO.getCloseTime();
                         long l;
-                        //如果关井时间在上一次开井时间之前,判断是否需要偏移关井时间
+                        //如果关井时间在第一次开井时间之前,判断是否需要偏移关井时间
                         if (DateUtil.compare(lastOpenTime, closeTime) >= 0) {
                             forwardFlag = false;
                             l = closeTime.between(lastOpenTime, DateUnit.MINUTE);
@@ -709,6 +709,34 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                 }
                 //创建优化后的间开区间
                 if (CollUtil.isNotEmpty(optimizeDurationDTOList)) {
+                    //重新按开井时间排序
+                    optimizeDurationDTOList.sort(Comparator.comparing(SpaceOptimizeDurationDTO::getOpenTime));
+                    List<SpaceOptimizeDurationDTO> optimizeDurationList = new ArrayList<>(optimizeDurationDTOList.size());
+                    //时间段优化
+                    if (optimizeDurationDTOList.size() > 1) {
+                        int begin = 0;
+                        for (int i1 = 1; i1 < optimizeDurationDTOList.size(); i1++) {
+                            SpaceOptimizeDurationDTO first = optimizeDurationDTOList.get(i1 - 1);
+                            SpaceOptimizeDurationDTO second = optimizeDurationDTOList.get(i1);
+                            if (0 != DateUtil.compare(first.getCloseTime(), second.getOpenTime())) {
+                                if (begin == i1 - 1) {
+                                    optimizeDurationList.add(first);
+                                    if (i1 == optimizeDurationDTOList.size() - 1) {
+                                        optimizeDurationList.add(second);
+                                    }
+                                } else {
+                                    optimizeDurationList.add(SpaceOptimizeDurationDTO.builder()
+                                            .openTime(optimizeDurationDTOList.get(begin).getOpenTime())
+                                            .closeTime(second.getCloseTime())
+                                            .build()
+                                    );
+                                }
+                                begin = i1;
+                            }
+                        }
+                        //重构
+                        optimizeDurationDTOList = optimizeDurationList;
+                    }
                     SpaceOptimizeDurationDTO durationDTO;
                     for (int i1 = 0; i1 < optimizeDurationDTOList.size(); i1++) {
                         durationDTO = optimizeDurationDTOList.get(i1);