Commit ce6c0d9c authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.添加easy excel配置,增加转换器,增加全局excel导出样式,增加场站下拉选解析器;
2.开发光伏电站模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
3.间开制度管理模块新增设为基础制度开关接口,添加线上接口文档并完成接口冒烟测试;
4.开发井口配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
5.开发第三方有功功率历史数据导入接口,增加模板配置类,添加线上接口文档并完成接口冒烟测试;
6.开发给长庆使用的获取第三方认证token接口,验证获取token后是否能正常跳转指定页面,创建长庆用演示用户及角色;
7.开发柴发设备配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
8.开发储能设备配置模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent baa68bd5
...@@ -25,9 +25,9 @@ import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput; ...@@ -25,9 +25,9 @@ import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput; import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
import pps.cloud.system.service.SysOrganizationCloudService; import pps.cloud.system.service.SysOrganizationCloudService;
import pps.cloud.system.service.SystemAreaService; import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
import pps.cloud.system.service.data.sys_area.GetSysAreaInput; import pps.cloud.system.service.data.sys_area.GetSysAreaInput;
import pps.cloud.system.service.data.sys_area.GetSysAreaOutput; 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.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
import pps.core.common.constant.BusinessConstant; import pps.core.common.constant.BusinessConstant;
import pps.core.prediction.constant.ThirdPartyApiConstant; import pps.core.prediction.constant.ThirdPartyApiConstant;
...@@ -185,9 +185,9 @@ public class HomePageService { ...@@ -185,9 +185,9 @@ public class HomePageService {
.collect(Collectors.toSet()); .collect(Collectors.toSet());
for (GetCumulativePowerGenerationOutput station : stationList) { for (GetCumulativePowerGenerationOutput station : stationList) {
if (set.contains(station.getStationName())) { if (set.contains(station.getStationName())) {
cumulativeProduction = cumulativeProduction.add(station.getDailyLiquidProduction()); cumulativeProduction = cumulativeProduction.add(Optional.ofNullable(station.getDailyLiquidProduction()).orElse(BigDecimal.ZERO));
powerGeneration = powerGeneration.add(station.getPhotovoltaicPower()); powerGeneration = powerGeneration.add(Optional.ofNullable(station.getPhotovoltaicPower()).orElse(BigDecimal.ZERO));
powerConsumption = powerConsumption.add(station.getDailyElectricityConsumption()); powerConsumption = powerConsumption.add(Optional.ofNullable(station.getDailyElectricityConsumption()).orElse(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