Commit 9d03982b authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.修改部分第三方数据处理定时任务,修改系统来源,将固定来源按环境区分改为动态获取;
2.修改统计分析-间开效果评价新页面累节电能接口,暂时无法获取电费信息,将电费信息默认做随机数处理;
3.修改统计分析-能耗分析新页面峰谷能耗对比分析接口,暂时无法获取电费信息,将电费信息默认做随机数处理;
4.吉林首页井场用能分析模块开放井场用能分析双坐标轴接口,备用;
5.修改首页光伏实时监控接口,解决选择查看部分采油厂接口报错提示异常问题;
6.修改统计分析能耗分析新页面今日昨日同期电量信息统计接口,增加添加默认值逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent b0988ba6
...@@ -124,42 +124,34 @@ public class HomePageService { ...@@ -124,42 +124,34 @@ public class HomePageService {
List<GetBasePhotovoltaicPlantCloudOutput> plantList; List<GetBasePhotovoltaicPlantCloudOutput> plantList;
BigDecimal photovoltaicPower; BigDecimal photovoltaicPower;
BigDecimal storagePower; BigDecimal storagePower;
String ouId;
if (CharSequenceUtil.isBlank(stationId)) { if (CharSequenceUtil.isBlank(stationId)) {
ouId = context.getSession(PpsUserSession.class).getOuId(); stationId = context.getSession(PpsUserSession.class).getOuId();
} else {
ouId = stationId;
} }
List<String> ouIds = ServiceUtil.getOrgIdsByPath(context, ouId); List<String> ouIds = ServiceUtil.getOrgIdsByPath(context, stationId);
plantList = this.getPlantList(context, GetBasePhotovoltaicPlantCloudInput.builder() plantList = this.getPlantList(context, GetBasePhotovoltaicPlantCloudInput.builder()
.ouIds(ouIds) .ouIds(ouIds)
.build()); .build());
switch (ServiceUtil.getOilFieldCode(context)) { switch (ServiceUtil.getOilFieldCode(context)) {
case BusinessConstant.ENV_CQ: case BusinessConstant.ENV_CQ:
if (CharSequenceUtil.isBlank(stationId)) { switch (stationId) {
photovoltaicPower = new BigDecimal("3914.46"); case "bb1bff9d-7068-48c9-9be8-c80eb0d49152":
storagePower = new BigDecimal("852.96"); //第一采油场
} else { photovoltaicPower = new BigDecimal("226.12");
switch (stationId) { storagePower = new BigDecimal("852.96");
case "bb1bff9d-7068-48c9-9be8-c80eb0d49152": break;
//第一采油场 case "2c4c9d1c-ad55-4c14-b889-4dc33e3461e2":
photovoltaicPower = new BigDecimal("226.12"); //第二采油场
storagePower = new BigDecimal("852.96"); photovoltaicPower = new BigDecimal("2650.86");
break; storagePower = BigDecimal.ZERO;
case "2c4c9d1c-ad55-4c14-b889-4dc33e3461e2": break;
//第二采油场 case "0ffe6c33-ea02-476c-b28a-fd978184b2b3":
photovoltaicPower = new BigDecimal("2650.86"); //第五采油场
storagePower = BigDecimal.ZERO; photovoltaicPower = new BigDecimal("1178.28");
break; storagePower = BigDecimal.ZERO;
case "0ffe6c33-ea02-476c-b28a-fd978184b2b3": break;
//第五采油场 default:
photovoltaicPower = new BigDecimal("1178.28"); photovoltaicPower = new BigDecimal("3914.46");
storagePower = BigDecimal.ZERO; storagePower = new BigDecimal("852.96");
break;
default:
photovoltaicPower = new BigDecimal("3914.46");
storagePower = new BigDecimal("852.96");
}
} }
break; break;
case BusinessConstant.ENV_SY: case BusinessConstant.ENV_SY:
......
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