[add] 路口绿波速度

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

@@ -164,6 +164,8 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
         Map<String, Double> backDistanceMap = new TreeMap<>();
         String decideSpeed = "";
         String backDecideSpeed = "";
+        String crossSpeed = "";
+        String backCrossSpeed = "";
         String travelTime = "";
         String backtravelTime = "";
         // 处理绿波时序图数据
@@ -181,6 +183,8 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
                     decideSpeed = String.join("~", String.valueOf(dirGreenDetail.getMinSpeed()), String.valueOf(dirGreenDetail.getMaxSpeed()));
                     List<Double> travelTimeList = list.stream().map(GreenBeltInfoVO.CrossGreenDetail::getTravelTime).collect(Collectors.toList());
                     travelTime = mapper.writeValueAsString(travelTimeList);
+                    List<Double> speedList = list.stream().map(GreenBeltInfoVO.CrossGreenDetail::getSpeed).collect(Collectors.toList());
+                    crossSpeed = mapper.writeValueAsString(speedList);
                 }
                 if (dirType == 0) {
                     backDecideSpeed = String.join("~", String.valueOf(dirGreenDetail.getMinSpeed()), String.valueOf(dirGreenDetail.getMaxSpeed()));
@@ -190,6 +194,8 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
                     getaDouble(backCrossRedTimesMap, backCrossGreenStartMap, backDistanceMap, cycle, list);
                     List<Double> travelTimeList = list.stream().map(GreenBeltInfoVO.CrossGreenDetail::getTravelTime).collect(Collectors.toList());
                     backtravelTime = mapper.writeValueAsString(travelTimeList);
+                    List<Double> speedList = list.stream().map(GreenBeltInfoVO.CrossGreenDetail::getSpeed).collect(Collectors.toList());
+                    backCrossSpeed = mapper.writeValueAsString(speedList);
                 }
             }
         }
@@ -205,6 +211,8 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
         greenBeltChartVO.setBackDecideSpeed(backDecideSpeed.concat("km/h"));
         greenBeltChartVO.setTravelTime(travelTime);
         greenBeltChartVO.setBackTravelTime(backtravelTime);
+        greenBeltChartVO.setCrossSpeed(crossSpeed);
+        greenBeltChartVO.setBackCrossSpeed(backCrossSpeed);
         return greenBeltChartVO;
     }
 

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

@@ -45,6 +45,8 @@ public class GreenBeltChartVO {
     private String backDecideSpeed;
     private String travelTime;
     private String backTravelTime;
+    private String crossSpeed;
+    private String backCrossSpeed;
 
     @JsonCreator
     public GreenBeltChartVO(){