feat(零碳): 长庆

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -17,10 +17,7 @@ import pps.core.space.service.data.space_optimize_period.GetSpaceOptimizePeriodI
 import pps.core.space.service.data.space_optimize_period.GetSpaceOptimizePeriodOutput;
 import pps.core.space.service.data.space_optimize_short_period.QuerySpaceOptimizeShortPeriodViewInput;
 import pps.core.space.service.data.space_optimize_short_period.QuerySpaceOptimizeShortPeriodViewOutput;
-import pps.core.space.service.data.space_optimize_short_wellhead.GetSpaceOptimizeShortWellheadInput;
-import pps.core.space.service.data.space_optimize_short_wellhead.GetSpaceOptimizeShortWellheadOutput;
-import pps.core.space.service.data.space_optimize_short_wellhead.QuerySpaceOptimizeShortWellheadViewInput;
-import pps.core.space.service.data.space_optimize_short_wellhead.QuerySpaceOptimizeShortWellheadViewOutput;
+import pps.core.space.service.data.space_optimize_short_wellhead.*;
 import pps.core.space.utils.ServiceUtil;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
@@ -30,8 +27,10 @@ import xstartup.data.XListResult;
 import xstartup.data.XPageResult;
 import xstartup.data.XSingleResult;
 import xstartup.feature.api.annotation.XApiGet;
+import xstartup.feature.api.annotation.XApiPost;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -116,7 +115,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                 .last("limit 1")
         );
         if (ObjectUtil.isEmpty(periodEnt)) {
-            return XListResult.success(new ArrayList<>(0));
+            return XListResult.success(Collections.emptyList());
         }
         SpaceOptimizeShortWellheadMapper wellheadMapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
         List<SpaceOptimizeShortWellheadEnt> wellheadList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeShortWellheadEnt>()
@@ -124,7 +123,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                 .eq(CharSequenceUtil.isNotBlank(wellheadId), SpaceOptimizeShortWellheadEnt::getWellheadId, wellheadId)
         );
         if (CollUtil.isEmpty(wellheadList)) {
-            return XListResult.success(new ArrayList<>(0));
+            return XListResult.success(Collections.emptyList());
         }
         List<GetSpaceOptimizeShortWellheadOutput> wellheadOutputs = XCopyUtils.copyNewList(wellheadList, GetSpaceOptimizeShortWellheadOutput.class);
         SpaceOptimizeShortDurationMapper durationMapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
@@ -144,6 +143,50 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
         return XListResult.success(wellheadOutputs);
     }
 
+    /**
+     * 每日间开优化结果
+     *
+     * @param context 上下文
+     * @return {@link XListResult}<{@link QuerySpaceOptimizeShortWellheadOutput}>
+     */
+    @XApiPost(anonymous = true)
+    @XText("极短期间开优化--每日间开优化结果")
+    public XListResult<QuerySpaceOptimizeShortWellheadOutput> getDailyOptimization(XContext context) {
+        DateTime beginOfDay = DateUtil.beginOfDay(DateUtil.date());
+        SpaceOptimizeShortWellheadMapper wellheadMapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
+        List<SpaceOptimizeShortWellheadEnt> wellheadList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeShortWellheadEnt>()
+                .eq(SpaceOptimizeShortWellheadEnt::getOptimizeDate, beginOfDay)
+                .orderByAsc(SpaceOptimizeShortWellheadEnt::getStartSeq)
+        );
+        if (CollUtil.isEmpty(wellheadList)) {
+            return XListResult.success(Collections.emptyList());
+        }
+        SpaceOptimizeShortDurationMapper durationMapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
+        List<SpaceOptimizeShortDurationEnt> durationList = durationMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeShortDurationEnt>()
+                .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
+                .eq(SpaceOptimizeShortDurationEnt::getIsOptimize, BusinessConstant.ZERO)
+                .eq(SpaceOptimizeShortDurationEnt::getOptimizeDate, beginOfDay)
+                .in(SpaceOptimizeShortDurationEnt::getWellheadId, wellheadList.stream()
+                        .map(SpaceOptimizeShortWellheadEnt::getWellheadId)
+                        .collect(Collectors.toList())
+                )
+                .orderByAsc(SpaceOptimizeShortDurationEnt::getOpenWellTime)
+        );
+        List<QuerySpaceOptimizeShortWellheadOutput> outputs = new ArrayList<>(wellheadList.size());
+        List<SpaceOptimizeDateDuration> durationOutputs = XCopyUtils.copyNewList(durationList, SpaceOptimizeDateDuration.class);
+        Map<String, List<SpaceOptimizeDateDuration>> collect = durationOutputs.stream()
+                .collect(Collectors.groupingBy(SpaceOptimizeDateDuration::getWellheadId));
+        for (SpaceOptimizeShortWellheadEnt wellheadEnt : wellheadList) {
+            outputs.add(
+                    QuerySpaceOptimizeShortWellheadOutput.builder()
+                            .wellNumber(wellheadEnt.getWellNumber())
+                            .optimizeList(ServiceUtil.getAllDateDuration(collect.get(wellheadEnt.getWellheadId())))
+                            .build()
+            );
+        }
+        return XListResult.success(outputs);
+    }
+
     /**
      * 先导实验井间开制度
      *

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

+package pps.core.space.service.data.space_optimize_short_wellhead;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import pps.core.space.service.data.SpaceOptimizeDateDuration;
+import xstartup.annotation.XText;
+
+import java.util.List;
+
+/**
+ * 极短期间开优化井口记录
+ *
+ * @author ZWT
+ * @date 2024/03/22
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class QuerySpaceOptimizeShortWellheadOutput {
+
+    @XText("井号")
+    private String wellNumber;
+
+    /**
+     * 井口配置(已优化)
+     */
+    @XText("井口配置(已优化)")
+    private List<SpaceOptimizeDateDuration> optimizeList;
+}