Skip to content

G
gf_back
Commit c5eecce4 authored by ZWT's avatar ZWT
Browse files
Options

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

[1.修改井口日用电趋势统计表,增加谷电时段发电时长及谷电占比字段,同时在代码中添加对应字段并修改数据库mapper文件相关业务处理逻辑sql语句;
2.修改线路日用电趋势统计表,增加谷电时段发电时长及谷电占比字段,同时在代码中添加对应字段并修改数据库mapper文件相关业务处理逻辑sql语句;
3.修改井口/线路日用电趋势统计定时任务,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理,同时增加获取每日井口及线路谷电运行时长统计逻辑,完成功能冒烟测试;
4.修改首页总览接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
5.修改首页井场实时监控接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
6.修改首页光伏实时监控接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
7.修改首页井场效果评价接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
8.修改首页井场用能分析接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
9.修改首页线路详情接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
]
parent e6cb3ff1
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 20 deletions
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/HomePageService.java
View file @ c5eecce4
......@@ -24,7 +24,6 @@ import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowe
import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
import pps.cloud.base.service.data.config_oil_field.GetConfigOilFieldOutput;
import pps.cloud.space.service.IDailyElectricityTrendCloudService;
import pps.cloud.space.service.data.line_daily_electricity_trend.GetLineDailyElectricityTrendInput;
import pps.cloud.space.service.data.line_daily_electricity_trend.GetLineDailyElectricityTrendOutput;
......@@ -123,7 +122,7 @@ public class HomePageService {
List<GetBasePhotovoltaicPlantCloudOutput> plantList = this.getPlantList(context, stationId, null);
BigDecimal photovoltaicPower;
BigDecimal storagePower;
switch (this.getOilFieldCode(context)) {
switch (ServiceUtil.getOilFieldCode(context)) {
case BusinessConstant.ENV_CQ:
if (CharSequenceUtil.isBlank(stationId)) {
photovoltaicPower = new BigDecimal("3914.46");
......@@ -193,7 +192,7 @@ public class HomePageService {
BigDecimal cumulativeProduction = BigDecimal.ZERO;
BigDecimal powerGeneration = BigDecimal.ZERO;
BigDecimal powerConsumption = BigDecimal.ZERO;
String oilFieldCode = this.getOilFieldCode(context);
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
switch (oilFieldCode) {
case BusinessConstant.ENV_CQ:
//实时站
......@@ -285,7 +284,7 @@ public class HomePageService {
ThirdWellAvgActivePowerViewMapper mapper = context.getBean(ThirdWellAvgActivePowerViewMapper.class);
ThirdActivePowerViewMapper dailyUpdateMapper = context.getBean(ThirdActivePowerViewMapper.class);
//当前配置
String oilFieldCode = this.getOilFieldCode(context);
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
//用电功率
List<ThirdWellAvgActivePowerView> avgList = mapper.selectPowerConsumptionHour(ThirdWellAvgActivePowerView.builder()
.wellNumbers(wellList.stream()
......@@ -354,7 +353,7 @@ public class HomePageService {
//当前配置
List<ThirdWellAvgActivePowerView> avgList;
List<ThirdActivePowerView> powerList;
String oilFieldCode = this.getOilFieldCode(context);
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
//用电功率
avgList = mapper.selectPowerConsumptionHour(ThirdWellAvgActivePowerView.builder()
.wellNumbers(wellList.stream()
......@@ -517,7 +516,7 @@ public class HomePageService {
.stationId(plantId)
.saveDate(day)
.createDate(showTime)
.systemSource(this.getOilFieldCode(context))
.systemSource(ServiceUtil.getOilFieldCode(context))
.build()).stream()
.collect(Collectors.toMap(ThirdActivePowerDailyUpdateView::getHourNumber, ThirdActivePowerDailyUpdateView::getPhotovoltaicPower));
//封装结果
......@@ -571,7 +570,7 @@ public class HomePageService {
isOffGrid = true;
}
}
String oilFieldCode = this.getOilFieldCode(context);
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
ThirdDailyAccumulationUpdateMapper analysisMapper = context.getBean(ThirdDailyAccumulationUpdateMapper.class);
ThirdDailyAccumulationUpdateEnt analysisEnt = analysisMapper.selectOne(new QueryWrapper<ThirdDailyAccumulationUpdateEnt>()
.select("IFNULL( SUM( photovoltaic_power ), 0 ) AS photovoltaic_power",
......@@ -764,7 +763,7 @@ public class HomePageService {
.dailyElectricityConsumption(BigDecimal.ZERO)
.build());
}
String oilFieldCode = this.getOilFieldCode(context);
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
DateTime today = DateUtil.beginOfDay(DateUtil.date());
ThirdDailyAccumulationUpdateMapper mapper = context.getBean(ThirdDailyAccumulationUpdateMapper.class);
ThirdDailyAccumulationUpdateEnt dailyAccumulation = mapper.selectOne(new QueryWrapper<ThirdDailyAccumulationUpdateEnt>()
......@@ -1004,16 +1003,4 @@ public class HomePageService {
result.throwIfFail();
return result.getResult();
}
/**
* 获取油田代码
*
* @param context 上下文
* @return {@link String }
*/
private String getOilFieldCode(XContext context) {
//判断部署环境
GetConfigOilFieldOutput currentConfig = ServiceUtil.getCurrentConfig(context);
return ObjectUtil.defaultIfNull(currentConfig.getOilFieldCode(), BusinessConstant.DEFAULT_VALUE);
}
}
\ No newline at end of file
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/utils/ServiceUtil.java
View file @ c5eecce4
......@@ -271,6 +271,18 @@ public class ServiceUtil {
return currentConfig.getResult();
}
/**
* 获取油田代码
*
* @param context 上下文
* @return {@link String }
*/
public static String getOilFieldCode(XContext context) {
//判断部署环境
GetConfigOilFieldOutput currentConfig = getCurrentConfig(context);
return ObjectUtil.defaultIfNull(currentConfig.getOilFieldCode(), BusinessConstant.DEFAULT_VALUE);
}
/*----------------------------------- 私有方法 -----------------------------------*/
/**
......
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