feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C00-common/pps-common/src/main/java/pps/core/common/constant/BusinessConstant.java

@@ -145,6 +145,11 @@ public class BusinessConstant {
      */
     public static final DateTime DATE_FLAG = DateUtil.parse("1970-01-02 00:00:00", "yyyy-MM-dd HH:mm:ss");
 
+    /**
+     * 日期标志开始
+     */
+    public static final DateTime DATE_FLAG_BEGIN = DateUtil.parse("1970-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss");
+
     /*------------------------------字典------------------------------*/
 
     /**

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

@@ -466,7 +466,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                                 optimizeDurationDTOList.remove(optimizeDurationDTOList.size() - 1);
                                 sumOpenTime -= outdo;
                             } else if (0 > compare) {
-                                //todo : 需要补时间
+                                //需要补时间,下面统一补
                             }
                         }
                         //结束循环
@@ -475,9 +475,52 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                 }
                 //判断是否需要补时间
                 if (sumOpenTime < dayOpenMinute) {
-                    System.out.println();
+                    String wellheadId = wellhead.getWellheadId();
+                    long subMinute = dayOpenMinute - sumOpenTime;
+                    //创建需要补时间的时间范围
+                    List<SpaceOptimizeWeightDuration> replenishList = new ArrayList<>(12);
+                    //得到开始时间时间戳
+                    DateTime beginTime = weightList.get(0).getTimestamp();
+                    for (int i1 = 0; i1 < optimizeDurationDTOList.size() - 1; i1++) {
+                        //取相邻两段时间
+                        SpaceOptimizeDurationDTO first = optimizeDurationDTOList.get(i1);
+                        SpaceOptimizeDurationDTO second = optimizeDurationDTOList.get(i1 + 1);
+                        Date firstOpenTime = first.getOpenTime();
+                        Date firstCloseTime = first.getCloseTime();
+                        Date secondOpenTime = second.getOpenTime();
+                        Date secondCloseTime = second.getCloseTime();
+                        long closeMinute = DateUtil.between(firstCloseTime, secondOpenTime, DateUnit.MINUTE);
+                        //判断关井时长是否满足条件
+                        if (closeMinute == minCloseMinute) {
+                            continue;
+                        }
+                        //计算可优化时长
+                        int optimizeMinute = (int) (closeMinute - minCloseMinute);
+                        //判断是否小于最大开井时长
+                        long firstOpenMinute = DateUtil.between(firstOpenTime, firstCloseTime, DateUnit.MINUTE);
+                        if (firstOpenMinute < maxOpenMinute) {
+                            //找索引开始/结束位置
+                            int firstBeginIndex = (int) DateUtil.between(beginTime, firstCloseTime, DateUnit.MINUTE) / 30;
+                            int firstEndIndex = (int) DateUtil.between(beginTime, DateUtil.offsetMinute(firstCloseTime, optimizeMinute), DateUnit.MINUTE) / 30;
+                            //取时间段
+                            for (int i2 = firstBeginIndex; i2 <= firstEndIndex; i2++) {
+                                SpaceOptimizeWeight optimizeWeight = weightList.get(i2);
+                                DateTime timestamp = optimizeWeight.getTimestamp();
+                                int i3 = timestamp.compareTo(firstCloseTime);
+                                if (i3 < 0) {
+                                    continue;
+                                }
+                                int weight1 = optimizeWeight.getWeight();
+                            }
+                        }
+
+
+                        long secondOpenMinute = DateUtil.between(secondOpenTime, secondCloseTime, DateUnit.MINUTE);
+                        int secondBeginIndex = (int) DateUtil.between(beginTime, secondOpenTime, DateUnit.MINUTE) / 30;
+
+                        System.out.println();
+                    }
                 }
-                System.out.println();
             }
         }
         return XServiceResult.OK;