feat(零碳): 长庆

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;
2.长庆演示,首页展示大屏功能修改,修改线路详情接口,增加查询日平均用电量逻辑,同时重构查询日产液量和日发电量逻辑,更新接口文档并完成接口冒烟测试,同时生成用例;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -269,6 +269,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                 SpaceOptimizeWeight weight;
                 //测试用 ====== start
                 int dayOpen = 15;
+                int dayOpenMinute = dayOpen * 60;
                 int maxOpen = 5;
                 int minOpen = 3;
                 int maxClose = 2;
@@ -327,14 +328,15 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                 }
                 List<SpaceOptimizeDurationDTO> optimizeDurationDTOList = new ArrayList<>(32);
                 //从前往后算时间
-                SpaceOptimizeWeightDuration thisWeightDuration;
-                SpaceOptimizeWeightDuration nextWeightDuration;
+                SpaceOptimizeWeightDuration weightDuration;
+                //总开井时间
+                long sumOpenTime = 0;
                 long duration;
                 DateTime openTime;
                 for (int i1 = startIndex; i1 < weightDurationList.size(); i1++) {
-                    thisWeightDuration = weightDurationList.get(i1);
-                    duration = thisWeightDuration.getDuration();
-                    openTime = thisWeightDuration.getOpenTime();
+                    weightDuration = weightDurationList.get(i1);
+                    duration = weightDuration.getDuration();
+                    openTime = weightDuration.getOpenTime();
                     //判断时间间隔是否能满足最大开井时间
                     if (duration >= maxOpenMinute) {
                         //满足,判断能满足几次(最大开井时间)
@@ -343,9 +345,11 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                             DateTime closeTime;
                             if (duration >= maxOpenMinute) {
                                 closeTime = openTime.offsetNew(DateField.MINUTE, maxOpenMinute);
+                                sumOpenTime += maxOpenMinute;
                                 duration = duration - maxOpenMinute - minCloseMinute;
                             } else if (duration >= minOpenMinute) {
                                 closeTime = openTime.offsetNew(DateField.MINUTE, minOpenMinute);
+                                sumOpenTime += minOpenMinute;
                                 duration = duration - minOpenMinute - minCloseMinute;
                             } else {
                                 //时间不够,舍弃
@@ -361,16 +365,26 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                         //不满足,取全部
                         optimizeDurationDTOList.add(SpaceOptimizeDurationDTO.builder()
                                 .openTime(openTime)
-                                .closeTime(thisWeightDuration.getCloseTime())
+                                .closeTime(weightDuration.getCloseTime())
                                 .build());
+                        sumOpenTime += duration;
                         duration = 0;
                     }
-
                     //duration小于0:关井中,大于等于0,可以开井
                     if (duration < 0) {
 
                     }
-
+                    //判断开井总时间是否大于每日最大开井时间
+                    if (sumOpenTime >= dayOpenMinute) {
+                        long outdo = sumOpenTime - dayOpenMinute;
+                        if (outdo > 0) {
+                            //如果超过最大时间,缩短结束时间(只能缩短,无法重新优化)
+                            SpaceOptimizeDurationDTO durationDTO = optimizeDurationDTOList.get(optimizeDurationDTOList.size() - 1);
+                            durationDTO.setCloseTime(DateUtil.offsetMinute(durationDTO.getCloseTime(), (int) -outdo));
+                        }
+                        //结束循环
+                        break;
+                    }
                 }
                 System.out.println();
             }