feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -10,6 +10,7 @@ import xstartup.annotation.XText;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Collection;
 
 /**
  * 输电线路光伏配置
@@ -60,4 +61,8 @@ public class BasePowerLinePlantView extends BaseModel implements Serializable {
     @XText("地区编码")
     @TableField
     private Integer areaCode;
+
+    @XText("线路ID集合")
+    @TableField(exist = false)
+    private Collection<String> lineIds;
 }

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

@@ -151,6 +151,7 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
         List<BasePowerLinePlantView> plantList = mapper.selectPlantListByParam(
                 BasePowerLinePlantView.builder()
                         .lineId(input.getLineId())
+                        .lineIds(input.getLineIds())
                         .build()
         );
         return XListResult.success(XCopyUtils.copyNewList(

C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePowerLinePlantViewMapper.xml

@@ -79,6 +79,7 @@
     <select id="selectPlantListByParam" parameterType="pps.core.base.entity.BasePowerLinePlantView"
             resultMap="ExtendsResultMap">
         SELECT l.id,
+        l.line_id,
         l.plant_id,
         p.area_code,
         p.longitude,
@@ -88,6 +89,16 @@
         FROM base_power_line_plant l
         JOIN base_photovoltaic_plant p ON l.plant_id = p.id
         AND p.is_deleted = 1
-        WHERE l.line_id = #{lineId}
+        <where>
+            <if test="lineId != null and lineId != ''">
+                AND l.line_id = #{lineId}
+            </if>
+            <if test="lineIds != null">
+                AND l.line_id IN
+                <foreach collection="lineIds" open="(" close=")" separator="," item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
     </select>
 </mapper>
\ No newline at end of file

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

@@ -12,6 +12,8 @@ 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_power_line_plant.DynamicQueryBasePowerLinePlantInput;
+import pps.cloud.base.service.data.base_power_line_plant.DynamicQueryBasePowerLinePlantViewOutput;
 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;
@@ -93,6 +95,13 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
         lineResult.throwIfFail();
         Map<String, DynamicQueryBasePowerLineOutput> lineMap = lineResult.getResult().stream()
                 .collect(Collectors.toMap(DynamicQueryBasePowerLineOutput::getId, Function.identity()));
+        //查线路下所有电站
+        XListResult<DynamicQueryBasePowerLinePlantViewOutput> linePlantResult = lineCloudService.getPowerLinePlantViewList(context, DynamicQueryBasePowerLinePlantInput.builder()
+                .lineIds(lineIds)
+                .build());
+        linePlantResult.throwIfFail();
+        Map<String, List<String>> plantIdsMap = linePlantResult.getResult().stream()
+                .collect(Collectors.groupingBy(DynamicQueryBasePowerLinePlantViewOutput::getLineId, Collectors.mapping(DynamicQueryBasePowerLinePlantViewOutput::getPlantId, Collectors.toList())));
         //取当前时间
         DateTime date = DateUtil.beginOfDay(DateTime.now());
         int month = date.monthBaseOne();
@@ -105,6 +114,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
         Map<String, List<GetBasePriceStrategyDetailOutput>> strategyMap = strategyResult.getResult().stream()
                 .collect(Collectors.groupingBy(GetBasePriceStrategyDetailOutput::getStrategyId));
 
+
         for (SpaceInstitutionDetailEnt detail : detailEntList) {
 
         }