Commit 164aefab authored by ZWT's avatar ZWT

feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ecebde5d
...@@ -740,12 +740,10 @@ public class ExcelService { ...@@ -740,12 +740,10 @@ public class ExcelService {
XSingleResult<GetConfigOilFieldOutput> currentConfig = service.getCurrentConfig(context); XSingleResult<GetConfigOilFieldOutput> currentConfig = service.getCurrentConfig(context);
currentConfig.throwIfFail(); currentConfig.throwIfFail();
String envValue = ObjectUtil.defaultIfNull(currentConfig.getResult().getOilFieldCode(), BusinessConstant.DEFAULT_VALUE); String envValue = ObjectUtil.defaultIfNull(currentConfig.getResult().getOilFieldCode(), BusinessConstant.DEFAULT_VALUE);
switch (envValue) { if (envValue.equals(BusinessConstant.ENV_SY)) {
case BusinessConstant.ENV_SY: provinceAndCityList = ServiceUtil.getProvinceAndCityList(context, "吉林");
provinceAndCityList = ServiceUtil.getProvinceAndCityList(context, "吉林"); } else {
break; provinceAndCityList = ServiceUtil.getProvinceAndCityList(context, "陕西", "甘肃");
default:
provinceAndCityList = ServiceUtil.getProvinceAndCityList(context, "陕西", "甘肃");
} }
return provinceAndCityList; return provinceAndCityList;
} }
......
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