Commit c45a7a7a authored by duanruiming's avatar duanruiming

[update] review-阻塞list判断优化

parent f27b9666
...@@ -175,7 +175,7 @@ public class DiagnoServiceImpl implements DiagnoService { ...@@ -175,7 +175,7 @@ public class DiagnoServiceImpl implements DiagnoService {
schemeOptVO.setSchemeId(schemeId); schemeOptVO.setSchemeId(schemeId);
// 选择数据批次时间最大的记录 // 选择数据批次时间最大的记录
List<CrossSchemeOptLogPO> maxList = crossSchemeOptLogMapper.selectMaxByCrossIdAndSchemeId(crossId, schemeId); List<CrossSchemeOptLogPO> maxList = crossSchemeOptLogMapper.selectMaxByCrossIdAndSchemeId(crossId, schemeId);
if (CollectionUtil.isNotEmpty(maxList)) { if (!CollectionUtils.isEmpty(maxList)) {
// 根据相位去重 // 根据相位去重
TreeSet<CrossSchemeOptLogPO> collect = maxList.stream() TreeSet<CrossSchemeOptLogPO> collect = maxList.stream()
.collect(Collectors.toCollection( .collect(Collectors.toCollection(
...@@ -261,7 +261,7 @@ public class DiagnoServiceImpl implements DiagnoService { ...@@ -261,7 +261,7 @@ public class DiagnoServiceImpl implements DiagnoService {
String crossId = sendManualDTO.getSendCrossId(); String crossId = sendManualDTO.getSendCrossId();
// 选择数据批次时间最大的记录 // 选择数据批次时间最大的记录
List<CrossSchemeOptLogPO> maxList = crossSchemeOptLogMapper.selectMaxByCrossId(crossId); List<CrossSchemeOptLogPO> maxList = crossSchemeOptLogMapper.selectMaxByCrossId(crossId);
if (CollectionUtil.isNotEmpty(maxList)) { if (!CollectionUtils.isEmpty(maxList)) {
CrossSchemeOptLogPO crossSchemeOptLogPO = maxList.get(0); CrossSchemeOptLogPO crossSchemeOptLogPO = maxList.get(0);
String dataExtend = crossSchemeOptLogPO.getDataExtend(); String dataExtend = crossSchemeOptLogPO.getDataExtend();
OptDataExtend optDataExtendOld = gson.fromJson(dataExtend, OptDataExtend.class); OptDataExtend optDataExtendOld = gson.fromJson(dataExtend, OptDataExtend.class);
...@@ -387,7 +387,7 @@ public class DiagnoServiceImpl implements DiagnoService { ...@@ -387,7 +387,7 @@ public class DiagnoServiceImpl implements DiagnoService {
// 获取路口历史数据 // 获取路口历史数据
List<CrossDataHistPO> crossDataHistPOList = List<CrossDataHistPO> crossDataHistPOList =
crossDataHistMapper.selectByCrossIdAndTimestamp(crossId, preSeconds); crossDataHistMapper.selectByCrossIdAndTimestamp(crossId, preSeconds);
if (CollectionUtil.isNotEmpty(crossDataHistPOList)) { if (!CollectionUtils.isEmpty(crossDataHistPOList)) {
List<OptEffectVO.IndexDelay> indexDelayList = buildIndexDelayList(crossDataHistPOList); List<OptEffectVO.IndexDelay> indexDelayList = buildIndexDelayList(crossDataHistPOList);
optEffectVO.setIndexDelayList(indexDelayList); optEffectVO.setIndexDelayList(indexDelayList);
List<OptEffectVO.QueueStop> queueStopList = buildQueueStopList(crossDataHistPOList); List<OptEffectVO.QueueStop> queueStopList = buildQueueStopList(crossDataHistPOList);
...@@ -397,7 +397,7 @@ public class DiagnoServiceImpl implements DiagnoService { ...@@ -397,7 +397,7 @@ public class DiagnoServiceImpl implements DiagnoService {
// 获取路口方向历史数据 // 获取路口方向历史数据
List<CrossDirDataHistPO> crossDirDataHistPOList = List<CrossDirDataHistPO> crossDirDataHistPOList =
crossDirDataHistMapper.selectByCrossIdDirAndTimestamp(crossId, dir, preSeconds); crossDirDataHistMapper.selectByCrossIdDirAndTimestamp(crossId, dir, preSeconds);
if (CollectionUtil.isNotEmpty(crossDirDataHistPOList)) { if (!CollectionUtils.isEmpty(crossDirDataHistPOList)) {
List<OptEffectVO.IndexDelay> indexDelayList = buildIndexDelayListDir(crossDirDataHistPOList); List<OptEffectVO.IndexDelay> indexDelayList = buildIndexDelayListDir(crossDirDataHistPOList);
optEffectVO.setIndexDelayList(indexDelayList); optEffectVO.setIndexDelayList(indexDelayList);
List<OptEffectVO.QueueStop> queueStopList = buildQueueStopListDir(crossDirDataHistPOList); List<OptEffectVO.QueueStop> queueStopList = buildQueueStopListDir(crossDirDataHistPOList);
......
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