From 0dcba4fd1cb536ab426622e31213d8a0194449ff Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 四月 2025 14:12:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPExgMsgReportDriverInfoAck.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPExgMsgReportDriverInfoAck.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPExgMsgReportDriverInfoAck.java
index a01879d..eed7085 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPExgMsgReportDriverInfoAck.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPExgMsgReportDriverInfoAck.java
@@ -64,16 +64,20 @@
 	 * 解析报文
 	 */
 	public UPExgMsgReportDriverInfoAck decode(UPExgMsg exgMsg) {
-		byte[] data = exgMsg.getData();
-		ByteBuf byteBuf = Unpooled.wrappedBuffer(data);
-		this.vehicleNo = exgMsg.getVehicleNo();
-		this.vehicleColor = exgMsg.getVehicleColor();
-		this.dataType = exgMsg.getDataType();
-		this.dataLength = exgMsg.getDataLength();
-		this.driverName = Jtt809Util.readGBKString(byteBuf, 16);
-		this.driverId = Jtt809Util.readGBKString(byteBuf, 20);
-		this.licence = Jtt809Util.readGBKString(byteBuf, 40);
-		this.orgName = Jtt809Util.readGBKString(byteBuf, 200);
+		try {
+			byte[] data = exgMsg.getData();
+			ByteBuf byteBuf = Unpooled.wrappedBuffer(data);
+			this.vehicleNo = exgMsg.getVehicleNo();
+			this.vehicleColor = exgMsg.getVehicleColor();
+			this.dataType = exgMsg.getDataType();
+			this.dataLength = exgMsg.getDataLength();
+			this.driverName = Jtt809Util.readGBKString(byteBuf, 16);
+			this.driverId = Jtt809Util.readGBKString(byteBuf, 20);
+			this.licence = Jtt809Util.readGBKString(byteBuf, 40);
+			this.orgName = Jtt809Util.readGBKString(byteBuf, 200);
+		}catch (Exception e){
+			e.printStackTrace();
+		}
 		return this;
 	}
 }

--
Gitblit v1.7.1