Commit 936d3411 authored by hanbing's avatar hanbing

[update] 信号优化,态势监测-绿波详情-从绿波路口关系获取路段长度

parent f373637c
...@@ -385,7 +385,8 @@ public class TrendServiceImpl implements TrendService { ...@@ -385,7 +385,8 @@ public class TrendServiceImpl implements TrendService {
// 根据路段获取距离 // 根据路段获取距离
Integer distanceToNextCross = null; Integer distanceToNextCross = null;
if (i < size - 1) { // 不是最后一个路口 if (i < size - 1) { // 不是最后一个路口
distanceToNextCross = calcDistance(greenwaveCrossList, i, crossId); double nextCrossLen = greenwaveCrossPO.getNextCrossLen();
distanceToNextCross = (int)nextCrossLen;
} }
greenwaveCross.setDistanceToNextCross(distanceToNextCross); greenwaveCross.setDistanceToNextCross(distanceToNextCross);
// 查找方向平均速度 // 查找方向平均速度
...@@ -510,14 +511,6 @@ public class TrendServiceImpl implements TrendService { ...@@ -510,14 +511,6 @@ public class TrendServiceImpl implements TrendService {
} }
} }
private Integer calcDistance(List<GreenwaveCrossPO> greenwaveCrossList, int i, String currentCrossId) {
GreenwaveCrossPO nextCross = greenwaveCrossList.get(i + 1);
String nextCrossId = nextCross.getCrossId();
RidInfoEntity ridInfoEntity = ridInfoMapper.selectByStartEnd(currentCrossId, nextCrossId);
double length = ridInfoEntity.getLength();
return (int)length;
}
@Override @Override
public List<GreenwaveCrossMetricsVO> greenwaveCrossMetrics(GreenwaveIdAndTimeStampBO greenwaveIdAndTimeStampBO) { public List<GreenwaveCrossMetricsVO> greenwaveCrossMetrics(GreenwaveIdAndTimeStampBO greenwaveIdAndTimeStampBO) {
List<GreenwaveCrossMetricsVO> res = new ArrayList<>(); List<GreenwaveCrossMetricsVO> res = new ArrayList<>();
......
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