[add] 策略管理策略列表优化

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

@@ -266,6 +266,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                         strategyControlDataEntity.setBizId(baseCrossInfoPO.getId());
                         // 转化成 0 畅通 1失衡 2拥堵 3溢出 4死锁 5空放 6干线拥堵 7干线缓行 8干线畅通
                         strategyControlDataEntity.setStrategy(0);
+                        strategyControlDataEntity.setOptMethod("均衡调控");
                         strategyControlDataEntity.setTime(null);
                         strategyControlDataEntity.setStatus(0);
                         if (map.containsKey(crossId)) {

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

@@ -156,18 +156,19 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
 
     private static GreenBeltChartVO calGreenChart(GreenBeltInfoVO greenBeltInfoVO) throws JsonProcessingException {
         ObjectMapper mapper = JacksonUtils.getInstance();
-        Map<String, List<List<Double>>> crossRedTimesMap = new TreeMap<>();
-        Map<String, List<List<Double>>> backCrossRedTimesMap = new TreeMap<>();
-        Map<String, Double> crossGreenStartMap = new TreeMap<>();
-        Map<String, Double> backCrossGreenStartMap = new TreeMap<>();
-        Map<String, Double> distanceMap = new TreeMap<>();
-        Map<String, Double> backDistanceMap = new TreeMap<>();
+        Map<String, List<List<Double>>> crossRedTimesMap = new LinkedHashMap<>();
+        Map<String, List<List<Double>>> backCrossRedTimesMap = new LinkedHashMap<>();
+        Map<String, Double> crossGreenStartMap = new LinkedHashMap<>();
+        Map<String, Double> backCrossGreenStartMap = new LinkedHashMap<>();
+        Map<String, Double> distanceMap = new LinkedHashMap<>();
+        Map<String, Double> backDistanceMap = new LinkedHashMap<>();
         String decideSpeed = "";
         String backDecideSpeed = "";
         String crossSpeed = "";
         String backCrossSpeed = "";
         String travelTime = "";
         String backtravelTime = "";
+        String offset = "";
         // 处理绿波时序图数据
         List<GreenBeltInfoVO.DirGreenDetail> dirGreenDetails = greenBeltInfoVO.getDirGreenDetails();
         Double greenWidthTime = 0.0;
@@ -191,6 +192,8 @@ 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);
                 }
                 if (dirType == 0) {
                     backDecideSpeed = String.join("~", String.valueOf(dirGreenDetail.getMinSpeed()), String.valueOf(dirGreenDetail.getMaxSpeed()));
@@ -214,6 +217,7 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
         GreenBeltChartVO greenBeltChartVO = new GreenBeltChartVO();
         greenBeltChartVO.setGreenWidthTime(greenWidthTime);
         greenBeltChartVO.setBackGreenWidthTime(backGreenWidthTime);
+
         greenBeltChartVO.setCrossRedTimesMap(mapper.writeValueAsString(crossRedTimesMap));
         greenBeltChartVO.setBackCrossRedTimesMap(mapper.writeValueAsString(backCrossRedTimesMap));
         greenBeltChartVO.setGreenStartMap(mapper.writeValueAsString(crossGreenStartMap));
@@ -225,6 +229,7 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
         greenBeltChartVO.setBackTravelTime(backtravelTime);
         greenBeltChartVO.setCrossSpeed(crossSpeed);
         greenBeltChartVO.setBackCrossSpeed(backCrossSpeed);
+        greenBeltChartVO.setOffset(offset);
         return greenBeltChartVO;
     }
 

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

@@ -47,6 +47,7 @@ public class GreenBeltChartVO {
     private String backTravelTime;
     private String crossSpeed;
     private String backCrossSpeed;
+    private String offset;
 
     @JsonCreator
     public GreenBeltChartVO(){