Skip to content

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

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

1.修改基础信息配置--组织机构管理模块,通过组织机构ID查询下级组织机构及线路列表接口,增加查询线路类型逻辑,添加返回值,修改接口文档并完成接口冒烟测试;
2.修改基础信息配置--基础间开配置模块,设为基础制度接口,添加限制条件,不能优化结束日期在当天之前的数据;
3.修改间开制度管理--长期/中短期间开优化功能,添加通过线路ID查询线路下储能设备列表接口,修改离网型制度优化逻辑;
4.修改基础信息配置--基础间开配置模块设为基础间开/重新校准接口,修改离网型制度优化逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent c376a341
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 44 deletions
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceInstitutionDetailService.java
View file @ acfe275b
......@@ -410,48 +410,13 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
DateTime endOfMonth = DateUtil.endOfMonth(currentTime);
DateTime endOfWeek = DateUtil.endOfWeek(currentTime);
String lineId = detail.getLineId();
//取年份
int year = currentTime.year();
int monthIndex = currentTime.month();
//月份要加一
int monthNum = monthIndex + 1;
//上一月
int lastMonthNum = monthIndex;
int lastYear = year;
if (monthIndex == 0) {
lastMonthNum = 12;
lastYear = year - 1;
}
SpaceOptimizeLineRelation relation = super.getOptimizeLineRelation(context, ListUtil.toList(detail));
//长期间开优化
this.institutionalOptimization(context, longPeriodDTOList, longWellheadDTOList, longDurationDTOList, longUnOptimizeDurationList,
relation, detail, BaseUtils.getExecutionCycleForMonth(currentTime), endOfMonth, monthNum,
DynamicQueryPlantPredictedPowerInput.builder()
.plantIds(relation.getPlantIdsByLineIdMap().get(lineId))
.yearTime(String.valueOf(year))
.monthTime(BaseUtils.getMonthString(monthNum))
.dateType(BusinessConstant.ZERO)
.build(),
DynamicQueryStoragePredictedPowerInput.builder()
.storageIds(relation.getStorageIdsByLineIdMap().get(lineId))
.yearTime(String.valueOf(lastYear))
.monthTime(BaseUtils.getMonthString(lastMonthNum))
.build());
relation, detail, endOfMonth, currentTime, BusinessConstant.ZERO);
//中短期间开优化
this.institutionalOptimization(context, midPeriodDTOList, midWellheadDTOList, midDurationDTOList, midUnOptimizeDurationList,
relation, detail, BaseUtils.getExecutionCycleForWeek(currentTime), endOfWeek, monthNum,
DynamicQueryPlantPredictedPowerInput.builder()
.plantIds(relation.getPlantIdsByLineIdMap().get(lineId))
.startTime(DateUtil.beginOfWeek(currentTime).toString(BusinessConstant.DATE_FORMAT_DAY))
.endTime(DateUtil.beginOfWeek(DateUtil.nextWeek()).toString(BusinessConstant.DATE_FORMAT_DAY))
.dateType(BusinessConstant.ONE)
.build(),
DynamicQueryStoragePredictedPowerInput.builder()
.storageIds(relation.getStorageIdsByLineIdMap().get(lineId))
.startTime(DateUtil.offsetDay(currentTime, -7).toString(BusinessConstant.DATE_FORMAT_DAY))
.endTime(currentTime.toString(BusinessConstant.DATE_FORMAT_DAY))
.build()
);
relation, detail, endOfWeek, currentTime, BusinessConstant.ONE);
//逻辑删除已创建的长期优化数据
SpaceOptimizeLongPeriodMapper longPeriodMapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
List<SpaceOptimizeLongPeriodEnt> longPeriodEntList = longPeriodMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeLongPeriodEnt>()
......@@ -693,27 +658,84 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
* @param unOptimizeDurationList 取消优化工期列表
* @param relation 关系
* @param detail 细节
* @param executionCycle 执行周期
* @param optimizeDeadline 优化截止日期
* @param monthNum 月份
* @param plantPowerInput 电厂功率输入
* @param storagePowerinput 存储电源输入
* @param currentTime 当前时间
* @param dateFlag 日期标志
*/
private void institutionalOptimization(XContext context, List<SpaceOptimizePeriodDTO> periodDTOList, List<SpaceOptimizeWellheadDTO> wellheadDTOList,
List<SpaceOptimizeDurationDTO> durationDTOList, List<SpaceOptimizeDurationDTO> unOptimizeDurationList,
SpaceOptimizeLineRelation relation, SpaceInstitutionDetailEnt detail,
String executionCycle, Date optimizeDeadline, int monthNum,
DynamicQueryPlantPredictedPowerInput plantPowerInput, DynamicQueryStoragePredictedPowerInput storagePowerinput) {
Date optimizeDeadline, DateTime currentTime, int dateFlag) {
//取年份
int year = currentTime.year();
int monthIndex = currentTime.month();
//月份要加一
int monthNum = monthIndex + 1;
//上一月
int lastMonthNum = monthIndex;
int lastYear = year;
if (monthIndex == 0) {
lastMonthNum = 12;
lastYear = year - 1;
}
DynamicQueryPlantPredictedPowerInput plantPowerInput;
DynamicQueryStoragePredictedPowerInput storagePowerinput;
String executionCycle;
if (0 == dateFlag) {
executionCycle = BaseUtils.getExecutionCycleForMonth(currentTime);
} else {
executionCycle = BaseUtils.getExecutionCycleForWeek(currentTime);
}
//创建记录
String periodId = super.createOptimizePeriod(periodDTOList, detail.getId(), detail.getLineId(), executionCycle, optimizeDeadline);
switch (detail.getGridTypeKey()) {
//并网型优化
case "1":
if (0 == dateFlag) {
plantPowerInput = DynamicQueryPlantPredictedPowerInput.builder()
.plantIds(relation.getPlantIdsByLineIdMap().get(detail.getLineId()))
.yearTime(String.valueOf(year))
.monthTime(BaseUtils.getMonthString(monthNum))
.dateType(BusinessConstant.ZERO)
.build();
} else {
plantPowerInput = DynamicQueryPlantPredictedPowerInput.builder()
.plantIds(relation.getPlantIdsByLineIdMap().get(detail.getLineId()))
.startTime(DateUtil.beginOfWeek(currentTime).toString(BusinessConstant.DATE_FORMAT_DAY))
.endTime(DateUtil.beginOfWeek(DateUtil.nextWeek()).toString(BusinessConstant.DATE_FORMAT_DAY))
.dateType(BusinessConstant.ONE)
.build();
}
super.gridConnectedOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList,
relation.getWellheadsByInstitutionIdIdMap().get(detail.getId()), detail, monthNum, periodId, plantPowerInput);
break;
//离网型优化
case "0":
if (0 == dateFlag) {
plantPowerInput = DynamicQueryPlantPredictedPowerInput.builder()
.plantIds(relation.getPlantIdsByLineIdMap().get(detail.getLineId()))
.yearTime(String.valueOf(year))
.monthTime(BaseUtils.getMonthString(monthNum))
.dateType(BusinessConstant.ZERO)
.build();
storagePowerinput = DynamicQueryStoragePredictedPowerInput.builder()
.storageIds(relation.getStorageIdsByLineIdMap().get(detail.getLineId()))
.yearTime(String.valueOf(lastYear))
.monthTime(BaseUtils.getMonthString(lastMonthNum))
.build();
} else {
plantPowerInput = DynamicQueryPlantPredictedPowerInput.builder()
.plantIds(relation.getPlantIdsByLineIdMap().get(detail.getLineId()))
.startTime(DateUtil.beginOfWeek(currentTime).toString(BusinessConstant.DATE_FORMAT_DAY))
.endTime(DateUtil.beginOfWeek(DateUtil.nextWeek()).toString(BusinessConstant.DATE_FORMAT_DAY))
.dateType(BusinessConstant.ONE)
.build();
storagePowerinput = DynamicQueryStoragePredictedPowerInput.builder()
.storageIds(relation.getStorageIdsByLineIdMap().get(detail.getLineId()))
.startTime(DateUtil.offsetDay(currentTime, -7).toString(BusinessConstant.DATE_FORMAT_DAY))
.endTime(currentTime.toString(BusinessConstant.DATE_FORMAT_DAY))
.build();
}
super.offGridOptimization(context, wellheadDTOList, durationDTOList, unOptimizeDurationList,
relation.getWellheadsByInstitutionIdIdMap().get(detail.getId()),
relation.getStorageAvgMap(), detail, periodId,
......
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