feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -1289,9 +1289,9 @@ public class SpaceOptimizeBaseService {
      * @param periodId               期间id
      * @param optimizeDate           优化日期
      */
-    private void setUnOptimizeWellheadConfig(List<SpaceOptimizeDurationDTO> durationDTOList, List<SpaceOptimizeDurationDTO> unOptimizeDurationList,
-                                             List<SpaceOptimizeWellheadDTO> wellheadDTOList, List<SpaceInstitutionWellheadView> unOptimizeWellheadList,
-                                             Map<String, List<SpaceInstitutionDurationEnt>> durationMap, String periodId, DateTime optimizeDate) {
+    public void setUnOptimizeWellheadConfig(List<SpaceOptimizeDurationDTO> durationDTOList, List<SpaceOptimizeDurationDTO> unOptimizeDurationList,
+                                            List<SpaceOptimizeWellheadDTO> wellheadDTOList, List<SpaceInstitutionWellheadView> unOptimizeWellheadList,
+                                            Map<String, List<SpaceInstitutionDurationEnt>> durationMap, String periodId, DateTime optimizeDate) {
         if (CollUtil.isNotEmpty(unOptimizeWellheadList)) {
             for (SpaceInstitutionWellheadView wellhead : unOptimizeWellheadList) {
                 String wellheadId = wellhead.getWellheadId();

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

@@ -7,6 +7,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
 import pps.cloud.base.service.IBasePowerLineCloudService;
@@ -21,6 +22,7 @@ import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQuery
 import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerOutput;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
+import pps.core.common.utils.BaseUtils;
 import pps.core.space.entity.*;
 import pps.core.space.enums.BusinessError;
 import pps.core.space.mapper.*;
@@ -110,6 +112,21 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                 .strategyMonth(String.valueOf(month))
                 .build());
         strategyResult.throwIfFail();
+        //查井口配置时间段
+        SpaceInstitutionDurationMapper durationMapper = context.getBean(SpaceInstitutionDurationMapper.class);
+        List<SpaceInstitutionDurationEnt> durationList = durationMapper.selectList(new QueryWrapper<SpaceInstitutionDurationEnt>()
+                .select("*",
+                        "STR_TO_DATE( CONCAT( open_well_time, ':00' ), '%H:%i:%s' ) AS openTime",
+                        "STR_TO_DATE( CONCAT( close_well_time, ':00' ), '%H:%i:%s' ) AS closeTime"
+                )
+                .lambda()
+                .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
+                .in(SpaceInstitutionDurationEnt::getWellheadId, spaceWellheadList.stream().map(SpaceInstitutionWellheadView::getWellheadId).collect(Collectors.toList()))
+                .orderByAsc(SpaceInstitutionDurationEnt::getOpenWellTime)
+        );
+        if (CollUtil.isEmpty(durationList)) {
+            throw new XServiceException(BusinessError.DidNotFindCalibration);
+        }
         //间开制度ID/井口LIST Map
         Map<String, List<SpaceInstitutionWellheadView>> wellheadMap = spaceWellheadList.stream()
                 .collect(Collectors.groupingBy(SpaceInstitutionWellheadView::getInstitutionId));
@@ -123,13 +140,20 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
         //峰谷策略ID/峰谷策略LIST Map
         Map<String, List<GetBasePriceStrategyDetailOutput>> strategyMap = strategyResult.getResult().stream()
                 .collect(Collectors.groupingBy(GetBasePriceStrategyDetailOutput::getStrategyId));
+        //间开制度ID/区间配置Map Map
+        Map<String, Map<String, List<SpaceInstitutionDurationEnt>>> durationMap = durationList.stream()
+                .collect(Collectors.groupingBy(SpaceInstitutionDurationEnt::getInstitutionId,
+                        Collectors.groupingBy(SpaceInstitutionDurationEnt::getWellheadId)));
         //初始化时间轴
         List<DateTime> rangeToList = DateUtil.rangeToList(DateUtil.offsetDay(BusinessConstant.DATE_FLAG, -1), BusinessConstant.DATE_FLAG, DateField.MINUTE, 15);
         //遍历
         List<DynamicQueryPlantPredictedPowerOutput> powerList;
         List<GetBasePriceStrategyDetailOutput> strategyList;
         List<SpaceInstitutionWellheadView> wellheadList;
+        String periodId;
         for (SpaceInstitutionDetailEnt detail : detailEntList) {
+            //创建记录
+            periodId = this.createOptimizePeriod(periodDTOList, detail.getId(), detail.getLineId(), BaseUtils.getExecutionCycleForCalibration(startDate, optimizeDate), optimizeDate);
             //查预测光伏出力
             powerList = this.getAveragePowerGenerationListByPlantIds(context, DynamicQueryPlantPredictedPowerInput.builder()
                     .plantIds(plantIdsMap.get(detail.getLineId()))
@@ -137,10 +161,15 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                     .endTime(optimizeDate.toString(BusinessConstant.DATE_FORMAT_DAY))
                     .dateType(BusinessConstant.ONE)
                     .build());
-            if (CollUtil.isEmpty(powerList)) {
+            if (!CollUtil.isEmpty(powerList)) {
+                //没有预测数据都不优化
+                this.setUnOptimizeWellheadConfig(durationDTOList, unOptimizeDurationList, wellheadDTOList,
+                        spaceWellheadList, durationMap.get(detail.getId()), periodId, optimizeDate);
                 continue;
             }
+            //取峰谷策略
             strategyList = strategyMap.get(lineMap.get(detail.getLineId()));
+            //取井口并遍历
             wellheadList = wellheadMap.get(detail.getId());
             for (SpaceInstitutionWellheadView wellhead : wellheadList) {