AI事件 应急车道 上下行修改

zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java

@@ -181,6 +181,9 @@ public class DeviceMessageHandler {
             // 子类型
             dcWarning.setWarningSubclass(warningSubclass);
             //桩号，方向
+//车道
+            Integer relatedLaneNo = data.getInteger("relatedLaneNo");
+
             String stakeMarkDescription = data.getString("stakeMarkDescription");
             String direction = "";
             String[] arr = stakeMarkDescription.split(" ");
@@ -188,18 +191,20 @@ public class DeviceMessageHandler {
             if (arr[2] != null) {
                 if (arr[2].equals("上行")) {
                     direction = arr[0] + " " + arr[1] + " 菏泽方向 ";
-                    Integer relatedLaneNo = data.getInteger("relatedLaneNo");
+                    if (warningSubclass.equals("4-7")) {
                         if (relatedLaneNo == 5) {
                             relatedLaneNo = 0;
                         }
-                    dcWarning.setLane(String.valueOf(relatedLaneNo));
+                    }
-
                 }
                 if (arr[2].equals("下行")) {
                     direction = arr[0] + " " + arr[1] + " 济南方向 ";
-                    dcWarning.setLane(String.valueOf(data.getInteger("relatedLaneNo")-1));
+                    if (warningSubclass.equals("4-7")) {
+                        relatedLaneNo = data.getInteger("relatedLaneNo") - 1;
                     }
                 }
+            }
+            dcWarning.setLane(String.valueOf(relatedLaneNo));
 
             String title = direction + WarningSubclassEnum.getDecorateInfo(warningSubclass);
             // 标题