feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -27,6 +27,7 @@ import pps.core.space.entity.*;
 import pps.core.space.enums.BusinessError;
 import pps.core.space.mapper.*;
 import pps.core.space.service.data.SpaceOptimizeDateDuration;
+import pps.core.space.service.data.SpaceOptimizeWeight;
 import pps.core.space.service.data.space_optimize_period.GetSpaceOptimizePeriodInput;
 import pps.core.space.service.data.space_optimize_period.GetSpaceOptimizePeriodOutput;
 import pps.core.space.service.data.space_optimize_short_period.QuerySpaceOptimizeShortPeriodViewInput;
@@ -48,10 +49,7 @@ import xstartup.data.XSingleResult;
 import xstartup.feature.api.annotation.XApiGet;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -184,24 +182,102 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
                 int powerIndex = 0;
                 int strategyListSize = strategyList.size();
                 int strategyIndex = 0;
-                while (rangeListSize > 0) {
+                List<SpaceOptimizeWeight> weightList = new ArrayList<>(rangeListSize);
+                DynamicQueryPlantPredictedPowerOutput firstPower;
+                DynamicQueryPlantPredictedPowerOutput lastPower;
+                GetBasePriceStrategyDetailOutput firstStrategy;
+                GetBasePriceStrategyDetailOutput lastStrategy;
+                while (rangeListSize > 0 && rangeListSize > rangeIndex) {
+                    boolean powerFlag = false;
+                    SpaceOptimizeWeight firstWeight = new SpaceOptimizeWeight();
                     DateTime firstTime = rangeToList.get(rangeIndex);
-                    DynamicQueryPlantPredictedPowerOutput firstPower = powerList.get(powerIndex);
-                    GetBasePriceStrategyDetailOutput firstStrategy = strategyList.get(strategyIndex);
-
-
-
-
-                    DateTime lastTime = rangeToList.get(rangeListSize - 1);
-                    DynamicQueryPlantPredictedPowerOutput lastPower = powerList.get(powerListSize - 1);
-                    GetBasePriceStrategyDetailOutput lastStrategy = strategyList.get(strategyListSize - 1);
-
+                    firstWeight.setTimestamp(firstTime);
+                    firstPower = powerList.get(powerIndex);
+                    if (0 == firstTime.compareTo(firstPower.getCreateTime())) {
+                        firstWeight.setPower(firstPower.getPower());
+                        //判断发电量是否满足运行功率
+                        powerFlag = firstPower.getPower().compareTo(serviceRating) >= 0;
+                        if (powerFlag) {
+                            firstWeight.setWeight(10);
+                        }
+                        powerIndex++;
+                    }
+                    firstStrategy = strategyList.get(strategyIndex);
+                    Date closeTime = ObjectUtil.isEmpty(firstStrategy.getCloseTime()) && CharSequenceUtil.equals(BusinessConstant.END_OF_DAY_TIME, firstStrategy.getStartTime()) ? BusinessConstant.DATE_FLAG : firstStrategy.getCloseTime();
+                    //在市电峰谷时段内,且未满足运行功率,设置权重
+                    if (DateUtil.isIn(firstTime, firstStrategy.getOpenTime(), closeTime)) {
+                        if (CharSequenceUtil.equals(firstStrategy.getPeriodTypeKey(), "RUSH")) {
+                            //尖峰时段要停井
+                            firstWeight.setWeight(0);
+                        } else if (!powerFlag) {
+                            firstWeight.setWeight(this.getWeightByPeriodTypeKey(firstStrategy.getPeriodTypeKey()));
+                        }
+                    }
+                    if (firstTime.compareTo(firstStrategy.getCloseTime()) >= 0) {
+                        strategyIndex++;
+                    }
+                    weightList.add(firstWeight);
+                    rangeIndex++;
+                    rangeListSize--;
+                    //防止重复插入
+                    if (rangeIndex >= rangeListSize) {
+                        continue;
+                    }
+                    /*----------------------------------------------------*/
+                    powerFlag = false;
+                    SpaceOptimizeWeight lastWeight = new SpaceOptimizeWeight();
+                    DateTime lastTime = rangeToList.get(rangeListSize);
+                    lastWeight.setTimestamp(lastTime);
+                    lastPower = powerList.get(powerListSize - 1);
+                    if (0 == lastTime.compareTo(lastPower.getCreateTime())) {
+                        lastWeight.setPower(lastPower.getPower());
+                        //判断发电量是否满足运行功率
+                        powerFlag = lastPower.getPower().compareTo(serviceRating) >= 0;
+                        if (powerFlag) {
+                            lastWeight.setWeight(10);
+                        }
+                        powerListSize--;
+                    }
+                    lastStrategy = strategyList.get(strategyListSize - 1);
+                    closeTime = ObjectUtil.isEmpty(lastStrategy.getCloseTime()) && CharSequenceUtil.equals(BusinessConstant.END_OF_DAY_TIME, lastStrategy.getEndTime()) ? BusinessConstant.DATE_FLAG : lastStrategy.getCloseTime();
+                    //在市电峰谷时段内,且未满足运行功率,设置权重
+                    if (DateUtil.isIn(lastTime, lastStrategy.getOpenTime(), closeTime)) {
+                        if (CharSequenceUtil.equals(lastStrategy.getPeriodTypeKey(), "RUSH")) {
+                            //尖峰时段要停井
+                            lastWeight.setWeight(0);
+                        } else if (!powerFlag) {
+                            lastWeight.setWeight(this.getWeightByPeriodTypeKey(lastStrategy.getPeriodTypeKey()));
+                        }
+                    }
+                    if (lastTime.compareTo(lastStrategy.getOpenTime()) <= 0) {
+                        strategyListSize--;
+                    }
+                    weightList.add(lastWeight);
                 }
             }
         }
         return XServiceResult.OK;
     }
 
+    /**
+     * 通过时段类型获取权重
+     *
+     * @param periodTypeKey 周期类型键
+     * @return int
+     */
+    private int getWeightByPeriodTypeKey(String periodTypeKey) {
+        switch (periodTypeKey) {
+            case "LOW":
+                return 5;
+            case "PEACE":
+                return 3;
+            case "PEAK":
+                return 1;
+            case "RUSH":
+            default:
+                return 0;
+        }
+    }
 
     /**
      * 极短期间开开优化--分页列表

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/SpaceOptimizeWeight.java

@@ -33,7 +33,7 @@ public class SpaceOptimizeWeight {
      * 峰电: 1
      * 尖峰: 0
      */
-    private int weight;
+    private int weight = 0;
 
     /**
      * 发电量