Commit bbf496e7 authored by ZWT's avatar ZWT

feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 164aefab
......@@ -35,6 +35,7 @@ import pps.cloud.system.service.data.sys_area.GetSysAreaOutput;
import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
import pps.core.common.constant.BusinessConstant;
import pps.core.common.session.PpsUserSession;
import pps.core.common.utils.BaseUtils;
import pps.core.prediction.entity.*;
import pps.core.prediction.enums.BusinessError;
......@@ -120,7 +121,7 @@ public class HomePageService {
@XApiGet
public XSingleResult<GetOverviewViewOutput> getOverview(XContext context, GetStationViewInput input) {
String stationId = input.getStationId();
List<GetBasePhotovoltaicPlantCloudOutput> plantList = this.getPlantList(context, stationId, null);
List<GetBasePhotovoltaicPlantCloudOutput> plantList;
BigDecimal photovoltaicPower;
BigDecimal storagePower;
switch (ServiceUtil.getOilFieldCode(context)) {
......@@ -150,8 +151,13 @@ public class HomePageService {
storagePower = new BigDecimal("852.96");
}
}
plantList = this.getPlantList(context, stationId, null);
break;
case BusinessConstant.ENV_SY:
if (CharSequenceUtil.isBlank(stationId)) {
stationId = context.getSession(PpsUserSession.class).getOuId();
}
plantList = this.getPlantList(context, stationId, null);
List<DynamicQueryBaseEnergyStorageDeviceOutput> storageList = this.getStorageList(context, stationId);
photovoltaicPower = plantList.stream()
.map(GetBasePhotovoltaicPlantCloudOutput::getTotalPower)
......@@ -161,6 +167,7 @@ public class HomePageService {
.reduce(BigDecimal.ZERO, BigDecimal::add);
break;
default:
plantList = Collections.emptyList();
photovoltaicPower = BigDecimal.ZERO;
storagePower = BigDecimal.ZERO;
}
......
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