feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_price_strategy_detail/GetBasePriceStrategyDetailOutput.java

@@ -3,6 +3,8 @@ package pps.cloud.base.service.data.base_price_strategy_detail;
 import lombok.Data;
 import xstartup.annotation.XText;
 
+import java.util.Date;
+
 /**
  * 策略配置详情
  *
@@ -26,4 +28,10 @@ public class GetBasePriceStrategyDetailOutput {
 
     @XText("结束时间")
     private String endTime;
+
+    @XText("开始时间")
+    private Date openTime;
+
+    @XText("结束时间")
+    private Date closeTime;
 }

C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePriceStrategyDetailEnt.java

@@ -8,6 +8,7 @@ import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 市电峰谷当月明细配置
@@ -46,4 +47,12 @@ public class BasePriceStrategyDetailEnt extends BaseModel implements Serializabl
     @XText("内部结算价")
     @TableField
     private BigDecimal internalSettlementPrice;
+
+    @XText("开始时间")
+    @TableField(exist = false)
+    private Date openTime;
+
+    @XText("结束时间")
+    @TableField(exist = false)
+    private Date closeTime;
 }

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyCloudServiceImpl.java

@@ -2,7 +2,7 @@ package pps.core.base.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import pps.cloud.base.service.IBasePriceStrategyCloudService;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailInput;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
@@ -41,7 +41,12 @@ public class BasePriceStrategyCloudServiceImpl implements IBasePriceStrategyClou
         //查明细
         BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
         List<BasePriceStrategyDetailEnt> detailList = detailMapper.selectList(
-                new LambdaQueryWrapper<BasePriceStrategyDetailEnt>()
+                new QueryWrapper<BasePriceStrategyDetailEnt>()
+                        .select("*",
+                                "STR_TO_DATE( CONCAT( start_time, ':00' ), '%H:%i:%s' ) AS openTime",
+                                "STR_TO_DATE( CONCAT( end_time, ':00' ), '%H:%i:%s' ) AS closeTime"
+                        )
+                        .lambda()
                         .eq(CharSequenceUtil.isNotBlank(periodTypeKey), BasePriceStrategyDetailEnt::getPeriodTypeKey, periodTypeKey)
                         .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                         .eq(BasePriceStrategyDetailEnt::getStrategyMonth, input.getStrategyMonth())

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

@@ -47,6 +47,7 @@ import xstartup.data.XServiceResult;
 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;
@@ -153,6 +154,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
         List<GetBasePriceStrategyDetailOutput> strategyList;
         List<SpaceInstitutionWellheadView> wellheadList;
         String periodId;
+        BigDecimal serviceRating;
         for (SpaceInstitutionDetailEnt detail : detailEntList) {
             //创建记录
             periodId = this.createOptimizePeriod(periodDTOList, detail.getId(), detail.getLineId(), BaseUtils.getExecutionCycleForCalibration(startDate, optimizeDate), optimizeDate);
@@ -174,6 +176,9 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
             //取井口并遍历
             wellheadList = wellheadMap.get(detail.getId());
             for (SpaceInstitutionWellheadView wellhead : wellheadList) {
+                serviceRating = wellhead.getServiceRating();
+                //计算权重
+
 
             }
         }

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

@@ -26,9 +26,14 @@ public class SpaceOptimizeWeight {
     private DateTime timestamp;
 
     /**
-     * 权重
+     * 权重:
+     * 光伏发电量: 10 + 发电量
+     * 谷电: 5
+     * 平电: 3
+     * 峰电: 1
+     * 尖峰: 0
      */
-    private BigDecimal weight;
+    private int weight;
 
     /**
      * 发电量