Commit 1ed6d5de authored by ZWT's avatar ZWT

feat(零碳): 长庆演示系统新增功能

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 06a6c14a
......@@ -145,15 +145,18 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
}
DateTime date = DateUtil.date();
//先删后增
BigDecimal cumulativeProduction;
List<ThirdCurrentWellConditionView> dtoList = new ArrayList<>(outputs.size());
for (GetThirdCurrentWellConditionViewOutput o : outputs) {
cumulativeProduction = Optional.ofNullable(o.getCumulativeProduction()).orElse(BigDecimal.ZERO);
cumulativeProduction = cumulativeProduction.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : cumulativeProduction;
dtoList.add(
ThirdCurrentWellConditionView.builder()
.systemSource(ThirdPartyApiConstant.CQ_SOURCE)
.wellNumber(o.getWellNumber())
.nextTime(o.getNextTime())
.wellStatus(Optional.ofNullable(o.getWellStatus()).orElse("停井"))
.cumulativeProduction(Optional.ofNullable(o.getCumulativeProduction()).orElse(BigDecimal.ZERO))
.cumulativeProduction(cumulativeProduction)
.runningTime(o.getRunningTime())
.updateTime(date)
.build()
......@@ -185,14 +188,16 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
if (CollUtil.isEmpty(outputs)) {
return XServiceResult.OK;
}
BigDecimal photovoltaicPower;
List<ThirdPhotovoltaicPowerView> dtoList = new ArrayList<>(outputs.size());
for (GetThirdPhotovoltaicPowerViewOutput output : outputs) {
photovoltaicPower = Optional.ofNullable(output.getPhotovoltaicPower()).orElse(BigDecimal.ZERO);
photovoltaicPower = photovoltaicPower.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : photovoltaicPower;
dtoList.add(
ThirdPhotovoltaicPowerView.builder()
.stationName(output.getStationName())
.createDate(output.getCreateDate())
.photovoltaicPower(Optional.ofNullable(output.getPhotovoltaicPower())
.orElse(BigDecimal.ZERO))
.photovoltaicPower(photovoltaicPower)
.systemSource(ThirdPartyApiConstant.CQ_SOURCE)
.build()
);
......
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