Commit 9ebda1ac authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.修改系统首页大屏总览接口,增加区分组织机构逻辑,完成接口冒烟测试;
2.修改系统首页获取井场列表接口,增加区分组织机构逻辑,完成接口冒烟测试;
3.修改系统首页井场功能下钻后提示报错问题,修改用电功率数据获取逻辑,修复报错问题;
4.修改输电线路分页列表查询接口,增加查询条件,在查询父线路列表时只查询10千伏线路,修改线上接口文档同时完成接口冒烟测试;
5.修改系统首页井场实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
6.修改系统首页用能分析接口,增加区分组织机构逻辑,完成接口冒烟测试;
7.修改系统首页井场用能分析(双坐标轴)接口,增加区分组织机构逻辑,完成接口冒烟测试;
8.修改系统首页累积用电接口,增加区分组织机构逻辑,完成接口冒烟测试;
9.修改系统首页光伏实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
10.修改系统首页井场效果评价接口,增加区分组织机构逻辑,完成接口冒烟测试;
11.修改系统首页先导实验井间开制度接口,增加区分组织机构逻辑,完成接口冒烟测试;
12.修改极短期间开优化模块井口生产情况油井状态接口,增加区分组织机构逻辑,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent a4506ffb
...@@ -217,6 +217,8 @@ public class BaseUtils { ...@@ -217,6 +217,8 @@ public class BaseUtils {
/** /**
* 计算率 * 计算率
* 示例:
* 消纳率:就地消纳量/累计用电*100%
* *
* @param one 一 * @param one 一
* @param two 二 * @param two 二
...@@ -232,4 +234,24 @@ public class BaseUtils { ...@@ -232,4 +234,24 @@ public class BaseUtils {
} }
return rate; return rate;
} }
/**
* 获取环比
* (本期-上期) /上期*100%
*
* @param currentPeriod 本期
* @param lastPeriod 上期
* @return {@link BigDecimal}
*/
public static BigDecimal getCycleRatio(BigDecimal currentPeriod, BigDecimal lastPeriod) {
BigDecimal cycleRatio;
if (lastPeriod.compareTo(BigDecimal.ZERO) > 0) {
cycleRatio = currentPeriod.subtract(lastPeriod)
.multiply(BusinessConstant.BIG_DECIMAL_100)
.divide(lastPeriod, 2, RoundingMode.HALF_UP);
} else {
cycleRatio = BigDecimal.ZERO;
}
return cycleRatio;
}
} }
\ No newline at end of file
...@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; ...@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import pps.cloud.base.service.IBaseWellheadCloudService;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput; import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput; import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
import pps.cloud.prediction.service.IPlantPredictedPowerCloudService; import pps.cloud.prediction.service.IPlantPredictedPowerCloudService;
...@@ -197,12 +196,9 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower ...@@ -197,12 +196,9 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
List<String> collect = list.stream() List<String> collect = list.stream()
.map(WellheadDailyProductionSituationJob::getWellNumber) .map(WellheadDailyProductionSituationJob::getWellNumber)
.collect(Collectors.toList()); .collect(Collectors.toList());
IBaseWellheadCloudService bean = context.getBean(IBaseWellheadCloudService.class); Map<String, String> map = ServiceUtil.getBaseWellheadList(context, DynamicQueryBaseWellheadInput.builder()
XListResult<DynamicQueryBaseWellheadOutput> result = bean.queryBaseWellheadListByParam(context, DynamicQueryBaseWellheadInput.builder()
.wellNumbers(collect) .wellNumbers(collect)
.build()); .build()).stream()
result.throwIfFail();
Map<String, String> map = result.getResult().stream()
.collect(Collectors.toMap(DynamicQueryBaseWellheadOutput::getWellNumber, DynamicQueryBaseWellheadOutput::getId)); .collect(Collectors.toMap(DynamicQueryBaseWellheadOutput::getWellNumber, DynamicQueryBaseWellheadOutput::getId));
List<WellheadDailyProductionSituationView> dtoList = new ArrayList<>(list.size()); List<WellheadDailyProductionSituationView> dtoList = new ArrayList<>(list.size());
for (WellheadDailyProductionSituationJob wellhead : list) { for (WellheadDailyProductionSituationJob wellhead : list) {
......
...@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateField; ...@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import pps.cloud.base.service.BasePhotovoltaicPlantCloudService;
import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudInput; import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudInput;
import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput; import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput;
import pps.cloud.prediction.service.PlantPredictedPowerLongTermDataCloudService; import pps.cloud.prediction.service.PlantPredictedPowerLongTermDataCloudService;
...@@ -13,11 +12,11 @@ import pps.core.prediction.entity.PlantPredictedPowerLongTermDataEnt; ...@@ -13,11 +12,11 @@ import pps.core.prediction.entity.PlantPredictedPowerLongTermDataEnt;
import pps.core.prediction.mapper.PlantPowerDataMapper; import pps.core.prediction.mapper.PlantPowerDataMapper;
import pps.core.prediction.mapper.PlantPredictedPowerLongTermDataMapper; import pps.core.prediction.mapper.PlantPredictedPowerLongTermDataMapper;
import pps.core.prediction.mapper.PlantPredictedPowerLongTermDataViewMapper; import pps.core.prediction.mapper.PlantPredictedPowerLongTermDataViewMapper;
import pps.core.prediction.utils.ServiceUtil;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.base.util.XCopyUtils; import xstartup.base.util.XCopyUtils;
import xstartup.data.XListResult;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
import xstartup.feature.api.annotation.XApiGet; import xstartup.feature.api.annotation.XApiGet;
...@@ -42,12 +41,7 @@ public class PlantPredictedPowerLongTermDataCloudServiceImpl implements PlantPre ...@@ -42,12 +41,7 @@ public class PlantPredictedPowerLongTermDataCloudServiceImpl implements PlantPre
@XText("定时运行预测长期数据") @XText("定时运行预测长期数据")
public XServiceResult runPlantPredictedPowerLongTermData(XContext context) { public XServiceResult runPlantPredictedPowerLongTermData(XContext context) {
//获取所有的电站 //获取所有的电站
BasePhotovoltaicPlantCloudService cloudService = context.getBean(BasePhotovoltaicPlantCloudService.class); List<GetBasePhotovoltaicPlantCloudOutput> list = ServiceUtil.getBasePhotovoltaicPlantList(context, new GetBasePhotovoltaicPlantCloudInput());
XListResult<GetBasePhotovoltaicPlantCloudOutput> result = cloudService.getBasePhotovoltaicPlantList(context, new GetBasePhotovoltaicPlantCloudInput());
if (!result.isSuccess()) {
return XServiceResult.error(500, "未查询到电站数据");
}
List<GetBasePhotovoltaicPlantCloudOutput> list = result.getResult();
PlantPowerDataMapper powerDataMapper = context.getBean(PlantPowerDataMapper.class); PlantPowerDataMapper powerDataMapper = context.getBean(PlantPowerDataMapper.class);
Date currentDate = new Date(); Date currentDate = new Date();
for (GetBasePhotovoltaicPlantCloudOutput output : list) { for (GetBasePhotovoltaicPlantCloudOutput output : list) {
......
...@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateTime; ...@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import pps.cloud.base.service.BasePhotovoltaicPlantCloudService;
import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudInput; import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudInput;
import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput; import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput;
import pps.core.prediction.entity.PlantPredictedPowerMidTermEnt; import pps.core.prediction.entity.PlantPredictedPowerMidTermEnt;
...@@ -15,6 +14,7 @@ import pps.core.prediction.mapper.PlantPredictedPowerShortTermMapper; ...@@ -15,6 +14,7 @@ import pps.core.prediction.mapper.PlantPredictedPowerShortTermMapper;
import pps.core.prediction.service.data.predicted_api.PredictedApiInput; import pps.core.prediction.service.data.predicted_api.PredictedApiInput;
import pps.core.prediction.service.data.predicted_api.PredictedApiOutput; import pps.core.prediction.service.data.predicted_api.PredictedApiOutput;
import pps.core.prediction.service.data.predicted_api.PredictedApiPredictOutput; import pps.core.prediction.service.data.predicted_api.PredictedApiPredictOutput;
import pps.core.prediction.utils.ServiceUtil;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
...@@ -171,11 +171,8 @@ public class PredictedApiService { ...@@ -171,11 +171,8 @@ public class PredictedApiService {
* @return {@link List}<{@link GetBasePhotovoltaicPlantCloudOutput}> * @return {@link List}<{@link GetBasePhotovoltaicPlantCloudOutput}>
*/ */
private List<GetBasePhotovoltaicPlantCloudOutput> getPhotovoltaicPlant(XContext context, String stationName) { private List<GetBasePhotovoltaicPlantCloudOutput> getPhotovoltaicPlant(XContext context, String stationName) {
BasePhotovoltaicPlantCloudService bean = context.getBean(BasePhotovoltaicPlantCloudService.class); return ServiceUtil.getBasePhotovoltaicPlantList(context, GetBasePhotovoltaicPlantCloudInput.builder()
XListResult<GetBasePhotovoltaicPlantCloudOutput> result = bean.getBasePhotovoltaicPlantList(context, GetBasePhotovoltaicPlantCloudInput.builder()
.stationName(stationName) .stationName(stationName)
.build()); .build());
result.throwIfFail();
return result.getResult();
} }
} }
...@@ -3,7 +3,6 @@ package pps.core.prediction.service; ...@@ -3,7 +3,6 @@ package pps.core.prediction.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import pps.cloud.base.service.IBasePowerLineCloudService;
import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput; import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput; import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
import pps.core.common.constant.BusinessConstant; import pps.core.common.constant.BusinessConstant;
...@@ -46,13 +45,9 @@ public class ThirdCurrentWellConditionService { ...@@ -46,13 +45,9 @@ public class ThirdCurrentWellConditionService {
@XText("井口生产情况--油井状态") @XText("井口生产情况--油井状态")
@XApiPost @XApiPost
public XListResult<QueryThirdCurrentWellConditionOutput> queryWellRealPvData(XContext context, QueryThirdCurrentWellConditionInput input) { public XListResult<QueryThirdCurrentWellConditionOutput> queryWellRealPvData(XContext context, QueryThirdCurrentWellConditionInput input) {
IBasePowerLineCloudService service = context.getBean(IBasePowerLineCloudService.class); List<DynamicQueryBasePowerLineWellheadViewOutput> list = ServiceUtil.getPowerLineWellheadList(context, DynamicQueryBasePowerLineWellheadInput.builder()
XListResult<DynamicQueryBasePowerLineWellheadViewOutput> result = service.getPowerLineWellheadList(context, DynamicQueryBasePowerLineWellheadInput.builder()
.lineId(input.getLineId()) .lineId(input.getLineId())
.build() .build());
);
result.throwIfFail();
List<DynamicQueryBasePowerLineWellheadViewOutput> list = result.getResult();
if (CollUtil.isEmpty(list)) { if (CollUtil.isEmpty(list)) {
return XListResult.success(Collections.emptyList()); return XListResult.success(Collections.emptyList());
} }
......
...@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateTime; ...@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import pps.cloud.base.service.BasePhotovoltaicPlantCloudService;
import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudInput; import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudInput;
import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput; import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput;
import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput; import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
...@@ -24,7 +23,6 @@ import pps.core.prediction.utils.ServiceUtil; ...@@ -24,7 +23,6 @@ import pps.core.prediction.utils.ServiceUtil;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.data.XListResult;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
import xstartup.helper.XTransactionHelper; import xstartup.helper.XTransactionHelper;
...@@ -226,9 +224,11 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -226,9 +224,11 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
return XServiceResult.OK; return XServiceResult.OK;
} }
//通过场站名查线路ID //通过场站名查线路ID
Map<String, String> lineMap = this.getBasePowerLineListByNames(context, powerList.stream() Map<String, String> lineMap = ServiceUtil.getPowerLineList(context, DynamicQueryBasePowerLineInput.builder()
.lineNames(powerList.stream()
.map(ThirdPhotovoltaicPowerEnt::getStationName) .map(ThirdPhotovoltaicPowerEnt::getStationName)
.collect(Collectors.toList())).stream() .collect(Collectors.toList()))
.build()).stream()
.collect(Collectors.toMap(DynamicQueryBasePowerLineOutput::getLineName, DynamicQueryBasePowerLineOutput::getId)); .collect(Collectors.toMap(DynamicQueryBasePowerLineOutput::getLineName, DynamicQueryBasePowerLineOutput::getId));
//查昨日井口耗电量 //查昨日井口耗电量
WellheadDailyProductionSituationViewMapper mapper = context.getBean(WellheadDailyProductionSituationViewMapper.class); WellheadDailyProductionSituationViewMapper mapper = context.getBean(WellheadDailyProductionSituationViewMapper.class);
...@@ -503,22 +503,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -503,22 +503,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
* @return {@link Map}<{@link String}, {@link String}> * @return {@link Map}<{@link String}, {@link String}>
*/ */
private Map<String, String> getPhotovoltaicPlantMap(XContext context) { private Map<String, String> getPhotovoltaicPlantMap(XContext context) {
XListResult<GetBasePhotovoltaicPlantCloudOutput> result = context.getBean(BasePhotovoltaicPlantCloudService.class) return ServiceUtil.getBasePhotovoltaicPlantList(context, new GetBasePhotovoltaicPlantCloudInput()).stream()
.getBasePhotovoltaicPlantList(context, new GetBasePhotovoltaicPlantCloudInput());
return result.getResult().stream()
.collect(Collectors.toMap(GetBasePhotovoltaicPlantCloudOutput::getStationName, GetBasePhotovoltaicPlantCloudOutput::getId)); .collect(Collectors.toMap(GetBasePhotovoltaicPlantCloudOutput::getStationName, GetBasePhotovoltaicPlantCloudOutput::getId));
} }
/**
* 查询线路列表通过线路名称
*
* @param context 上下文
* @param lineNames ou-id列表
* @return {@link List}<{@link DynamicQueryBasePowerLineOutput}>
*/
private List<DynamicQueryBasePowerLineOutput> getBasePowerLineListByNames(XContext context, List<String> lineNames) {
return ServiceUtil.getPowerLineList(context, DynamicQueryBasePowerLineInput.builder()
.lineNames(lineNames)
.build());
}
} }
\ No newline at end of file
...@@ -2,8 +2,6 @@ package pps.core.prediction.service; ...@@ -2,8 +2,6 @@ package pps.core.prediction.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import pps.cloud.base.service.IBasePowerLineCloudService;
import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput; import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput; import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput; import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadViewOutput;
...@@ -18,7 +16,6 @@ import pps.core.prediction.utils.ServiceUtil; ...@@ -18,7 +16,6 @@ import pps.core.prediction.utils.ServiceUtil;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.data.XListResult;
import xstartup.data.XSingleResult; import xstartup.data.XSingleResult;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
...@@ -48,7 +45,7 @@ public class ThirdPhotovoltaicPowerService { ...@@ -48,7 +45,7 @@ public class ThirdPhotovoltaicPowerService {
@XApiPost @XApiPost
public XSingleResult<GetThirdPhotovoltaicPowerOutput> getPhotovoltaicPowerOverview(XContext context, GetThirdPhotovoltaicPowerInput input) { public XSingleResult<GetThirdPhotovoltaicPowerOutput> getPhotovoltaicPowerOverview(XContext context, GetThirdPhotovoltaicPowerInput input) {
GetThirdPhotovoltaicPowerOutput output = new GetThirdPhotovoltaicPowerOutput(); GetThirdPhotovoltaicPowerOutput output = new GetThirdPhotovoltaicPowerOutput();
List<DynamicQueryBasePowerLineOutput> lineList = this.getBasePowerLineListByOuIdList(context, ServiceUtil.getOrgIdsByPath(context, input.getOuId())); List<DynamicQueryBasePowerLineOutput> lineList = ServiceUtil.getBasePowerLineListByOuIdList(context, ServiceUtil.getOrgIdsByPath(context, input.getOuId()));
if (CollUtil.isEmpty(lineList)) { if (CollUtil.isEmpty(lineList)) {
output.setPowerGeneration(BigDecimal.ZERO); output.setPowerGeneration(BigDecimal.ZERO);
output.setPowerConsumption(BigDecimal.ZERO); output.setPowerConsumption(BigDecimal.ZERO);
...@@ -63,7 +60,9 @@ public class ThirdPhotovoltaicPowerService { ...@@ -63,7 +60,9 @@ public class ThirdPhotovoltaicPowerService {
input.getBetweenDate(); input.getBetweenDate();
BigDecimal powerConsumption; BigDecimal powerConsumption;
//查井口 //查井口
List<DynamicQueryBasePowerLineWellheadViewOutput> wellheadList = this.getBaseWellheadListByLineIdList(context, lineIdList); List<DynamicQueryBasePowerLineWellheadViewOutput> wellheadList = ServiceUtil.getPowerLineWellheadList(context, DynamicQueryBasePowerLineWellheadInput.builder()
.lineIds(lineIdList)
.build());
if (CollUtil.isEmpty(lineList)) { if (CollUtil.isEmpty(lineList)) {
powerConsumption = BigDecimal.ONE; powerConsumption = BigDecimal.ONE;
} else { } else {
...@@ -93,38 +92,4 @@ public class ThirdPhotovoltaicPowerService { ...@@ -93,38 +92,4 @@ public class ThirdPhotovoltaicPowerService {
} }
return XSingleResult.success(output); return XSingleResult.success(output);
} }
/*-----------------------------------private-----------------------------------*/
/**
* 查询组织列表下所有线路
*
* @param context 上下文
* @param ouIdList ou-id列表
* @return {@link List}<{@link DynamicQueryBasePowerLineOutput}>
*/
private List<DynamicQueryBasePowerLineOutput> getBasePowerLineListByOuIdList(XContext context, List<String> ouIdList) {
IBasePowerLineCloudService basePowerLineCloudService = context.getBean(IBasePowerLineCloudService.class);
XListResult<DynamicQueryBasePowerLineOutput> lineList = basePowerLineCloudService.getBasePowerLineListByOuIdList(context, DynamicQueryBasePowerLineInput.builder()
.ouIdList(ouIdList)
.build());
lineList.throwIfFail();
return lineList.getResult();
}
/**
* 查询线路列表下所有井口
*
* @param context 上下文
* @param lineIdList 行id列表
* @return {@link List}<{@link DynamicQueryBasePowerLineWellheadViewOutput}>
*/
private List<DynamicQueryBasePowerLineWellheadViewOutput> getBaseWellheadListByLineIdList(XContext context, List<String> lineIdList) {
IBasePowerLineCloudService basePowerLineCloudService = context.getBean(IBasePowerLineCloudService.class);
XListResult<DynamicQueryBasePowerLineWellheadViewOutput> wellheadList = basePowerLineCloudService.getPowerLineWellheadList(context, DynamicQueryBasePowerLineWellheadInput.builder()
.lineIds(lineIdList)
.build());
wellheadList.throwIfFail();
return wellheadList.getResult();
}
} }
...@@ -9,7 +9,6 @@ import com.alibaba.fastjson2.JSONObject; ...@@ -9,7 +9,6 @@ import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.github.pagehelper.page.PageMethod; import com.github.pagehelper.page.PageMethod;
import pps.cloud.base.service.IBaseWellheadCloudService;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput; import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput; import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
import pps.core.auth.HttpRequestClient; import pps.core.auth.HttpRequestClient;
...@@ -645,15 +644,13 @@ public class WellheadDailyProductionSituationService { ...@@ -645,15 +644,13 @@ public class WellheadDailyProductionSituationService {
"\t}\n" + "\t}\n" +
"]"; "]";
List<GetThirdCurrentWellConditionViewOutput> wellList = JSON.parseArray(wellResult, GetThirdCurrentWellConditionViewOutput.class); List<GetThirdCurrentWellConditionViewOutput> wellList = JSON.parseArray(wellResult, GetThirdCurrentWellConditionViewOutput.class);
IBaseWellheadCloudService service = context.getBean(IBaseWellheadCloudService.class); Set<String> collect = ServiceUtil.getBaseWellheadList(context, DynamicQueryBaseWellheadInput.builder()
XListResult<DynamicQueryBaseWellheadOutput> result = service.queryBaseWellheadListByParam(context, DynamicQueryBaseWellheadInput.builder() .build()).stream()
.build()); .map(DynamicQueryBaseWellheadOutput::getWellNumber).collect(Collectors.toSet());
result.throwIfFail();
Set<String> collect = result.getResult().stream().map(DynamicQueryBaseWellheadOutput::getWellNumber).collect(Collectors.toSet());
Set<String> apiCollect = wellList.stream().map(GetThirdCurrentWellConditionViewOutput::getWellNumber).collect(Collectors.toSet()); Set<String> apiCollect = wellList.stream().map(GetThirdCurrentWellConditionViewOutput::getWellNumber).collect(Collectors.toSet());
System.out.println("-------------------系统里的井口:"); System.out.println("-------------------系统里的井口:");
for (DynamicQueryBaseWellheadOutput output : result.getResult()) { for (String output : collect) {
System.out.println(output.getWellNumber()); System.out.println(output);
} }
System.out.println("-------------------长庆接口里的井口:"); System.out.println("-------------------长庆接口里的井口:");
for (GetThirdCurrentWellConditionViewOutput output : wellList) { for (GetThirdCurrentWellConditionViewOutput output : wellList) {
......
...@@ -10,10 +10,20 @@ import cn.hutool.core.util.ObjectUtil; ...@@ -10,10 +10,20 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import pps.cloud.base.service.BasePhotovoltaicPlantCloudService;
import pps.cloud.base.service.IBasePowerLineCloudService; import pps.cloud.base.service.IBasePowerLineCloudService;
import pps.cloud.base.service.IBaseWellheadCloudService;
import pps.cloud.base.service.IConfigOilFieldCloudService; import pps.cloud.base.service.IConfigOilFieldCloudService;
import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudInput;
import pps.cloud.base.service.data.base_photovoltaic_plant.GetBasePhotovoltaicPlantCloudOutput;
import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput; import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput; import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
import pps.cloud.base.service.data.base_power_line_plant.DynamicQueryBasePowerLinePlantInput;
import pps.cloud.base.service.data.base_power_line_plant.DynamicQueryBasePowerLinePlantViewOutput;
import pps.cloud.base.service.data.base_power_line_wellhead.DynamicQueryBasePowerLineWellheadInput;
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.base.service.data.config_oil_field.GetConfigOilFieldOutput;
import pps.cloud.system.service.SysOrganizationCloudService; import pps.cloud.system.service.SysOrganizationCloudService;
import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput; import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
...@@ -39,6 +49,7 @@ import xstartup.data.XListResult; ...@@ -39,6 +49,7 @@ import xstartup.data.XListResult;
import xstartup.data.XSingleResult; import xstartup.data.XSingleResult;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -342,6 +353,95 @@ public class ServiceUtil { ...@@ -342,6 +353,95 @@ public class ServiceUtil {
return result.getResult(); return result.getResult();
} }
/**
* 查询组织列表下所有线路
*
* @param context 上下文
* @param ouIdList ou id列表
* @return {@link List }<{@link DynamicQueryBasePowerLineOutput }>
*/
public static List<DynamicQueryBasePowerLineOutput> getBasePowerLineListByOuIdList(XContext context, Collection<String> ouIdList) {
IBasePowerLineCloudService basePowerLineCloudService = context.getBean(IBasePowerLineCloudService.class);
XListResult<DynamicQueryBasePowerLineOutput> lineList = basePowerLineCloudService.getBasePowerLineListByOuIdList(context, DynamicQueryBasePowerLineInput.builder()
.ouIdList(ouIdList)
.build());
lineList.throwIfFail();
return lineList.getResult();
}
/**
* 查询线路列表下所有井口
*
* @param context 上下文
* @param input 输入
* @return {@link List }<{@link DynamicQueryBasePowerLineWellheadViewOutput }>
*/
public static List<DynamicQueryBasePowerLineWellheadViewOutput> getPowerLineWellheadList(XContext context, DynamicQueryBasePowerLineWellheadInput input) {
IBasePowerLineCloudService service = context.getBean(IBasePowerLineCloudService.class);
XListResult<DynamicQueryBasePowerLineWellheadViewOutput> result = service.getPowerLineWellheadList(context, input);
result.throwIfFail();
return result.getResult();
}
/**
* 获取光伏电站列表
*
* @param context 上下文
* @param input 输入
* @return {@link List }<{@link GetBasePhotovoltaicPlantCloudOutput }>
*/
public static List<GetBasePhotovoltaicPlantCloudOutput> getBasePhotovoltaicPlantList(XContext context, GetBasePhotovoltaicPlantCloudInput input) {
BasePhotovoltaicPlantCloudService service = context.getBean(BasePhotovoltaicPlantCloudService.class);
XListResult<GetBasePhotovoltaicPlantCloudOutput> result = service.getBasePhotovoltaicPlantList(context, input);
result.throwIfFail();
return result.getResult();
}
/**
* 获取井口列表
*
* @param context 上下文
* @return {@link List }<{@link DynamicQueryBaseWellheadOutput }>
*/
public static List<DynamicQueryBaseWellheadOutput> getBaseWellheadList(XContext context, DynamicQueryBaseWellheadInput input) {
IBaseWellheadCloudService service = context.getBean(IBaseWellheadCloudService.class);
XListResult<DynamicQueryBaseWellheadOutput> result = service.queryBaseWellheadListByParam(context, input);
result.throwIfFail();
return result.getResult();
}
/**
* 获取输电线电站列表
*
* @param context 上下文
* @param input 入参
* @return {@link List}<{@link DynamicQueryBasePowerLinePlantViewOutput}>
*/
public static List<DynamicQueryBasePowerLinePlantViewOutput> getPowerLinePlantList(XContext context, DynamicQueryBasePowerLinePlantInput input) {
IBasePowerLineCloudService service = context.getBean(IBasePowerLineCloudService.class);
XListResult<DynamicQueryBasePowerLinePlantViewOutput> result = service.getPowerLinePlantViewList(context, input);
result.throwIfFail();
return result.getResult();
}
/**
* 计算累计减碳量
*
* @param photovoltaicPower 光伏发电
* @return {@link BigDecimal }
*/
public static BigDecimal calculateCarbonReduction(BigDecimal photovoltaicPower) {
BigDecimal carbonReduction;
if (photovoltaicPower.compareTo(BigDecimal.ZERO) > 0) {
carbonReduction = photovoltaicPower
.multiply(BusinessConstant.BIG_DECIMAL_6_67)
.divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
} else {
carbonReduction = BigDecimal.ZERO;
}
return carbonReduction;
}
/*----------------------------------- 私有方法 -----------------------------------*/ /*----------------------------------- 私有方法 -----------------------------------*/
/** /**
......
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