Commit d9fb627a authored by ZWT's avatar ZWT

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

1.修改间开制度管理-长期/中短期/短期间开优化定时任务,修改代码结构,处理部分未优化数据无法初始化问题;
2.修改间开制度管理-长期/中短期定时任务,修改离网型算法逻辑,优化代码;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e41fddcd
...@@ -415,6 +415,7 @@ public class SpaceOptimizeBaseService { ...@@ -415,6 +415,7 @@ public class SpaceOptimizeBaseService {
); );
} else { } else {
int powerDuration = avg.getPowerDuration(); int powerDuration = avg.getPowerDuration();
powerDuration = powerDuration > 15 ? 15 : powerDuration;
String offset = createTime.offsetNew(DateField.MINUTE, powerDuration).toString(BusinessConstant.MINUTES_FORMAT); String offset = createTime.offsetNew(DateField.MINUTE, powerDuration).toString(BusinessConstant.MINUTES_FORMAT);
if (0 != powerDuration) { if (0 != powerDuration) {
//储能发电时长 //储能发电时长
...@@ -422,10 +423,12 @@ public class SpaceOptimizeBaseService { ...@@ -422,10 +423,12 @@ public class SpaceOptimizeBaseService {
startString, offset startString, offset
); );
} }
//柴发发电时长 if (15 != powerDuration) {
this.createOptimizeDuration(durationDTOList, periodId, durationDTO.getRecordId(), durationDTO.getWellheadId(), BusinessConstant.DIESEL_POWER, //柴发发电时长
offset, endString this.createOptimizeDuration(durationDTOList, periodId, durationDTO.getRecordId(), durationDTO.getWellheadId(), BusinessConstant.DIESEL_POWER,
); offset, endString
);
}
} }
} }
} }
......
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