Commit 8acfc92b authored by ZWT's avatar ZWT

feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 2ff3de4f
......@@ -586,7 +586,13 @@ public class HomePageService {
String greenElectricityRate = "-";
String zeroGreenElectricityRate = "100";
BigDecimal avoidPeakRate = BigDecimal.ZERO;
List<DynamicQueryBasePowerLineOutput> lineList = this.getLineList(context, stationId, null, null);
if (CharSequenceUtil.isBlank(stationId)) {
stationId = context.getSession(PpsUserSession.class).getOuId();
}
List<String> ouIds = ServiceUtil.getOrgIdsByPath(context, stationId);
List<DynamicQueryBasePowerLineOutput> lineList = this.getLineList(context, DynamicQueryBasePowerLineInput.builder()
.ouIdList(ouIds)
.build());
if (CollUtil.isNotEmpty(lineList)) {
lineNameList = new HashSet<>(lineList.size());
for (DynamicQueryBasePowerLineOutput line : lineList) {
......@@ -1044,6 +1050,20 @@ public class HomePageService {
return result.getResult();
}
/**
* 输电线路列表
*
* @param context 上下文
* @param input 输入
* @return {@link List }<{@link DynamicQueryBasePowerLineOutput }>
*/
private List<DynamicQueryBasePowerLineOutput> getLineList(XContext context, DynamicQueryBasePowerLineInput input) {
IBasePowerLineCloudService service = context.getBean(IBasePowerLineCloudService.class);
XListResult<DynamicQueryBasePowerLineOutput> result = service.getBasePowerLineList(context, input);
result.throwIfFail();
return result.getResult();
}
/**
* 获取子线路列表
*
......
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