From 1d3c2136eea9788b5a5eab07784547e10bc7cc25 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 六月 2025 15:55:04 +0800
Subject: [PATCH] 优化报警
---
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