Skip to content

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

feat(零碳): 长庆演示系统新增功能 

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 115dade7
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 33 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineService.java
View file @ f99ac0c6
......@@ -208,7 +208,7 @@ public class BasePowerLineService {
if (CollUtil.isNotEmpty(wellheadViewList)) {
output.setWellheadInputs(XCopyUtils.copyNewList(wellheadViewList, GetBasePowerLineWellheadViewOutput.class));
} else {
output.setWellheadInputs(new ArrayList<>(0));
output.setWellheadInputs(Collections.emptyList());
}
//设置关联光伏
BasePowerLinePlantViewMapper plantViewMapper = context.getBean(BasePowerLinePlantViewMapper.class);
......@@ -218,7 +218,7 @@ public class BasePowerLineService {
if (CollUtil.isNotEmpty(plantViewList)) {
output.setPlantInputs(XCopyUtils.copyNewList(plantViewList, GetBasePowerLinePlantViewOutput.class));
} else {
output.setPlantInputs(new ArrayList<>(0));
output.setPlantInputs(Collections.emptyList());
}
//设置关联储能
BasePowerLineStorageViewMapper storageViewMapper = context.getBean(BasePowerLineStorageViewMapper.class);
......@@ -228,7 +228,7 @@ public class BasePowerLineService {
if (CollUtil.isNotEmpty(storageViewList)) {
output.setStorageInputs(XCopyUtils.copyNewList(storageViewList, GetBasePowerLineStorageViewOutput.class));
} else {
output.setStorageInputs(new ArrayList<>(0));
output.setStorageInputs(Collections.emptyList());
}
//设置关联柴发
BasePowerLineDieselViewMapper dieselViewMapper = context.getBean(BasePowerLineDieselViewMapper.class);
......@@ -238,7 +238,7 @@ public class BasePowerLineService {
if (CollUtil.isNotEmpty(dieselViewList)) {
output.setDieselInputs(XCopyUtils.copyNewList(dieselViewList, GetBasePowerLineDieselViewOutput.class));
} else {
output.setDieselInputs(new ArrayList<>(0));
output.setDieselInputs(Collections.emptyList());
}
Map<String, String> gridTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.GRID_TYPE);
Map<String, String> lineTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.LINE_TYPE);
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyService.java
View file @ f99ac0c6
......@@ -36,10 +36,7 @@ import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.helper.XTransactionHelper;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -229,11 +226,7 @@ public class BasePriceStrategyService {
Map<String, List<GetBasePriceStrategyDetailOutput>> collect = detailOutputs.stream()
.collect(Collectors.groupingBy(GetBasePriceStrategyDetailOutput::getStrategyMonth));
for (GetBasePriceStrategyMonthOutput monthOutput : months) {
if (collect.containsKey(monthOutput.getStrategyMonth())) {
monthOutput.setDetails(collect.get(monthOutput.getStrategyMonth()));
} else {
monthOutput.setDetails(new ArrayList<>(0));
}
monthOutput.setDetails(collect.getOrDefault(monthOutput.getStrategyMonth(), Collections.emptyList()));
}
}
output.setMonths(months);
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceCalibrationService.java
View file @ f99ac0c6
......@@ -208,7 +208,7 @@ public class SpaceCalibrationService {
if (CollUtil.isNotEmpty(wellheadEntList)) {
output.setWellheadList(XCopyUtils.copyNewList(wellheadEntList, QuerySpaceInstitutionWellheadOutput.class));
} else {
output.setWellheadList(new ArrayList<>(0));
output.setWellheadList(Collections.emptyList());
}
output.setInstitutionId(institutionId);
output.setLineId(lineId);
......@@ -235,10 +235,6 @@ public class SpaceCalibrationService {
return XSingleResult.error(context, BusinessError.LackOfHistoryRecord);
}
List durationEntList = null;
GetSpaceInstitutionWellheadOutput wellheadOutput = GetSpaceInstitutionWellheadOutput.builder()
.optimizeList(new ArrayList<>(0))
.initializeList(new ArrayList<>(0))
.build();
//查短期优化数据
SpaceOptimizeShortPeriodMapper shortPeriodMapper = context.getBean(SpaceOptimizeShortPeriodMapper.class);
SpaceOptimizeShortPeriodEnt shortPeriodEnt = shortPeriodMapper.selectOne(new LambdaQueryWrapper<SpaceOptimizeShortPeriodEnt>()
......@@ -300,6 +296,7 @@ public class SpaceCalibrationService {
}
}
}
GetSpaceInstitutionWellheadOutput wellheadOutput = new GetSpaceInstitutionWellheadOutput();
if (CollUtil.isNotEmpty(durationEntList)) {
List<SpaceOptimizeDateDuration> spaceOptimizeDateDurationList = new ArrayList<>(16);
XCopyUtils.copyList(durationEntList, spaceOptimizeDateDurationList, SpaceOptimizeDateDuration.class);
......@@ -308,6 +305,9 @@ public class SpaceCalibrationService {
.collect(Collectors.groupingBy(SpaceOptimizeDateDuration::getIsOptimize));
wellheadOutput.setInitializeList(ServiceUtil.getAllDateDuration(collect.get(BusinessConstant.ONE)));
wellheadOutput.setOptimizeList(ServiceUtil.getAllDateDuration(collect.get(BusinessConstant.ZERO)));
} else {
wellheadOutput.setInitializeList(Collections.emptyList());
wellheadOutput.setOptimizeList(Collections.emptyList());
}
return XSingleResult.success(wellheadOutput);
}
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceInstitutionDetailService.java
View file @ f99ac0c6
......@@ -223,17 +223,12 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
Map<String, List<GetSpaceInstitutionDurationViewOutput>> collect = durationViewOutputList.stream()
.collect(Collectors.groupingBy(GetSpaceInstitutionDurationViewOutput::getWellheadId));
wellheadViewOutputs.forEach(wellhead -> {
String wellheadId = wellhead.getWellheadId();
if (collect.containsKey(wellheadId)) {
wellhead.setDurationList(collect.get(wellheadId));
} else {
wellhead.setDurationList(new ArrayList<>(0));
}
wellhead.setDurationList(collect.getOrDefault(wellhead.getWellheadId(), Collections.emptyList()));
});
}
output.setWellheadList(wellheadViewOutputs);
} else {
output.setWellheadList(new ArrayList<>(0));
output.setWellheadList(Collections.emptyList());
}
output.setOuName(ServiceUtil.getSysOrgNameById(context, output.getOuId()));
output.setGridTypeName(ServiceUtil.getDictMap(context, BusinessConstant.GRID_TYPE).get(output.getGridTypeKey()));
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/EnergyConsumptionAnalysisService.java
View file @ f99ac0c6
......@@ -941,7 +941,7 @@ public class EnergyConsumptionAnalysisService {
}
}
} else {
list = new ArrayList<>(0);
list = Collections.emptyList();
}
PageInfo<ThirdDailyAccumulationUpdateEnt> pageInfo = new PageInfo<>(list);
return XPageResult.success(outputs, input, pageInfo.getTotal());
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/EnergyConsumptionCurveService.java
View file @ f99ac0c6
......@@ -19,7 +19,7 @@ import xstartup.data.XSingleResult;
import xstartup.feature.api.annotation.XApiGet;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
......@@ -55,9 +55,9 @@ public class EnergyConsumptionCurveService extends StatisticAnalysisBaseService
.collect(Collectors.toList());
powerGenerationList = super.getPhotovoltaicPowerGeneration(context, input.getDateType(), plantIdList, input.getStartTime(), input.getEndTime());
}
List<GetEnergyConsumptionCurveOutput> outputList = new ArrayList<>(0);
List<GetEnergyConsumptionCurveOutput> outputList;
if (CollUtil.isNotEmpty(powerGenerationList)) {
XCopyUtils.copyList(powerGenerationList, outputList, GetEnergyConsumptionCurveOutput.class);
outputList = XCopyUtils.copyNewList(powerGenerationList, GetEnergyConsumptionCurveOutput.class);
//有发电量说明有电站ID,查电站详情
List<GetBasePhotovoltaicPlantCloudOutput> plantList = super.getPhotovoltaicPlantByParam(context,
GetBasePhotovoltaicPlantCloudInput.builder()
......@@ -73,6 +73,8 @@ public class EnergyConsumptionCurveService extends StatisticAnalysisBaseService
output.setProductionLoad(productionLoad);
}
}
} else {
outputList = Collections.emptyList();
}
return XListResult.success(outputList);
}
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/StoragePredictedPowerCloudServiceImpl.java
View file @ f99ac0c6
......@@ -13,7 +13,7 @@ import xstartup.base.XContext;
import xstartup.base.util.XCopyUtils;
import xstartup.data.XListResult;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
......@@ -59,7 +59,7 @@ public class StoragePredictedPowerCloudServiceImpl implements IStoragePredictedP
);
List<DynamicQueryStoragePredictedPowerOutput> outputs;
if (CollUtil.isEmpty(list)) {
outputs = new ArrayList<>(0);
outputs = Collections.emptyList();
} else {
outputs = XCopyUtils.copyNewList(list, DynamicQueryStoragePredictedPowerOutput.class);
}
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdCurrentWellConditionService.java
View file @ f99ac0c6
......@@ -17,6 +17,7 @@ import xstartup.data.XListResult;
import xstartup.feature.api.annotation.XApiPost;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
......@@ -51,7 +52,7 @@ public class ThirdCurrentWellConditionService {
result.throwIfFail();
List<DynamicQueryBasePowerLineWellheadViewOutput> list = result.getResult();
if (CollUtil.isEmpty(list)) {
return XListResult.success(new ArrayList<>(0));
return XListResult.success(Collections.emptyList());
}
ThirdCurrentWellConditionMapper mapper = context.getBean(ThirdCurrentWellConditionMapper.class);
List<ThirdCurrentWellConditionEnt> selectList = mapper.selectList(new LambdaQueryWrapper<ThirdCurrentWellConditionEnt>()
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/WellheadDailyProductionSituationService.java
View file @ f99ac0c6
......@@ -103,7 +103,7 @@ public class WellheadDailyProductionSituationService {
String data = jsonObject.getString("data");
List<GetWellheadDailyProductionSituationOutput> outputs = JSON.parseArray(data, GetWellheadDailyProductionSituationOutput.class);
if (CollUtil.isEmpty(outputs)) {
outputs = new ArrayList<>(0);
outputs = Collections.emptyList();
}
return XListResult.success(outputs);
}
......
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