[add] 绿波图添加距离

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

@@ -215,6 +215,7 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
         LinkedList<Double> backCrossGreenStartList = new LinkedList<>();
         Map<String, Double> distanceMap = new LinkedHashMap<>();
         Map<String, Double> backDistanceMap = new TreeMap<>();
+
         String decideSpeed = "";
         String backDecideSpeed = "";
         String crossSpeed = "";
@@ -222,6 +223,9 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
         String travelTime = "";
         String backtravelTime = "";
         String offset = "";
+        String distanceStr = "";
+        String backDistanceStr = "";
+
         // 处理绿波时序图数据
         List<GreenBeltInfoVO.DirGreenDetail> dirGreenDetails = greenBeltInfoVO.getDirGreenDetails();
         Double greenWidthTime = 0.0;
@@ -247,6 +251,9 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
                     crossSpeed = mapper.writeValueAsString(integerList);
                     List<Double> offsetList = list.stream().map(GreenBeltInfoVO.CrossGreenDetail::getOffset).collect(Collectors.toList());
                     offset = mapper.writeValueAsString(offsetList);
+                    List<Double> distance = list.stream().filter(vo -> vo.getDistance() > 0).map(GreenBeltInfoVO.CrossGreenDetail::getDistance).collect(Collectors.toList());
+                    distanceStr = mapper.writeValueAsString(distance);
+
                 }
                 if (dirType == 0) {
                     backDecideSpeed = String.join("~", String.valueOf(dirGreenDetail.getMinSpeed()), String.valueOf(dirGreenDetail.getMaxSpeed()));
@@ -264,6 +271,8 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
                         }
                     }
                     backCrossSpeed = mapper.writeValueAsString(integerList);
+                    List<Double> distance = list.stream().filter(vo -> vo.getDistance() > 0).map(GreenBeltInfoVO.CrossGreenDetail::getDistance).collect(Collectors.toList());
+                    backDistanceStr = mapper.writeValueAsString(distance);
                 }
             }
         }
@@ -286,6 +295,8 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
         greenBeltChartVO.setCrossGreenStartList(strArray(crossGreenStartList));
         Collections.reverse(backCrossGreenStartList);
         greenBeltChartVO.setBackCrossGreenStartList(strArray(backCrossGreenStartList));
+        greenBeltChartVO.setDistance(distanceStr);
+        greenBeltChartVO.setBackDistance(backDistanceStr);
         return greenBeltChartVO;
     }
 

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

@@ -43,6 +43,8 @@ public class GreenBeltChartVO {
     private String offset;
     private String crossGreenStartList;
     private String backCrossGreenStartList;
+    private String distance;
+    private String backDistance;
 
     @JsonCreator
     public GreenBeltChartVO(){