Commit 2c27e58e authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 5d7741e4
...@@ -222,13 +222,13 @@ public class HomePageService { ...@@ -222,13 +222,13 @@ public class HomePageService {
//用电功率 //用电功率
ThirdWellAvgActivePowerMapper mapper = context.getBean(ThirdWellAvgActivePowerMapper.class); ThirdWellAvgActivePowerMapper mapper = context.getBean(ThirdWellAvgActivePowerMapper.class);
Map<Date, BigDecimal> avgMap = mapper.selectList(new QueryWrapper<ThirdWellAvgActivePowerEnt>() Map<Date, BigDecimal> avgMap = mapper.selectList(new QueryWrapper<ThirdWellAvgActivePowerEnt>()
.select("IFNULL( AVG( avg_active_power ), 0 ) AS avg_active_power", "DATE( input_time ) AS input_time") .select("IFNULL( AVG( avg_active_power ), 0 ) AS avg_active_power", "DATE_FORMAT( input_time, '%Y-%m-%d %H:00:00' ) AS input_time")
.lambda() .lambda()
.in(ThirdWellAvgActivePowerEnt::getWellNumber, wellList.stream() .in(ThirdWellAvgActivePowerEnt::getWellNumber, wellList.stream()
.map(DynamicQueryBaseWellheadOutput::getWellNumber) .map(DynamicQueryBaseWellheadOutput::getWellNumber)
.collect(Collectors.toList())) .collect(Collectors.toList()))
.between(ThirdWellAvgActivePowerEnt::getInputTime, startTime, endTime) .between(ThirdWellAvgActivePowerEnt::getInputTime, startTime, endTime)
.last("GROUP BY DATE( input_time )") .last("GROUP BY DATE_FORMAT( input_time, '%Y-%m-%d %H:00:00' )")
).stream() ).stream()
.collect(Collectors.toMap(ThirdWellAvgActivePowerEnt::getInputTime, ThirdWellAvgActivePowerEnt::getAvgActivePower)); .collect(Collectors.toMap(ThirdWellAvgActivePowerEnt::getInputTime, ThirdWellAvgActivePowerEnt::getAvgActivePower));
//查组织下所有电站 //查组织下所有电站
...@@ -236,18 +236,18 @@ public class HomePageService { ...@@ -236,18 +236,18 @@ public class HomePageService {
//发电功率 //发电功率
ThirdActivePowerMapper dailyUpdateMapper = context.getBean(ThirdActivePowerMapper.class); ThirdActivePowerMapper dailyUpdateMapper = context.getBean(ThirdActivePowerMapper.class);
Map<Date, BigDecimal> powerMap = dailyUpdateMapper.selectList(new QueryWrapper<ThirdActivePowerEnt>() Map<Date, BigDecimal> powerMap = dailyUpdateMapper.selectList(new QueryWrapper<ThirdActivePowerEnt>()
.select("IFNULL( AVG( photovoltaic_power ), 0 ) AS photovoltaic_power", "DATE( create_date ) AS create_date") .select("IFNULL( AVG( photovoltaic_power ), 0 ) AS photovoltaic_power", "DATE_FORMAT( create_date, '%Y-%m-%d %H:00:00' ) AS create_date")
.lambda() .lambda()
.in(ThirdActivePowerEnt::getStationName, plantList.stream() .in(ThirdActivePowerEnt::getStationName, plantList.stream()
.map(GetBasePhotovoltaicPlantCloudOutput::getStationName) .map(GetBasePhotovoltaicPlantCloudOutput::getStationName)
.collect(Collectors.toList())) .collect(Collectors.toList()))
.between(ThirdActivePowerEnt::getCreateDate, startTime, endTime) .between(ThirdActivePowerEnt::getCreateDate, startTime, endTime)
.last("GROUP BY DATE( create_date )") .last("GROUP BY DATE_FORMAT( create_date, '%Y-%m-%d %H:00:00' )")
).stream() ).stream()
.collect(Collectors.toMap(ThirdActivePowerEnt::getCreateDate, ThirdActivePowerEnt::getPhotovoltaicPower)); .collect(Collectors.toMap(ThirdActivePowerEnt::getCreateDate, ThirdActivePowerEnt::getPhotovoltaicPower));
//封装结果 //封装结果
List<GetPowerAnalyseOutput> outputs = new ArrayList<>(7); List<GetPowerAnalyseOutput> outputs = new ArrayList<>(7);
List<DateTime> rangeToList = DateUtil.rangeToList(startTime, endTime, DateField.DAY_OF_YEAR); List<DateTime> rangeToList = DateUtil.rangeToList(startTime, endTime, DateField.HOUR_OF_DAY);
BigDecimal powerGeneration; BigDecimal powerGeneration;
BigDecimal powerConsumption; BigDecimal powerConsumption;
for (DateTime dateTime : rangeToList) { for (DateTime dateTime : rangeToList) {
...@@ -262,7 +262,7 @@ public class HomePageService { ...@@ -262,7 +262,7 @@ public class HomePageService {
powerGeneration = BigDecimal.ZERO; powerGeneration = BigDecimal.ZERO;
} }
outputs.add(GetPowerAnalyseOutput.builder() outputs.add(GetPowerAnalyseOutput.builder()
.dateFormat(dateTime.toString(BusinessConstant.DATE_FORMAT_DAY)) .dateFormat(dateTime.toString())
.powerGeneration(powerGeneration) .powerGeneration(powerGeneration)
.powerConsumption(powerConsumption) .powerConsumption(powerConsumption)
.build()); .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