From 5393e1b43f7148adc93dd5a29f7b6fd4a054eec6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 05 六月 2025 16:13:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/GnssData.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/GnssData.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/GnssData.java
index ed708b8..1d720e1 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/GnssData.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/GnssData.java
@@ -81,24 +81,28 @@
* 解析报文
*/
public GnssData decode(ByteBuf byteBuf) {
- this.encrypt = byteBuf.readByte();
- int d = byteBuf.readByte();
- int m = byteBuf.readByte();
- int y = byteBuf.readShort();
- this.date = y + "-" + String.format("%02d", m) + "-" + String.format("%02d", d);
- int h = byteBuf.readByte();
- int mi = byteBuf.readByte();
- int s = byteBuf.readByte();
- this.time = String.format("%02d", h) + ":" + String.format("%02d", mi) + ":" + String.format("%02d", s);
- this.lon = byteBuf.readInt();
- this.lat = byteBuf.readInt();
- this.vec1 = byteBuf.readShort();
- this.vec2 = byteBuf.readShort();
- this.vec3 = byteBuf.readInt();
- this.direction = byteBuf.readShort();
- this.altitude = byteBuf.readShort();
- this.state = byteBuf.readInt();
- this.alarm = byteBuf.readInt();
+ try {
+ this.encrypt = byteBuf.readByte();
+ int d = byteBuf.readByte();
+ int m = byteBuf.readByte();
+ int y = byteBuf.readShort();
+ this.date = y + "-" + String.format("%02d", m) + "-" + String.format("%02d", d);
+ int h = byteBuf.readByte();
+ int mi = byteBuf.readByte();
+ int s = byteBuf.readByte();
+ this.time = String.format("%02d", h) + ":" + String.format("%02d", mi) + ":" + String.format("%02d", s);
+ this.lon = byteBuf.readInt();
+ this.lat = byteBuf.readInt();
+ this.vec1 = byteBuf.readShort();
+ this.vec2 = byteBuf.readShort();
+ this.vec3 = byteBuf.readInt();
+ this.direction = byteBuf.readShort();
+ this.altitude = byteBuf.readShort();
+ this.state = byteBuf.readInt();
+ this.alarm = byteBuf.readInt();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
return this;
}
}
--
Gitblit v1.7.1