From 6186cf6d7a9295b8e19a076793d249a732c26b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Sun, 28 Apr 2024 14:28:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?AI=E4=BA=8B=E4=BB=B6=20=E5=BA=94=E6=80=A5?=
=?UTF-8?q?=E8=BD=A6=E9=81=93=20=E4=B8=8A=E4=B8=8B=E8=A1=8C=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../device/handler/DeviceMessageHandler.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java
index e5eb11de..c1410b23 100644
--- a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java
+++ b/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 (relatedLaneNo==5){
- relatedLaneNo=0;
+ 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);
// 标题
From 964410eb0ff9e452c4981e8a8ac1549ba2abbab3 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Sun, 28 Apr 2024 16:22:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9D=9E=E6=9C=BA=E9=A2=84=E8=AD=A6?=
=?UTF-8?q?=E5=85=B3=E8=81=94=E6=94=B6=E8=B4=B9=E7=AB=99=E7=B1=BB=E5=9E=8B?=
=?UTF-8?q?=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/business/DcPerceivedEventsWarningMapper.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
index 93277c96..de518f99 100644
--- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
@@ -28,7 +28,7 @@
where warning.`id`=#{id}