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/UPExgMsgHistoryLocation.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPExgMsgHistoryLocation.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPExgMsgHistoryLocation.java
index 5221590..4a5cdf3 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPExgMsgHistoryLocation.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPExgMsgHistoryLocation.java
@@ -56,18 +56,22 @@
 	 * 解析报文
 	 */
 	public UPExgMsgHistoryLocation 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.gnssCnt = byteBuf.readByte();
-		List<GnssData> gnssData = new ArrayList<>();
-		for (int i = 0; i < this.gnssCnt; i++) {
-			gnssData.add(new GnssData().decode(byteBuf));
+		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.gnssCnt = byteBuf.readByte();
+			List<GnssData> gnssData = new ArrayList<>();
+			for (int i = 0; i < this.gnssCnt; i++) {
+				gnssData.add(new GnssData().decode(byteBuf));
+			}
+			this.gnssData = gnssData;
+		}catch (Exception e){
+			e.printStackTrace();
 		}
-		this.gnssData = gnssData;
 		return this;
 	}
 }

--
Gitblit v1.7.1