From cab404b1a79927964a546a118cf4c171fa0bbfdf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 21 三月 2025 19:34:27 +0800
Subject: [PATCH] 新增加管理后台接口和对接音视频协议

---
 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/GnssData.java |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 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 fcc647c..ed708b8 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
@@ -24,13 +24,13 @@
 	/**
 	 * 日月年
 	 */
-	@Field(type = FieldType.Integer)
-	private int date;
+	@Field(type = FieldType.Text)
+	private String date;
 	/**
 	 * 时分秒
 	 */
-	@Field(type = FieldType.Integer)
-	private int time;
+	@Field(type = FieldType.Text)
+	private String time;
 	/**
 	 * 经度
 	 */
@@ -82,13 +82,14 @@
 	 */
 	public GnssData decode(ByteBuf byteBuf) {
 		this.encrypt = byteBuf.readByte();
-		this.date = byteBuf.readInt();
-		ByteBuf byteBuf1 = byteBuf.readBytes(3);
-		StringBuilder t = new StringBuilder();
-		for (int i = 0; i < 3; i++) {
-			t.append(byteBuf1.getByte(i));
-		}
-		this.time = Integer.valueOf(t.toString());
+		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();

--
Gitblit v1.7.1