feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeDurationDTO.java

 package pps.core.space.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import pps.core.common.entity.BaseModel;
 import xstartup.annotation.XText;
 
@@ -15,6 +18,9 @@ import java.util.Date;
  * @date 2023/09/05
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class SpaceOptimizeDurationDTO extends BaseModel implements Serializable {
 
     @XText("井口记录ID")

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

@@ -19,10 +19,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.space.entity.SpaceInstitutionDetailEnt;
-import pps.core.space.entity.SpaceInstitutionWellheadEnt;
-import pps.core.space.entity.SpaceOptimizeShortDurationEnt;
-import pps.core.space.entity.SpaceOptimizeShortWellheadEnt;
+import pps.core.space.entity.*;
 import pps.core.space.mapper.SpaceInstitutionDetailMapper;
 import pps.core.space.mapper.SpaceInstitutionWellheadMapper;
 import pps.core.space.mapper.SpaceOptimizeShortDurationMapper;
@@ -145,8 +142,15 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
             if (CollUtil.isEmpty(generationHourList)) {
                 continue;
             }
+            List<SpaceOptimizeDurationDTO> powerSpaceList = new ArrayList<>(8);
             DateTime beginDate = DateUtil.date(generationHourList.get(0).getCreateTime());
             DateTime endDate = DateUtil.date(generationHourList.get(generationHourList.size() - 1).getCreateTime());
+            powerSpaceList.add(
+                    SpaceOptimizeDurationDTO.builder()
+                            .openTime(beginDate)
+                            .closeTime(endDate)
+                            .build()
+            );
             //计算发电时间(分钟)
             long powerMinute = DateUtil.between(beginDate, endDate, DateUnit.MINUTE);
             for (GetBasePriceStrategyDetailOutput strategyDetail : strategyList) {
@@ -166,12 +170,17 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
                     //时间段和发电时间重合,排除
                     continue;
                 }
+                powerSpaceList.add(
+                        SpaceOptimizeDurationDTO.builder()
+                                .openTime(startTime)
+                                .closeTime(endTime)
+                                .build()
+                );
                 //计算谷电时间(分钟)
                 long lowMinute = DateUtil.between(startTime, endTime, DateUnit.MINUTE);
                 //累加
                 powerMinute += lowMinute;
             }
-
         }
         return XServiceResult.OK;
     }