[update] 信号优化，态势监测-子区详情-绿波带路口排序

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/TrendServiceImpl.java

@@ -458,7 +458,10 @@ public class TrendServiceImpl implements TrendService {
             res.add(greenwavePoint);
             preCrossBeginSeconds = absoluteSecondsPoint;
         }
-        return res;
+        List<GreenwaveDetailVO.GreenwavePoint> sorted = res.stream()
+                .sorted(Comparator.comparing(GreenwaveDetailVO.GreenwavePoint::getSort))
+                .collect(Collectors.toList());
+        return sorted;
     }
 
     private List<GreenwaveDetailVO.GreenwavePoint> buildForwardGreenwaveList(
@@ -515,7 +518,10 @@ public class TrendServiceImpl implements TrendService {
             res.add(greenwavePoint);
             preCrossBeginSeconds = absoluteSecondsPoint;
         }
-        return res;
+        List<GreenwaveDetailVO.GreenwavePoint> sorted = res.stream()
+                .sorted(Comparator.comparing(GreenwaveDetailVO.GreenwavePoint::getSort))
+                .collect(Collectors.toList());
+        return sorted;
     }
 
     private int calcCoordBeginSeconds(GreenwaveDetailVO.GreenwaveCross greenwaveCross) {
@@ -535,6 +541,7 @@ public class TrendServiceImpl implements TrendService {
 
     private GreenwaveDetailVO.GreenwavePoint buildGreenwavePoint(GreenwaveDetailVO.GreenwaveCross greenwaveCross) {
         GreenwaveDetailVO.GreenwavePoint greenwavePoint = new GreenwaveDetailVO.GreenwavePoint();
+        greenwavePoint.setSort(greenwaveCross.getSort());
         greenwavePoint.setCrossId(greenwaveCross.getCrossId());
         greenwavePoint.setCrossName(greenwaveCross.getCrossName());
         List<GreenwaveDetailVO.GreenwavePhase> greenwavePhaseList = greenwaveCross.getGreenwavePhaseList();

signal-optimize-service/src/main/java/net/wanji/opt/vo/GreenwaveDetailVO.java

@@ -84,5 +84,7 @@ public class GreenwaveDetailVO {
         private Integer coordSeconds;
         @ApiModelProperty(value = "距离协调相位开始时差（秒）")
         private Integer coordOffset;
+        @ApiModelProperty(value = "路口顺序号")
+        private Integer sort;
     }
 }