Commit e1be55d7 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent c59d1ea3
...@@ -79,7 +79,7 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService ...@@ -79,7 +79,7 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
String strategyId = input.getStrategyId(); String strategyId = input.getStrategyId();
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class); BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
List<BasePowerLineEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePowerLineEnt>() List<BasePowerLineEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePowerLineEnt>()
.select(BaseModel::getId, BasePowerLineEnt::getLineName) .select(BaseModel::getId, BasePowerLineEnt::getLineName, BasePowerLineEnt::getStrategyId)
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE) .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.in(CollUtil.isNotEmpty(lineIds), BaseModel::getId, lineIds) .in(CollUtil.isNotEmpty(lineIds), BaseModel::getId, lineIds)
.in(CollUtil.isNotEmpty(lineNames), BasePowerLineEnt::getLineName, lineNames) .in(CollUtil.isNotEmpty(lineNames), BasePowerLineEnt::getLineName, lineNames)
......
...@@ -46,7 +46,6 @@ import java.util.ArrayList; ...@@ -46,7 +46,6 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -93,15 +92,11 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -93,15 +92,11 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
.lineIds(lineIds) .lineIds(lineIds)
.build()); .build());
lineResult.throwIfFail(); lineResult.throwIfFail();
Map<String, DynamicQueryBasePowerLineOutput> lineMap = lineResult.getResult().stream()
.collect(Collectors.toMap(DynamicQueryBasePowerLineOutput::getId, Function.identity()));
//查线路下所有电站 //查线路下所有电站
XListResult<DynamicQueryBasePowerLinePlantViewOutput> linePlantResult = lineCloudService.getPowerLinePlantViewList(context, DynamicQueryBasePowerLinePlantInput.builder() XListResult<DynamicQueryBasePowerLinePlantViewOutput> linePlantResult = lineCloudService.getPowerLinePlantViewList(context, DynamicQueryBasePowerLinePlantInput.builder()
.lineIds(lineIds) .lineIds(lineIds)
.build()); .build());
linePlantResult.throwIfFail(); 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()); DateTime date = DateUtil.beginOfDay(DateTime.now());
int month = date.monthBaseOne(); int month = date.monthBaseOne();
...@@ -111,10 +106,20 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -111,10 +106,20 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
.strategyMonth(String.valueOf(month)) .strategyMonth(String.valueOf(month))
.build()); .build());
strategyResult.throwIfFail(); strategyResult.throwIfFail();
//间开制度ID/井口LIST Map
Map<String, List<SpaceInstitutionWellheadView>> wellheadMap = spaceWellheadList.stream()
.collect(Collectors.groupingBy(SpaceInstitutionWellheadView::getInstitutionId));
//线路ID/峰谷策略ID Map
Map<String, String> lineMap = lineResult.getResult().stream()
.collect(Collectors.toMap(DynamicQueryBasePowerLineOutput::getId, DynamicQueryBasePowerLineOutput::getStrategyId));
//线路ID/电站ID LIST Map
Map<String, List<String>> plantIdsMap = linePlantResult.getResult().stream()
.collect(Collectors.groupingBy(DynamicQueryBasePowerLinePlantViewOutput::getLineId,
Collectors.mapping(DynamicQueryBasePowerLinePlantViewOutput::getPlantId, Collectors.toList())));
//峰谷策略ID/峰谷策略LIST Map
Map<String, List<GetBasePriceStrategyDetailOutput>> strategyMap = strategyResult.getResult().stream() Map<String, List<GetBasePriceStrategyDetailOutput>> strategyMap = strategyResult.getResult().stream()
.collect(Collectors.groupingBy(GetBasePriceStrategyDetailOutput::getStrategyId)); .collect(Collectors.groupingBy(GetBasePriceStrategyDetailOutput::getStrategyId));
for (SpaceInstitutionDetailEnt detail : detailEntList) { for (SpaceInstitutionDetailEnt detail : detailEntList) {
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment