feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -3,9 +3,11 @@ package pps.core.space.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
@@ -28,6 +30,7 @@ import pps.core.space.enums.BusinessError;
 import pps.core.space.mapper.*;
 import pps.core.space.service.data.SpaceOptimizeDateDuration;
 import pps.core.space.service.data.SpaceOptimizeWeight;
+import pps.core.space.service.data.SpaceOptimizeWeightDuration;
 import pps.core.space.service.data.space_optimize_period.GetSpaceOptimizePeriodInput;
 import pps.core.space.service.data.space_optimize_period.GetSpaceOptimizePeriodOutput;
 import pps.core.space.service.data.space_optimize_short_period.QuerySpaceOptimizeShortPeriodViewInput;
@@ -284,7 +287,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                     }
                 }
                 //分级取时间段
-                List<SpaceOptimizeDurationDTO> periodList = new ArrayList<>(32);
+                List<SpaceOptimizeWeightDuration> weightDurationList = new ArrayList<>(32);
                 int[] ladder = {10, 5, 3, 1};
                 for (int i1 = 0; i1 < ladder.length; i1++) {
                     //如果权重大于当前最大权重,跳过
@@ -304,14 +307,17 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                             //如果索引小于第一次开井时间,则算为第二天
                             if (i2 < startIndex) {
 
-
                             }
                         } else if (begin != -1) {
                             //创建区间
-                            periodList.add(
-                                    SpaceOptimizeDurationDTO.builder()
+                            weightDurationList.add(
+                                    SpaceOptimizeWeightDuration.builder()
                                             .openTime(weightList.get(begin).getTimestamp())
                                             .closeTime(weightList.get(i2).getTimestamp())
+                                            .openIndex(begin)
+                                            .closeIndex(i2)
+                                            .duration(DateUtil.between(weightList.get(begin).getTimestamp(), weightList.get(i2).getTimestamp(), DateUnit.MINUTE))
+                                            .weight(ladder[i1])
                                             .build()
                             );
                             begin = -1;
@@ -321,7 +327,10 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
 
 
                 }
-
+                weightDurationList = weightDurationList.stream()
+                        .sorted(Comparator.comparing(SpaceOptimizeWeightDuration::getOpenTime))
+                        .collect(Collectors.toList());
+                System.out.println(JSON.toJSONString(weightDurationList));
             }
         }
         return XServiceResult.OK;

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/SpaceOptimizeWeightDuration.java

+package pps.core.space.service.data;
+
+import cn.hutool.core.date.DateTime;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import xstartup.annotation.XText;
+
+/**
+ * 权重间开
+ *
+ * @author ZWT
+ * @date 2024/04/12 14:26
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class SpaceOptimizeWeightDuration {
+
+    @XText("开井时间")
+    private DateTime openTime;
+
+    @XText("关井时间")
+    private DateTime closeTime;
+
+    @XText("开井索引")
+    private int openIndex;
+
+    @XText("关井索引")
+    private int closeIndex;
+
+    @XText("开井时长(分钟)")
+    private long duration;
+
+    @XText("权重")
+    private int weight;
+}