[update] 路口数据车道号调整

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

@@ -1258,7 +1258,7 @@ public class TrendServiceImpl implements TrendService {
 
             String laneId = dto.getLaneId();
             String laneSort = laneId.substring(laneId.length() - 2);
-            element.setLaneSort(Integer.valueOf(laneSort));
+            element.setLaneSort(laneSort);
 
             double staticQueueLength = dto.getStaticQueueLength();
             int staticQueueLengthRound = (int) Math.round(staticQueueLength);
@@ -1365,7 +1365,6 @@ public class TrendServiceImpl implements TrendService {
             vo.setTime(dateFromTimestamp);
 
             vo.setDir(po.getDir());
-            vo.setLaneSort(po.getSort());
             vo.setFlow(po.getFlow());
 
             Double speed = po.getSpeed();
@@ -1408,6 +1407,11 @@ public class TrendServiceImpl implements TrendService {
                 }
             }
             vo.setTurn(turn);
+
+            String dirName = BaseEnum.SignalDirectionEnum.getNameByCode(po.getDir());
+            String turnName = BaseEnum.TurnTypeEnum.getNameByCode(turn);
+            vo.setLaneSort(String.join("-", dirName, turnName, String.valueOf(po.getSort())));
+
             res.add(vo);
         }
 

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

@@ -35,7 +35,7 @@ public class TableQueryVO {
         private Integer dir;
 
         @ApiModelProperty(value = "车道，从左车道开始编号11、12、13...")
-        private Integer laneSort;
+        private String laneSort;
 
         @ApiModelProperty(value = "排队长度")
         private Integer queueLength;
@@ -61,7 +61,7 @@ public class TableQueryVO {
         private Integer turn;
 
         @ApiModelProperty(value = "车道，从左车道开始编号11、12、13...")
-        private Integer laneSort;
+        private String laneSort;
 
         @ApiModelProperty(value = "流量")
         private Integer flow;

wj-common/src/main/java/net/wanji/common/enums/BaseEnum.java

@@ -257,6 +257,15 @@ public class BaseEnum {
             return null;
         }
 
+        public static String getNameByCode(Integer turn) {
+            for (TurnTypeEnum testEnums : TurnTypeEnum.values()) {
+                if (Objects.equals(testEnums.getIntCode(), turn)) {
+                    return testEnums.getName();
+                }
+            }
+            return null;
+        }
+
     }
 
     /**