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

@@ -174,7 +174,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
             if (CollUtil.isEmpty(powerList)) {
                 //没有预测数据都不优化
                 this.setUnOptimizeWellheadConfig(durationDTOList, unOptimizeDurationList, wellheadDTOList,
-                        spaceWellheadList, durationMap.get(detail.getId()), periodId, optimizeDate);
+                        spaceWellheadList, durationMap.get(detail.getId()), periodId, startDate);
                 continue;
             }
             //取峰谷策略
@@ -190,7 +190,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                     );
             //保存不需要优化的井口
             this.setUnOptimizeWellheadConfig(durationDTOList, unOptimizeDurationList, wellheadDTOList,
-                    collect.get(false), durationMap.get(detail.getId()), periodId, optimizeDate);
+                    collect.get(false), durationMap.get(detail.getId()), periodId, startDate);
             //取待优化井口并遍历
             wellheadList = collect.get(true);
             //todo 防冻土策略
@@ -200,10 +200,10 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
             for (int i = 0; i < wellheadList.size(); i++) {
                 wellhead = wellheadList.get(i);
                 String wellheadId = wellhead.getWellheadId();
-                String recordId = this.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber(), wellhead.getStartSeq(), optimizeDate);
+                String recordId = this.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber(), wellhead.getStartSeq(), startDate);
                 //保存间开原始记录
                 for (SpaceInstitutionDurationEnt durationEnt : durationMap.get(detail.getId()).get(wellheadId)) {
-                    this.createUnOptimizeDuration(unOptimizeDurationList, durationEnt, periodId, recordId, wellheadId, optimizeDate);
+                    this.createUnOptimizeDuration(unOptimizeDurationList, durationEnt, periodId, recordId, wellheadId, startDate);
                 }
                 //累加运行功率
                 serviceRating = serviceRating.add(wellhead.getServiceRating());
@@ -480,11 +480,12 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                             SpaceOptimizeDurationDTO durationDTO = optimizeDurationDTOList.get(optimizeDurationDTOList.size() - 1);
                             DateTime closeTimeNew = DateUtil.offsetMinute(durationDTO.getCloseTime(), (int) -outdo);
                             int compare = closeTimeNew.compareTo(durationDTO.getOpenTime());
-                            if (0 == compare) {
+                            if (0 >= compare) {
                                 optimizeDurationDTOList.remove(optimizeDurationDTOList.size() - 1);
                                 sumOpenTime -= outdo;
-                            } else if (0 > compare) {
+                            } else {
                                 //需要补时间,下面统一补
+                                durationDTO.setCloseTime(closeTimeNew);
                             }
                         }
                         //结束循环
@@ -630,7 +631,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                         this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
                                 DateUtil.format(durationDTO.getOpenTime(), BusinessConstant.MINUTES_FORMAT),
                                 DateUtil.format(durationDTO.getCloseTime(), BusinessConstant.MINUTES_FORMAT),
-                                0 == i1 ? BusinessConstant.ZERO : BusinessConstant.ONE, optimizeDate
+                                0 == i1 ? BusinessConstant.ZERO : BusinessConstant.ONE, startDate
                         );
                     }
                 }