Commit 6ceec4b5 authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent a85611a1
......@@ -129,10 +129,20 @@ public class SpaceOptimizeLongPeriodService extends SpaceOptimizeBaseService {
);
if (CollUtil.isNotEmpty(durationList)) {
List<SpaceOptimizeDateDuration> durationOutputs = XCopyUtils.copyNewList(durationList, SpaceOptimizeDateDuration.class);
Map<String, List<SpaceOptimizeDateDuration>> collect = durationOutputs.stream()
.collect(
Collectors.groupingBy(SpaceOptimizeDateDuration::getWellheadId)
);
Map<String, List<SpaceOptimizeDateDuration>> collect = new HashMap<>(16);
for (SpaceOptimizeDateDuration durationOutput : durationOutputs) {
if (StringUtils.isEmpty(durationOutput.getGenerationTypeKey())) {
durationOutput.setGenerationTypeKey(BusinessConstant.PHOTOVOLTAIC);
}
List<SpaceOptimizeDateDuration> tmpList = collect.get(durationOutput.getWellheadId());
if (CollUtil.isEmpty(tmpList)) {
tmpList = new ArrayList<>(16);
tmpList.add(durationOutput);
collect.put(durationOutput.getWellheadId(), tmpList);
} else {
tmpList.add(durationOutput);
}
}
wellheadOutputs.forEach(w -> {
if (collect.containsKey(w.getWellheadId())) {
Map<Integer, List<SpaceOptimizeDateDuration>> listMap = collect.get(w.getWellheadId()).stream()
......
......@@ -127,10 +127,20 @@ public class SpaceOptimizeMidPeriodService extends SpaceOptimizeBaseService {
);
if (CollUtil.isNotEmpty(durationList)) {
List<SpaceOptimizeDateDuration> durationOutputs = XCopyUtils.copyNewList(durationList, SpaceOptimizeDateDuration.class);
Map<String, List<SpaceOptimizeDateDuration>> collect = durationOutputs.stream()
.collect(
Collectors.groupingBy(SpaceOptimizeDateDuration::getWellheadId)
);
Map<String, List<SpaceOptimizeDateDuration>> collect = new HashMap<>(16);
for (SpaceOptimizeDateDuration durationOutput : durationOutputs) {
if (StringUtils.isEmpty(durationOutput.getGenerationTypeKey())) {
durationOutput.setGenerationTypeKey(BusinessConstant.PHOTOVOLTAIC);
}
List<SpaceOptimizeDateDuration> tmpList = collect.get(durationOutput.getWellheadId());
if (CollUtil.isEmpty(tmpList)) {
tmpList = new ArrayList<>(16);
tmpList.add(durationOutput);
collect.put(durationOutput.getWellheadId(), tmpList);
} else {
tmpList.add(durationOutput);
}
}
wellheadOutputs.forEach(w -> {
if (collect.containsKey(w.getWellheadId())) {
Map<Integer, List<SpaceOptimizeDateDuration>> listMap = collect.get(w.getWellheadId()).stream()
......
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