Commit 2545324f authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.长庆演示首页功能开发,新增采油厂统计信息查询接口,添加线上接口并完成接口冒烟测试;
2.长庆演示首页功能开发,新增线路图查询接口,添加线上接口并完成接口冒烟测试;
3.长庆演示首页功能开发,新增线路详情查询接口,添加线上接口并完成接口冒烟测试;
4.对接第三方接口,完成获取井场日累计数据接口调用,创建数据表,同时生成对应代码,开发定时任务及对外接口,完成第三方数据接入及系统展示功能,添加线上接口文档并完成接口及定时任务冒烟测试;
5.对接第三方接口,完成获取第三方单井平均有功功率接口调用,创建数据表,同时生成对应代码,开发定时任务及对外接口,完成第三方数据接入及系统展示功能,添加线上接口文档并完成接口及定时任务冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 7609abb5
...@@ -321,12 +321,13 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -321,12 +321,13 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
List<ThirdWellAvgActivePowerView> dtoList = new ArrayList<>(outputs.size()); List<ThirdWellAvgActivePowerView> dtoList = new ArrayList<>(outputs.size());
LambdaQueryWrapper<ThirdWellAvgActivePowerEnt> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ThirdWellAvgActivePowerEnt> queryWrapper = new LambdaQueryWrapper<>();
for (GetThirdWellAvgActivePowerOutput o : outputs) { for (GetThirdWellAvgActivePowerOutput o : outputs) {
BigDecimal avgActivePower = Optional.ofNullable(o.getAvgActivePower()).orElse(BigDecimal.ZERO);
dtoList.add( dtoList.add(
ThirdWellAvgActivePowerView.builder() ThirdWellAvgActivePowerView.builder()
.saveDate(beginOfDay) .saveDate(beginOfDay)
.wellNumber(o.getWellNumber()) .wellNumber(o.getWellNumber())
.inputTime(o.getInputTime()) .inputTime(o.getInputTime())
.avgActivePower(o.getAvgActivePower()) .avgActivePower(avgActivePower)
.systemSource(ThirdPartyApiConstant.CQ_SOURCE) .systemSource(ThirdPartyApiConstant.CQ_SOURCE)
.saveDate(beginOfDay) .saveDate(beginOfDay)
.build() .build()
...@@ -334,7 +335,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -334,7 +335,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
//组装删除条件 //组装删除条件
queryWrapper.or(w -> w.eq(ThirdWellAvgActivePowerEnt::getWellNumber, o.getWellNumber()) queryWrapper.or(w -> w.eq(ThirdWellAvgActivePowerEnt::getWellNumber, o.getWellNumber())
.eq(ThirdWellAvgActivePowerEnt::getInputTime, o.getInputTime()) .eq(ThirdWellAvgActivePowerEnt::getInputTime, o.getInputTime())
.eq(ThirdWellAvgActivePowerEnt::getAvgActivePower, o.getAvgActivePower()) .eq(ThirdWellAvgActivePowerEnt::getAvgActivePower, avgActivePower)
.eq(ThirdWellAvgActivePowerEnt::getSystemSource, ThirdPartyApiConstant.CQ_SOURCE) .eq(ThirdWellAvgActivePowerEnt::getSystemSource, ThirdPartyApiConstant.CQ_SOURCE)
); );
} }
......
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