Imdroid/pwv_ntrip
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：解析设备ID

Browse Source
This commit is contained in:
fengyarnom 2025-05-19 17:20:20 +08:00
parent 1294cc8d4f
commit 3125dc946e
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ntrip_load-main/src/main/java/com/rtklib/TcpRtkServer.java
View File

@ -97,6 +97,13 @@ public class TcpRtkServer implements CommandLineRunner {
rtkData.setLatitude(Double.parseDouble(parts[4])); rtkData.setLatitude(Double.parseDouble(parts[4]));
rtkData.setLongitude(Double.parseDouble(parts[5])); rtkData.setLongitude(Double.parseDouble(parts[5]));
rtkData.setHeight(Double.parseDouble(parts[6])); rtkData.setHeight(Double.parseDouble(parts[6]));
// 获取设备ID (最后一个字段)
if (parts.length > 10) {
rtkData.setDeviceId(parts[parts.length - 1]);
logger.debug("设置设备ID: {}", parts[parts.length - 1]);
}
latestData.set(rtkData); latestData.set(rtkData);
logger.debug("Parsed $POS data: {}", rtkData); logger.debug("Parsed $POS data: {}", rtkData);
} catch (Exception e) { } catch (Exception e) {
@ -110,6 +117,13 @@ public class TcpRtkServer implements CommandLineRunner {
if (rtkData != null) { if (rtkData != null) {
String[] parts = message.split(","); String[] parts = message.split(",");
rtkData.setZtd(Double.parseDouble(parts[5])); rtkData.setZtd(Double.parseDouble(parts[5]));
// 获取设备ID (最后一个字段)
if (parts.length > 6) {
rtkData.setDeviceId(parts[parts.length - 1]);
logger.debug("设置设备ID: {}", parts[parts.length - 1]);
}
latestData.set(rtkData); latestData.set(rtkData);
logger.debug("Updated $TROP data: ZTD={}", parts[5]); logger.debug("Updated $TROP data: ZTD={}", parts[5]);
} }
@ -134,6 +148,13 @@ public class TcpRtkServer implements CommandLineRunner {
rtkData.setZtdGradientNorth(north); rtkData.setZtdGradientNorth(north);
rtkData.setZtdGradientEast(east); rtkData.setZtdGradientEast(east);
// 获取设备ID (最后一个字段)
if (parts.length > 7) {
rtkData.setDeviceId(parts[parts.length - 1]);
logger.debug("设置设备ID: {}", parts[parts.length - 1]);
}
latestData.set(rtkData); latestData.set(rtkData);
logger.info("成功解析$TRPG数据: North={}, East={}", north, east); logger.info("成功解析$TRPG数据: North={}, East={}", north, east);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
@ -169,6 +190,14 @@ public class TcpRtkServer implements CommandLineRunner {
RtkData rtkData = latestData.get(); RtkData rtkData = latestData.get();
if (rtkData != null) { if (rtkData != null) {
rtkData.setSatelliteInfo(message); rtkData.setSatelliteInfo(message);
// 获取设备ID (最后一个字段)
String[] parts = message.split(",");
if (parts.length > 1) {
rtkData.setDeviceId(parts[parts.length - 1]);
logger.debug("设置设备ID: {}", parts[parts.length - 1]);
}
latestData.set(rtkData); latestData.set(rtkData);
logger.debug("Updated $SATE data"); logger.debug("Updated $SATE data");
} }

3
ntrip_load-main/src/main/java/com/rtklib/entity/RtkData.java
View File

@ -45,6 +45,9 @@ public class RtkData {
@Column(name = "pwv") @Column(name = "pwv")
private Double pwv; private Double pwv;
@Column(name = "device_id")
private String deviceId;
@Transient // 不存入数据库的临时字段 @Transient // 不存入数据库的临时字段
private Double surfacePressure; private Double surfacePressure;