Commit 661c4a45 authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.修改系统首页大屏总览接口,增加区分组织机构逻辑,完成接口冒烟测试;
2.修改系统首页获取井场列表接口,增加区分组织机构逻辑,完成接口冒烟测试;
3.修改系统首页井场功能下钻后提示报错问题,修改用电功率数据获取逻辑,修复报错问题;
4.修改输电线路分页列表查询接口,增加查询条件,在查询父线路列表时只查询10千伏线路,修改线上接口文档同时完成接口冒烟测试;
5.修改系统首页井场实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent a02e97bd
...@@ -202,11 +202,17 @@ public class HomePageService { ...@@ -202,11 +202,17 @@ public class HomePageService {
BigDecimal cumulativeProduction = BigDecimal.ZERO; BigDecimal cumulativeProduction = BigDecimal.ZERO;
BigDecimal powerGeneration = BigDecimal.ZERO; BigDecimal powerGeneration = BigDecimal.ZERO;
BigDecimal powerConsumption = BigDecimal.ZERO; BigDecimal powerConsumption = BigDecimal.ZERO;
if (CharSequenceUtil.isBlank(stationId)) {
stationId = context.getSession(PpsUserSession.class).getOuId();
}
List<String> ouIds = ServiceUtil.getOrgIdsByPath(context, stationId);
String oilFieldCode = ServiceUtil.getOilFieldCode(context); String oilFieldCode = ServiceUtil.getOilFieldCode(context);
switch (oilFieldCode) { switch (oilFieldCode) {
case BusinessConstant.ENV_CQ: case BusinessConstant.ENV_CQ:
//实时站 //实时站
Set<String> set = this.getPlantList(context, stationId, null).stream() Set<String> set = this.getPlantList(context, GetBasePhotovoltaicPlantCloudInput.builder()
.ouIds(ouIds)
.build()).stream()
.map(GetBasePhotovoltaicPlantCloudOutput::getStationName) .map(GetBasePhotovoltaicPlantCloudOutput::getStationName)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
ThirdDailyAccumulationUpdateMapper mapper = context.getBean(ThirdDailyAccumulationUpdateMapper.class); ThirdDailyAccumulationUpdateMapper mapper = context.getBean(ThirdDailyAccumulationUpdateMapper.class);
...@@ -230,7 +236,9 @@ public class HomePageService { ...@@ -230,7 +236,9 @@ public class HomePageService {
} }
//实时井口 //实时井口
int openWellNumber = 0, stopWellNumber = 0, openJCNumber = 0, openLCNumber = 0, stopJCNumber = 0, stopLCNumber = 0; int openWellNumber = 0, stopWellNumber = 0, openJCNumber = 0, openLCNumber = 0, stopJCNumber = 0, stopLCNumber = 0;
List<DynamicQueryBaseWellheadOutput> list = this.getWellList(context, stationId); List<DynamicQueryBaseWellheadOutput> list = this.getWellList(context, DynamicQueryBaseWellheadInput.builder()
.ouIds(ouIds)
.build());
Map<String, String> collect = list.stream() Map<String, String> collect = list.stream()
.collect(Collectors.toMap(DynamicQueryBaseWellheadOutput::getWellNumber, DynamicQueryBaseWellheadOutput::getRunTypeKey)); .collect(Collectors.toMap(DynamicQueryBaseWellheadOutput::getWellNumber, DynamicQueryBaseWellheadOutput::getRunTypeKey));
ThirdCurrentWellConditionMapper wellMapper = context.getBean(ThirdCurrentWellConditionMapper.class); ThirdCurrentWellConditionMapper wellMapper = context.getBean(ThirdCurrentWellConditionMapper.class);
......
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