Commit a8f7605b authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.开发中间库表结构及数据导出功能,检查中间库表结构是否有变动,同时获取最新数据,验证数据是否更新;
2.创建场站每日信息统计记录表,新建场站日信息数据采集汇总定时任务,整理汇总场站纬度每日数据,完成功能验证;
3.针对吉林提供的统计数据,对吉林首页部分功能修改;
4.针对中间库每日井口数据统计表结构变动,修改井口日统计定时任务数据处理逻辑,完成功能验证;
5.修改日发电量统计定时任务,排查数据丢失问题,完成功能验证;
6.修改场站每日信息汇总统计定时任务,增加统计每日光伏发电量逻辑,修改表结构及数据结构和业务处理逻辑,完成功能验证;
7.修改吉林首页线路详情接口,区分部署环境,增加吉林个性化数据处理逻辑,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 61adc302
...@@ -787,9 +787,11 @@ public class HomePageService { ...@@ -787,9 +787,11 @@ public class HomePageService {
List<DynamicQueryBasePowerLineWellheadViewOutput> wellheadList = ServiceUtil.getPowerLineWellheadList(context, DynamicQueryBasePowerLineWellheadInput.builder() List<DynamicQueryBasePowerLineWellheadViewOutput> wellheadList = ServiceUtil.getPowerLineWellheadList(context, DynamicQueryBasePowerLineWellheadInput.builder()
.lineId(input.getLineId()) .lineId(input.getLineId())
.build()); .build());
String lineName = null;
if (CollUtil.isNotEmpty(wellheadList)) { if (CollUtil.isNotEmpty(wellheadList)) {
for (DynamicQueryBasePowerLineWellheadViewOutput well : wellheadList) { for (DynamicQueryBasePowerLineWellheadViewOutput well : wellheadList) {
operatingLoad = operatingLoad.add(Optional.ofNullable(well.getRatedPower()).orElse(BigDecimal.ZERO)); operatingLoad = operatingLoad.add(Optional.ofNullable(well.getRatedPower()).orElse(BigDecimal.ZERO));
lineName = well.getLineName();
} }
} }
//查线路关联的电站 //查线路关联的电站
...@@ -809,10 +811,14 @@ public class HomePageService { ...@@ -809,10 +811,14 @@ public class HomePageService {
.dailyElectricityConsumption(BigDecimal.ZERO) .dailyElectricityConsumption(BigDecimal.ZERO)
.build()); .build());
} }
ThirdDailyAccumulationUpdateEnt dailyAccumulation = null;
String oilFieldCode = ServiceUtil.getOilFieldCode(context); String oilFieldCode = ServiceUtil.getOilFieldCode(context);
switch (oilFieldCode) {
case BusinessConstant.ENV_CQ:
//实时
DateTime today = DateUtil.beginOfDay(DateUtil.date()); DateTime today = DateUtil.beginOfDay(DateUtil.date());
ThirdDailyAccumulationUpdateMapper mapper = context.getBean(ThirdDailyAccumulationUpdateMapper.class); ThirdDailyAccumulationUpdateMapper mapper = context.getBean(ThirdDailyAccumulationUpdateMapper.class);
ThirdDailyAccumulationUpdateEnt dailyAccumulation = mapper.selectOne(new QueryWrapper<ThirdDailyAccumulationUpdateEnt>() dailyAccumulation = mapper.selectOne(new QueryWrapper<ThirdDailyAccumulationUpdateEnt>()
.select("IFNULL( AVG( photovoltaic_power ), 0 ) AS photovoltaic_power", .select("IFNULL( AVG( photovoltaic_power ), 0 ) AS photovoltaic_power",
"IFNULL( AVG( daily_electricity_consumption ), 0 ) AS daily_electricity_consumption", "IFNULL( AVG( daily_electricity_consumption ), 0 ) AS daily_electricity_consumption",
"IFNULL( AVG( daily_liquid_production ), 0 ) AS daily_liquid_production", "IFNULL( AVG( daily_liquid_production ), 0 ) AS daily_liquid_production",
...@@ -825,6 +831,26 @@ public class HomePageService { ...@@ -825,6 +831,26 @@ public class HomePageService {
.apply("DATE( create_date ) = {0}", today) .apply("DATE( create_date ) = {0}", today)
.groupBy(ThirdDailyAccumulationUpdateEnt::getStationName) .groupBy(ThirdDailyAccumulationUpdateEnt::getStationName)
); );
break;
case BusinessConstant.ENV_SY:
if (CharSequenceUtil.isNotBlank(lineName)) {
//昨日
DateTime yesterday = DateUtil.beginOfDay(DateUtil.yesterday());
StationDailyProductionSituationMapper dailyMapper = context.getBean(StationDailyProductionSituationMapper.class);
StationDailyProductionSituationEnt dailyEnt = dailyMapper.selectOne(new LambdaQueryWrapper<StationDailyProductionSituationEnt>()
.eq(StationDailyProductionSituationEnt::getStationName, lineName)
.eq(StationDailyProductionSituationEnt::getDataDate, yesterday)
);
if (ObjectUtil.isNotNull(dailyEnt)) {
dailyAccumulation = new ThirdDailyAccumulationUpdateEnt();
dailyAccumulation.setPhotovoltaicPower(dailyEnt.getPhotovoltaicPower());
dailyAccumulation.setDailyElectricityConsumption(dailyEnt.getDailyElectricityConsumption());
dailyAccumulation.setDailyLiquidProduction(dailyEnt.getDailyLiquidProduction());
}
}
break;
default:
}
BigDecimal cumulativeProduction; BigDecimal cumulativeProduction;
BigDecimal powerGeneration; BigDecimal powerGeneration;
BigDecimal dailyElectricityConsumption; BigDecimal dailyElectricityConsumption;
......
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