feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -2,7 +2,9 @@ package pps.core.space.service;
 
 import cn.hutool.core.collection.CollUtil;
 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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import pps.cloud.base.service.IBasePowerLineCloudService;
@@ -140,6 +142,36 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
             generationHourList = generationHourList.stream()
                     .filter(generationHour -> generationHour.getPower().compareTo(BigDecimal.ZERO) > 0)
                     .collect(Collectors.toList());
+            if (CollUtil.isEmpty(generationHourList)) {
+                continue;
+            }
+            DateTime beginDate = DateUtil.date(generationHourList.get(0).getCreateTime());
+            DateTime endDate = DateUtil.date(generationHourList.get(generationHourList.size() - 1).getCreateTime());
+            //计算发电时间(分钟)
+            long powerMinute = DateUtil.between(beginDate, endDate, DateUnit.MINUTE);
+            for (GetBasePriceStrategyDetailOutput strategyDetail : strategyList) {
+                DateTime startTime = DateUtil.parse(strategyDetail.getStartTime() + BusinessConstant.INITIALIZATION_SECOND, BusinessConstant.TIME_FORMAT);
+                DateTime endTime;
+                if (CharSequenceUtil.equals(strategyDetail.getEndTime(), BusinessConstant.END_OF_DAY_TIME)) {
+                    endTime = BusinessConstant.DATE_FLAG;
+                } else {
+                    endTime = DateUtil.parse(strategyDetail.getEndTime() + BusinessConstant.INITIALIZATION_SECOND, BusinessConstant.TIME_FORMAT);
+                }
+                //判断
+                if (startTime.compareTo(beginDate) <= 0 && endTime.compareTo(beginDate) >= 0) {
+                    endTime = beginDate;
+                } else if (startTime.compareTo(endDate) <= 0 && endTime.compareTo(endDate) >= 0) {
+                    startTime = endDate;
+                } else if (startTime.compareTo(beginDate) >= 0 && endTime.compareTo(endDate) <= 0) {
+                    //时间段和发电时间重合,排除
+                    continue;
+                }
+                //计算谷电时间(分钟)
+                long lowMinute = DateUtil.between(startTime, endTime, DateUnit.MINUTE);
+                //累加
+                powerMinute += lowMinute;
+            }
+
         }
         return XServiceResult.OK;
     }