feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -113,7 +113,7 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
             if (CollUtil.isEmpty(strategyList)) {
                 continue;
             }
-            //查间开优化时间段
+            //查间开时间段
             shortDurationList = shortDurationMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeShortDurationEnt>()
                     .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                     .eq(SpaceOptimizeShortDurationEnt::getOptimizeDate, of)
@@ -142,7 +142,7 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
             if (CollUtil.isEmpty(generationHourList)) {
                 continue;
             }
-            List<SpaceOptimizeDurationDTO> powerSpaceList = new ArrayList<>(8);
+            List<SpaceOptimizeDurationDTO> powerSpaceList = new ArrayList<>(4);
             DateTime beginDate = DateUtil.date(generationHourList.get(0).getCreateTime());
             DateTime endDate = DateUtil.date(generationHourList.get(generationHourList.size() - 1).getCreateTime());
             powerSpaceList.add(
@@ -176,10 +176,43 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
                                 .closeTime(endTime)
                                 .build()
                 );
-                //计算谷电时间(分钟)
-                long lowMinute = DateUtil.between(startTime, endTime, DateUnit.MINUTE);
-                //累加
-                powerMinute += lowMinute;
+                //计算谷电时间(分钟) 累加
+                powerMinute += DateUtil.between(startTime, endTime, DateUnit.MINUTE);
+            }
+            //优化时长(分钟)
+            long optimizeMinute = 0;
+            //未优化时长(分钟)
+            long unOptimizeMinute = 0;
+            //计算间开时间
+            for (SpaceOptimizeShortDurationEnt duration : shortDurationList) {
+                DateTime openWellTime = DateUtil.parse(duration.getOpenWellTime() + BusinessConstant.INITIALIZATION_SECOND, BusinessConstant.TIME_FORMAT);
+                DateTime closeWellTime;
+                if (CharSequenceUtil.equals(duration.getCloseWellTime(), BusinessConstant.END_OF_DAY_TIME)) {
+                    closeWellTime = BusinessConstant.DATE_FLAG;
+                } else {
+                    closeWellTime = DateUtil.parse(duration.getCloseWellTime() + BusinessConstant.INITIALIZATION_SECOND, BusinessConstant.TIME_FORMAT);
+                }
+                for (SpaceOptimizeDurationDTO dto : powerSpaceList) {
+                    DateTime openTime = DateUtil.date(dto.getOpenTime());
+                    DateTime closeTime = DateUtil.date(dto.getCloseTime());
+                    if (openWellTime.compareTo(closeTime) >= 0) {
+                        continue;
+                    } else if (closeWellTime.compareTo(openTime) <= 0) {
+                        continue;
+                    } else if (openWellTime.compareTo(openTime) <= 0 && closeWellTime.compareTo(closeTime) <= 0) {
+                        openWellTime = openTime;
+                    } else if (openWellTime.compareTo(openTime) < 0 && closeWellTime.compareTo(closeTime) > 0) {
+                        openWellTime = openTime;
+                        closeWellTime = closeTime;
+                    } else if (openWellTime.compareTo(openTime) >= 0 && closeWellTime.compareTo(closeTime) >= 0) {
+                        closeWellTime = closeTime;
+                    }
+                    if (duration.getIsOptimize().equals(BusinessConstant.ZERO)) {
+                        optimizeMinute += DateUtil.between(openWellTime, closeWellTime, DateUnit.MINUTE);
+                    } else {
+                        unOptimizeMinute += DateUtil.between(openWellTime, closeWellTime, DateUnit.MINUTE);
+                    }
+                }
             }
         }
         return XServiceResult.OK;