Commit be86ff25 authored by ZWT's avatar ZWT

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

1.修改间开制度管理-长期/中短期/短期间开优化定时任务,修改代码结构,处理部分未优化数据无法初始化问题;
2.修改间开制度管理-长期/中短期定时任务,修改离网型算法逻辑,优化代码;
3.修改间开制度管理-短期间开优化详情接口,优化代码;
4.修改间开制度管理-间开优化模块间开制度跟踪接口,解决短期间开制度查询多条导致程序报错问题;
5.修改间开制度管理-短期间开优化定时任务,解决重复添加短期优化记录问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 5874feee
...@@ -53,9 +53,11 @@ public class SpaceOptimizeShortCloudServiceImpl extends SpaceOptimizeBaseService ...@@ -53,9 +53,11 @@ public class SpaceOptimizeShortCloudServiceImpl extends SpaceOptimizeBaseService
//查是否已经存有短期历史数据 //查是否已经存有短期历史数据
SpaceOptimizeShortPeriodMapper shortPeriodMapper = context.getBean(SpaceOptimizeShortPeriodMapper.class); SpaceOptimizeShortPeriodMapper shortPeriodMapper = context.getBean(SpaceOptimizeShortPeriodMapper.class);
SpaceOptimizeShortPeriodEnt shortPeriod = shortPeriodMapper.selectOne(new LambdaQueryWrapper<SpaceOptimizeShortPeriodEnt>() SpaceOptimizeShortPeriodEnt shortPeriod = shortPeriodMapper.selectOne(new LambdaQueryWrapper<SpaceOptimizeShortPeriodEnt>()
.eq(BaseModel::getIsDeleted, BusinessConstant.ZERO) .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.eq(SpaceOptimizeShortPeriodEnt::getOptimizeDate, beginOfDay) .eq(SpaceOptimizeShortPeriodEnt::getOptimizeDate, beginOfDay)
.eq(SpaceOptimizeShortPeriodEnt::getInstitutionId, detailId) .eq(SpaceOptimizeShortPeriodEnt::getInstitutionId, detailId)
.orderByDesc(BaseModel::getCreateTime)
.last("LIMIT 1")
); );
String periodId; String periodId;
if (Objects.isNull(shortPeriod)) { if (Objects.isNull(shortPeriod)) {
...@@ -87,7 +89,7 @@ public class SpaceOptimizeShortCloudServiceImpl extends SpaceOptimizeBaseService ...@@ -87,7 +89,7 @@ public class SpaceOptimizeShortCloudServiceImpl extends SpaceOptimizeBaseService
Map<String, List<SpaceInstitutionDurationEnt>> durationListMap; Map<String, List<SpaceInstitutionDurationEnt>> durationListMap;
if (CollUtil.isEmpty(durationEntList)) { if (CollUtil.isEmpty(durationEntList)) {
durationListMap = new HashMap<>(0); durationListMap = new HashMap<>(0);
}else { } else {
durationListMap = durationEntList.stream() durationListMap = durationEntList.stream()
.collect(Collectors.groupingBy(SpaceInstitutionDurationEnt::getWellheadId)); .collect(Collectors.groupingBy(SpaceInstitutionDurationEnt::getWellheadId));
} }
......
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