Commit 9ee0946b authored by hanbing's avatar hanbing

[update] 信号优化-态势监测,绿波详情异常返回

parent 10c4b262
......@@ -400,7 +400,7 @@ public class TrendServiceImpl implements TrendService {
.collect(Collectors.toList());
res.setStrategySelected(collect);
// 绿波路口信息
List<GreenwaveDetailVO.GreenwaveCross> greenwaveCrossList = buildGreenwaveCrossList(greenwaveId, dir);
List<GreenwaveDetailVO.GreenwaveCross> greenwaveCrossList = buildGreenwaveCrossList(greenwaveId);
res.setGreenwaveCrossList(greenwaveCrossList);
// 绿波带
if (dir == 0) { // 正向
......@@ -565,7 +565,7 @@ public class TrendServiceImpl implements TrendService {
return greenwavePoint;
}
private List<GreenwaveDetailVO.GreenwaveCross> buildGreenwaveCrossList(Integer greenwaveId, Integer dir) {
private List<GreenwaveDetailVO.GreenwaveCross> buildGreenwaveCrossList(Integer greenwaveId) {
List<GreenwaveDetailVO.GreenwaveCross> res = new ArrayList<>();
List<GreenwaveCrossPO> greenwaveCrossList = greenwaveCrossMapper.selectByGreenwaveId(greenwaveId);
// 相对相位差列表
......@@ -582,6 +582,9 @@ public class TrendServiceImpl implements TrendService {
String crossId = greenwaveCrossPO.getCrossId();
greenwaveCross.setCrossId(crossId);
BaseCrossInfoPO baseCrossInfoPO = baseCrossInfoMapper.selectById(crossId);
if (baseCrossInfoPO == null) {
throw new RuntimeException("无此路口基础信息");
}
greenwaveCross.setCrossName(baseCrossInfoPO.getName());
greenwaveCross.setIsKeyRoute(greenwaveCrossPO.getIsKeyRoute());
greenwaveCross.setSort(greenwaveCrossPO.getSort());
......@@ -598,6 +601,9 @@ public class TrendServiceImpl implements TrendService {
// 获取当前方案
Integer sectionId = greenwaveCrossPO.getSectionId();
CrossSectionPO crossSectionPO = baseCrossSectionMapper.selectById(sectionId);
if (crossSectionPO == null) {
throw new RuntimeException("无当前时段方案信息");
}
Integer currentSchemeId = crossSectionPO.getSchemeId();
BaseCrossSchemePO baseCrossSchemePO = baseCrossSchemeMapper.selectById(currentSchemeId);
greenwaveCross.setOffset(baseCrossSchemePO.getOffset());
......
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