feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -38,6 +38,7 @@ import xstartup.feature.api.annotation.XApiGet;
 import xstartup.feature.api.annotation.XApiPost;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -74,6 +75,12 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
         List<SpaceOptimizeShortDurationEnt> shortDurationList;
         List<DynamicQueryPlantPredictedPowerOutput> generationHourList;
         List<DynamicQueryBasePowerLineOutput> lineList = lineOutputXListResult.getResult();
+        //分母(谷电和光伏发电去重总时间)
+        long lowAndPowerSumMinute = 0;
+        //分子已优化(谷电和光伏发电去重总时间内间开时间)
+        long optimizeSumMinute = 0;
+        //分子未优化(谷电和光伏发电去重总时间内间开时间)
+        long unOptimizeSumMinute = 0;
         for (DynamicQueryBasePowerLineOutput line : lineList) {
             //查对应间开制度
             detailEnt = detailMapper.selectOne(new LambdaQueryWrapper<SpaceInstitutionDetailEnt>()
@@ -179,6 +186,7 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
                 //计算谷电时间(分钟) 累加
                 powerMinute += DateUtil.between(startTime, endTime, DateUnit.MINUTE);
             }
+            lowAndPowerSumMinute += powerMinute;
             //优化时长(分钟)
             long optimizeMinute = 0;
             //未优化时长(分钟)
@@ -209,12 +217,21 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
                     }
                     if (duration.getIsOptimize().equals(BusinessConstant.ZERO)) {
                         optimizeMinute += DateUtil.between(openWellTime, closeWellTime, DateUnit.MINUTE);
+                        optimizeSumMinute += optimizeMinute;
                     } else {
                         unOptimizeMinute += DateUtil.between(openWellTime, closeWellTime, DateUnit.MINUTE);
+                        unOptimizeSumMinute += unOptimizeMinute;
                     }
                 }
             }
         }
+        //分母
+        BigDecimal denominator = new BigDecimal(lowAndPowerSumMinute);
+        BigDecimal optimizeNumerator = new BigDecimal(optimizeSumMinute);
+        BigDecimal unOptimizeNumerator = new BigDecimal(unOptimizeSumMinute);
+        //计算率
+        BigDecimal divide = unOptimizeNumerator.divide(denominator, 2, RoundingMode.HALF_UP)
+                .subtract(optimizeNumerator.divide(denominator, 2, RoundingMode.HALF_UP));
         return XServiceResult.OK;
     }