[add] 绿波图优化

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

@@ -37,8 +37,8 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
             }
             ObjectMapper mapper = JacksonUtils.getInstance();
             QueryWrapper<StrategyGreenOptHistEntity> queryWrapper = new QueryWrapper<>();
-            String customOrderBy = "ABS(DATEDIFF(control_time, '" + queryDate + "'))";
-            queryWrapper.orderByAsc(true, customOrderBy);
+            queryWrapper.eq("green_id", greenId);
+            queryWrapper.orderByDesc("control_time");
             queryWrapper.last("LIMIT 2");
             List<StrategyGreenOptHistEntity> entities = strategyGreenOptHistMapper.selectList(queryWrapper);
             if (!CollectionUtils.isEmpty(entities)) {
@@ -54,7 +54,6 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
                     setBeltInfo(mapper, entities, greenBeltInfoVO, dirGreenDetails);
                 }
                 greenBeltInfoVO.setDirGreenDetails(dirGreenDetails);
-                System.err.println(greenBeltInfoVO);
                 GreenBeltChartVO greenBeltChartVO = calGreenChart(greenBeltInfoVO);
                 return greenBeltChartVO;
             }
@@ -96,6 +95,9 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
         Map<String, Double> crossGreenStartMap = new TreeMap<>();
         Map<String, Double> backCrossGreenStartMap = new TreeMap<>();
         Map<String, Double> distanceMap = new TreeMap<>();
+        Map<String, Double> backDistanceMap = new TreeMap<>();
+        String decideSpeed = "";
+        String backDecideSpeed = "";
         // 处理绿波时序图数据
         List<GreenBeltInfoVO.DirGreenDetail> dirGreenDetails = greenBeltInfoVO.getDirGreenDetails();
         Double greenWidthTime = 0.0;
@@ -108,12 +110,14 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
                     greenWidthTime = dirGreenDetail.getGreenWidthTime();
                     List<GreenBeltInfoVO.CrossGreenDetail> list = dirGreenDetail.getCrossGreenDetailList();
                     getaDouble(crossRedTimesMap, crossGreenStartMap, distanceMap, cycle, list);
+                    decideSpeed = String.join("~", String.valueOf(dirGreenDetail.getMinSpeed()), String.valueOf(dirGreenDetail.getMaxSpeed()));
                 }
                 if (dirType == 0) {
+                    backDecideSpeed = String.join("~", String.valueOf(dirGreenDetail.getMinSpeed()), String.valueOf(dirGreenDetail.getMaxSpeed()));
                     backGreenWidthTime = dirGreenDetail.getGreenWidthTime();
                     List<GreenBeltInfoVO.CrossGreenDetail> list = dirGreenDetail.getCrossGreenDetailList();
                     Collections.reverse(list);
-                    getaDouble(backCrossRedTimesMap, backCrossGreenStartMap, distanceMap, cycle, list);
+                    getaDouble(backCrossRedTimesMap, backCrossGreenStartMap, backDistanceMap, cycle, list);
 
                 }
             }
@@ -126,6 +130,8 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
         greenBeltChartVO.setGreenStartMap(mapper.writeValueAsString(crossGreenStartMap));
         greenBeltChartVO.setBackGreenStartMap(mapper.writeValueAsString(backCrossGreenStartMap));
         greenBeltChartVO.setDistanceMap(mapper.writeValueAsString(distanceMap));
+        greenBeltChartVO.setDecideSpeed(decideSpeed.concat("km/h"));
+        greenBeltChartVO.setBackDecideSpeed(backDecideSpeed.concat("km/h"));
         return greenBeltChartVO;
     }
 

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

@@ -41,6 +41,8 @@ public class GreenBeltChartVO {
     private Double greenWidthTime;
     @ApiModelProperty("反向绿波带宽")
     private Double BackGreenWidthTime;
+    private String decideSpeed;
+    private String backDecideSpeed;
 
     @JsonCreator
     public GreenBeltChartVO(){