From ea135161eff1dd7c71c159be948e93b50fd1db81 Mon Sep 17 00:00:00 2001
From: 826220679@qq.com <826220679@qq.com>
Date: 星期日, 24 八月 2025 22:40:16 +0800
Subject: [PATCH] 0824

---
 src/publicsWay/PacketProcessingSystemB.java |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/publicsWay/PacketProcessingSystemB.java b/src/publicsWay/PacketProcessingSystemB.java
index 6b3ed9f..d2a47bb 100644
--- a/src/publicsWay/PacketProcessingSystemB.java
+++ b/src/publicsWay/PacketProcessingSystemB.java
@@ -9,6 +9,7 @@
 import java.util.regex.Matcher;
 import dell_system.MessageViewPanel;
 import dell_targets.Dell_tag;
+import targets.LocationTag;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -211,20 +212,30 @@
 		Dell_tag.updateLocationTagProperty(deviceId, "differentialTime",differentialTime);
 		
 		// 创建TrackData对象并添加到批量插入器
+		LocationTag tag = Dell_tag.getTagByDeviceId(deviceId);
+		String deviceName = tag != null ? tag.getDeviceName() : "";
+		String company = tag != null ? tag.getCompany() : "";
 		TrackData trackData = new TrackData(
-	        parser.getDeviceId(),
-	        parser.getUtcTime(),
-	        parser.getLatitude(),
-	        parser.getLongitude(),
-	        parser.getQuality(),
-	        parser.getSatellites(),
-	        parser.getHdop(),
-	        parser.getAltitude(),
-	        parser.getGeoidHeight(),
-	        parser.getDifferentialTime(),
-	        parser.getBattery()
-	    );
-	    
+			    deviceId, 
+			    deviceName, 
+			    "", 
+			    "",
+			    "", 
+			    "", 
+			    battery, 
+			    utcTime, 
+			    longitude,
+			    latitude, 
+			    quality, 
+			    satellites, 
+			    hdop,
+			    altitude, 
+			    geoidHeight, 
+			    differentialTime, 
+			    "GNGGA",
+			    company, 
+			    time
+			);	    
 	    TrackDataBatchInserter.addTrackData(trackData);
 
 	}

--
Gitblit v1.9.3