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

@@ -12,6 +12,9 @@ import xstartup.annotation.XText;
 @Data
 public class GetBasePriceStrategyDetailOutput {
 
+    @XText("市电峰谷配置ID")
+    private String strategyId;
+
     @XText("市电峰谷月")
     private String strategyMonth;
 

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

@@ -37,6 +37,7 @@ public class BasePriceStrategyCloudServiceImpl implements IBasePriceStrategyClou
     @Override
     public XListResult<GetBasePriceStrategyDetailOutput> queryStrategyDetailList(XContext context, GetBasePriceStrategyDetailInput input) {
         String periodTypeKey = input.getPeriodTypeKey();
+        String lineId = input.getLineId();
         //查明细
         BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
         List<BasePriceStrategyDetailEnt> detailList = detailMapper.selectList(
@@ -44,7 +45,7 @@ public class BasePriceStrategyCloudServiceImpl implements IBasePriceStrategyClou
                         .eq(CharSequenceUtil.isNotBlank(periodTypeKey), BasePriceStrategyDetailEnt::getPeriodTypeKey, periodTypeKey)
                         .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                         .eq(BasePriceStrategyDetailEnt::getStrategyMonth, input.getStrategyMonth())
-                        .apply("strategy_id = ( SELECT strategy_id FROM base_power_line WHERE id = {0} ) ", input.getLineId())
+                        .apply(CharSequenceUtil.isNotBlank(lineId), "strategy_id = ( SELECT strategy_id FROM base_power_line WHERE id = {0} ) ", lineId)
                         .orderByAsc(BasePriceStrategyDetailEnt::getStartTime)
         );
         List<GetBasePriceStrategyDetailOutput> outputs;

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

@@ -9,8 +9,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
 import pps.cloud.base.service.IBasePowerLineCloudService;
+import pps.cloud.base.service.IBasePriceStrategyCloudService;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
 import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
+import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailInput;
+import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.common.entity.BaseModel;
 import pps.core.space.entity.*;
@@ -90,6 +93,17 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
         lineResult.throwIfFail();
         Map<String, DynamicQueryBasePowerLineOutput> lineMap = lineResult.getResult().stream()
                 .collect(Collectors.toMap(DynamicQueryBasePowerLineOutput::getId, Function.identity()));
+        //取当前时间
+        DateTime date = DateUtil.beginOfDay(DateTime.now());
+        int month = date.monthBaseOne();
+        //查市电峰谷
+        IBasePriceStrategyCloudService strategyCloudService = context.getBean(IBasePriceStrategyCloudService.class);
+        XListResult<GetBasePriceStrategyDetailOutput> strategyResult = strategyCloudService.queryStrategyDetailList(context, GetBasePriceStrategyDetailInput.builder()
+                .strategyMonth(String.valueOf(month))
+                .build());
+        strategyResult.throwIfFail();
+        Map<String, List<GetBasePriceStrategyDetailOutput>> strategyMap = strategyResult.getResult().stream()
+                .collect(Collectors.groupingBy(GetBasePriceStrategyDetailOutput::getStrategyId));
 
         for (SpaceInstitutionDetailEnt detail : detailEntList) {