From fd74ab1958c336d1087037c516dfa3e8b8d3d61e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 八月 2025 11:13:26 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgUrgeTodoAck.java |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgUrgeTodoAck.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgUrgeTodoAck.java
index 2e55fc0..be275ec 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgUrgeTodoAck.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgUrgeTodoAck.java
@@ -40,8 +40,8 @@
 	/**
 	 * 报警督办ID
 	 */
-	@Field(type = FieldType.Integer)
-	private int supervisionId;
+	@Field(type = FieldType.Object)
+	private Object supervisionId;
 	/**
 	 * 报警处理结果
 	 * 0x00:处理中
@@ -57,17 +57,21 @@
 	 * 解析报文
 	 */
 	public UPWarnMsgUrgeTodoAck decode(WarnMsg warnMsg) {
-		byte[] data = warnMsg.getData();
-		ByteBuf byteBuf = Unpooled.wrappedBuffer(data);
-		this.vehicleNo = warnMsg.getVehicleNo();
-		this.vehicleColor = warnMsg.getVehicleColor();
-		this.dataType = warnMsg.getDataType();
-		this.dataLength = warnMsg.getDataLength();
-		
-		//报警督办ID
-		this.supervisionId = byteBuf.readInt();
-		//报警处理结果
-		this.result = byteBuf.readByte();
+		try {
+			byte[] data = warnMsg.getData();
+			ByteBuf byteBuf = Unpooled.wrappedBuffer(data);
+			this.vehicleNo = warnMsg.getVehicleNo();
+			this.vehicleColor = warnMsg.getVehicleColor();
+			this.dataType = warnMsg.getDataType();
+			this.dataLength = warnMsg.getDataLength();
+			
+			//报警督办ID
+			this.supervisionId = byteBuf.readInt();
+			//报警处理结果
+			this.result = byteBuf.readByte();
+		}catch (Exception e){
+			e.printStackTrace();
+		}
 		return this;
 	}
 }

--
Gitblit v1.7.1