Commit 4955688f authored by ZWT's avatar ZWT

feat(能源管理系统): 测试问题修复

1.开发统计分析-能耗分析模块,绿电消纳列表接口,修改光伏电站Cloud模块查询电站列表接口,增加组织ID集合查询条件,添加接口文档,并完成接口冒烟测试;
2.开发统计分析-能耗分析模块,电量使用趋势列表接口,添加接口文档,并完成接口冒烟测试;
3.统计分析模块抽取基类,将公用方法移入基类;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 0e140b67
...@@ -63,7 +63,58 @@ public class EnergyConsumptionAnalysisService extends StatisticAnalysisBaseServi ...@@ -63,7 +63,58 @@ public class EnergyConsumptionAnalysisService extends StatisticAnalysisBaseServi
if (CollUtil.isNotEmpty(powerGenerationList)) { if (CollUtil.isNotEmpty(powerGenerationList)) {
XCopyUtils.copyList(powerGenerationList, outputList, GetEnergyConsumptionAnalysisOutput.class); XCopyUtils.copyList(powerGenerationList, outputList, GetEnergyConsumptionAnalysisOutput.class);
//todo 设置一个值计算用电量 //todo 设置一个值计算用电量
BigDecimal flag = new BigDecimal(0.8); BigDecimal flag = new BigDecimal("0.8");
BigDecimal power;
for (GetEnergyConsumptionAnalysisOutput output : outputList) {
power = output.getPower();
if (Objects.isNull(power) ||
power.compareTo(BigDecimal.ZERO) <= BusinessConstant.ZERO
) {
output.setElectricityConsumption(BigDecimal.ZERO);
continue;
}
//计算负荷
output.setElectricityConsumption(
power.multiply(flag)
.setScale(2, BigDecimal.ROUND_HALF_UP)
);
}
}
return XListResult.success(outputList);
}
/**
* 能耗分析--电量使用趋势
*
* @param context 上下文
* @param input 输入
* @return {@link XListResult}<{@link GetEnergyConsumptionCurveOutput}>
*/
@XText("能耗分析--电量使用趋势")
@XApiAnonymous
@XApiGet
public XListResult<GetEnergyConsumptionAnalysisOutput> queryElectricityUsageTrend(XContext context, GetEnergyConsumptionAnalysisInput input) {
//查包含当前组织的所有子组织列表
List<String> orgIdsByPath = super.getOrgIdsByPath(context, input.getOuId());
//查组织下的光伏电站
List<GetBasePhotovoltaicPlantCloudOutput> photovoltaicPlantList = super.getPhotovoltaicPlantByParam(context,
GetBasePhotovoltaicPlantCloudInput.builder()
.ouIds(orgIdsByPath)
.build()
);
List powerGenerationList = null;
if (CollUtil.isNotEmpty(photovoltaicPlantList)) {
powerGenerationList = super.getPhotovoltaicPowerGeneration(context, input.getDateType(),
photovoltaicPlantList.stream()
.map(GetBasePhotovoltaicPlantCloudOutput::getId)
.collect(Collectors.toList())
);
}
List<GetEnergyConsumptionAnalysisOutput> outputList = new ArrayList<>(0);
if (CollUtil.isNotEmpty(powerGenerationList)) {
XCopyUtils.copyList(powerGenerationList, outputList, GetEnergyConsumptionAnalysisOutput.class);
//todo 设置一个值计算用电量
BigDecimal flag = new BigDecimal("1.5");
BigDecimal power; BigDecimal power;
for (GetEnergyConsumptionAnalysisOutput output : outputList) { for (GetEnergyConsumptionAnalysisOutput output : outputList) {
power = output.getPower(); power = output.getPower();
......
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