Commit 55086a71 authored by ZWT's avatar ZWT

feat[零碳项目]: 松原演示

[
1.修改日耗电日产液信息定时任务及井口生产情况表表结构,增加来源系统字段,同时修改代码批量插入逻辑;
2.修改日用电趋势计算定时任务,修改代码逻辑,增加区分来源系统逻辑;
3.修改能耗分析定时任务定时任务,修改代码逻辑,增加区分来源系统逻辑;
4.修改第三方有功功率定时任务,修改代码逻辑,增加区分来源系统逻辑;
5.修改第三方当日油井状态定时任务,修改代码逻辑,增加区分来源系统逻辑;
6.修改第三方井场日累计数据定时任务,修改代码逻辑,增加区分来源系统逻辑;
7.修改第三方光伏日发电量定时任务,修改代码逻辑,增加区分来源系统逻辑;
8.修改第三井平均有功功率作业定时任务,修改代码逻辑,增加区分来源系统逻辑;
9.修改日耗电日产液信息定时任务,修改代码逻辑,增加区分来源系统逻辑;
10.修改查15分钟电站实际功率接口,修改代码逻辑,增加区分来源系统逻辑;
]
parent 30c51a2b
...@@ -263,73 +263,6 @@ public class HomePageService { ...@@ -263,73 +263,6 @@ public class HomePageService {
.build()); .build());
} }
/**
* 井场用能分析
*
* @param context 上下文
* @param input 输入
* @return {@link XSingleResult }<{@link GetPowerAnalyseTrendOutput }>
*/
@XText("首页模块--井场用能分析")
@XApiGet
public XSingleResult<GetPowerAnalyseTrendOutput> getPowerAnalyseTrend(XContext context, GetStationViewInput input) {
String stationId = input.getStationId();
//查组织下所有井
List<DynamicQueryBaseWellheadOutput> wellList = this.getWellList(context, stationId);
//查组织下所有电站
List<GetBasePhotovoltaicPlantCloudOutput> plantList = this.getPlantList(context, stationId, null);
//查前七日用能分析
DateTime endTime = DateUtil.beginOfDay(DateUtil.date());
DateTime startTime = DateUtil.offsetDay(endTime, -7);
ThirdWellAvgActivePowerViewMapper mapper = context.getBean(ThirdWellAvgActivePowerViewMapper.class);
ThirdActivePowerViewMapper dailyUpdateMapper = context.getBean(ThirdActivePowerViewMapper.class);
//当前配置
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
//用电功率
List<ThirdWellAvgActivePowerView> avgList = mapper.selectPowerConsumptionHour(ThirdWellAvgActivePowerView.builder()
.wellNumbers(wellList.stream()
.map(DynamicQueryBaseWellheadOutput::getWellNumber)
.collect(Collectors.toList()))
.startTime(startTime)
.endTime(endTime)
.systemSource(oilFieldCode)
.build());
//发电功率
List<ThirdActivePowerView> powerList = dailyUpdateMapper.selectGeneratedPowerHour(ThirdActivePowerView.builder()
.stationNames(plantList.stream()
.map(GetBasePhotovoltaicPlantCloudOutput::getStationName)
.collect(Collectors.toList()))
.startTime(startTime)
.endTime(endTime)
.systemSource(oilFieldCode)
.build());
//封装
GetPowerAnalyseTrendOutput output = new GetPowerAnalyseTrendOutput();
if (CollUtil.isNotEmpty(avgList)) {
List<GetPowerConsumptionTrendOutput> consumptionList = new ArrayList<>(avgList.size());
for (ThirdWellAvgActivePowerView view : avgList) {
consumptionList.add(
new GetPowerConsumptionTrendOutput(DateUtil.format(view.getInputTime(), BusinessConstant.DATE_FORMAT_HOUR), view.getAvgActivePower())
);
}
output.setConsumptionList(consumptionList);
} else {
output.setConsumptionList(Collections.emptyList());
}
if (CollUtil.isNotEmpty(powerList)) {
List<GetPowerGenerationTrendOutput> generationList = new ArrayList<>(powerList.size());
for (ThirdActivePowerView view : powerList) {
generationList.add(
new GetPowerGenerationTrendOutput(DateUtil.format(view.getCreateDate(), BusinessConstant.DATE_FORMAT_HOUR), view.getPhotovoltaicPower())
);
}
output.setGenerationList(generationList);
} else {
output.setGenerationList(Collections.emptyList());
}
return XSingleResult.success(output);
}
/** /**
* 首页模块--用能分析 * 首页模块--用能分析
* *
......
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