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

@@ -161,6 +161,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
         //权重数组
         int[] ladder = {10, 5, 3, 1};
         //时间间隔
+        Integer startInterval;
         for (SpaceInstitutionDetailEnt detail : detailEntList) {
             //创建记录
             periodId = this.createOptimizePeriod(periodDTOList, detail.getId(), detail.getLineId(),
@@ -200,7 +201,9 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
             SpaceInstitutionWellheadView wellhead;
             //记录第一次开井时间
             DateTime firstOpenWellTime = null;
-            int offset = detail.getStartInterval();
+/*             [第一次开井时间优化]
+            int offset = detail.getStartInterval();*/
+            startInterval = detail.getStartInterval();
             for (int i = 0; i < wellheadList.size(); i++) {
                 wellhead = wellheadList.get(i);
                 String wellheadId = wellhead.getWellheadId();
@@ -376,10 +379,10 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                 List<SpaceOptimizeDurationDTO> optimizeDurationDTOList = new ArrayList<>(12);
                 //总开井时间
                 long sumOpenTime = 0;
-                //中断标识
+/*                //中断标识     [第一次开井时间优化]
                 boolean breakFlag = false;
                 //重新计算标识
-                boolean againFlag = false;
+                boolean againFlag = false;*/
                 for (int i1 = 0; i1 < weightDurationList.size(); i1++) {
                     SpaceOptimizeWeightDuration weightDuration = weightDurationList.get(i1);
                     long duration = weightDuration.getDuration();
@@ -389,10 +392,10 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                         firstOpenWellTime = weightDuration.getOpenTime();
                     }
                     //偏移其他井口开井时间,并修改时间间隔
-//                    if (0 == openTime.compareTo(firstOpenWellTime) && i > 0 && 0 == i1) {
-//                        duration -= (long) startInterval * i;
-//                        openTime = DateUtil.offsetMinute(openTime, startInterval * i);
-//                    }
+                    if (0 == openTime.compareTo(firstOpenWellTime) && i > 0 && 0 == i1) {
+                        duration -= (long) startInterval * i;
+                        openTime = DateUtil.offsetMinute(openTime, startInterval * i);
+                    }
                     DateTime closeTime = weightDuration.getCloseTime();
                     //正向标识
                     boolean forwardFlag = true;
@@ -569,12 +572,13 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                                 }
                             }
                         }
-                        //结束循环
-                        breakFlag = true;
+                        break;
+/*                        //结束循环 [第一次开井时间优化]
+                        breakFlag = true;*/
                     }
                     //重新按开井时间排序
                     optimizeDurationDTOList.sort(Comparator.comparing(SpaceOptimizeDurationDTO::getOpenTime));
-                    //判断第一次开井时间
+/*                    //判断第一次开井时间    [第一次开井时间优化]
                     if (breakFlag || i1 == (weightDurationList.size() - 1)) {
                         Date checkOpenTime = optimizeDurationDTOList.get(0).getOpenTime();
                         int check = firstOpenWellTime.compareTo(checkOpenTime);
@@ -610,7 +614,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                         } else {
                             break;
                         }
-                    }
+                    }*/
                 }
                 //判断是否需要补时间
                 if (sumOpenTime < dayOpenMinute) {