From 4aec3ec8152eaf6e9bfa1b093ef6b9e822dc5c2b Mon Sep 17 00:00:00 2001 From: weidong Date: Fri, 15 Aug 2025 10:51:03 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B9=BF=E8=A5=BF=E6=96=B0=E5=8F=91?= =?UTF-8?q?=E5=B1=95=E5=A2=9E=E5=8A=A0=E5=80=BE=E8=A7=92=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/imdroid/secapi/dto/GnssDeviceJoin.java | 3 +++ .../com/imdroid/beidou_fwd/task/Forwarder.java | 15 ++++++++++++++- .../imdroid/beidou_fwd/task/GXXfzForwarder.java | 15 +++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssDeviceJoin.java b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssDeviceJoin.java index 7fdc8e21..c4789606 100644 --- a/sec-api/src/main/java/com/imdroid/secapi/dto/GnssDeviceJoin.java +++ b/sec-api/src/main/java/com/imdroid/secapi/dto/GnssDeviceJoin.java @@ -47,4 +47,7 @@ public class GnssDeviceJoin { Double latitude; Double longitude; + Double roll; + Double pitch; + Double yaw; } diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java index 7e77014c..4f0d47d3 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java @@ -117,6 +117,9 @@ public class Forwarder { .selectAll(GnssDevice.class) .select("d.latitude as latitude") .select("d.longitude as longitude") + .select("d.roll as roll") + .select("d.pitch as pitch") + .select("d.yaw as yaw") .leftJoin("gnssstatus d on t.deviceid = d.deviceid") .and(warpper->warpper.eq("fwd_group_id", fwdGroupId) .or() @@ -128,6 +131,9 @@ public class Forwarder { .selectAll(GnssDevice.class) .select("d.latitude as latitude") .select("d.longitude as longitude") + .select("d.roll as roll") + .select("d.pitch as pitch") + .select("d.yaw as yaw") .leftJoin("gnssstatus d on t.deviceid = d.deviceid") .and(warpper->warpper.eq("fwd_group_id", fwdGroupId) .or() @@ -141,6 +147,9 @@ public class Forwarder { .selectAll(GnssDevice.class) .select("d.latitude as latitude") .select("d.longitude as longitude") + .select("d.roll as roll") + .select("d.pitch as pitch") + .select("d.yaw as yaw") .leftJoin("gnssstatus d on t.deviceid = d.deviceid") .and(warpper->warpper.eq("fwd_group_id", fwdGroupId) .or() @@ -214,7 +223,11 @@ public class Forwarder { // 用r9250来传设备经纬度 record.setR9250e(device.getLongitude()); record.setR9250n(device.getLatitude()); - // 用aux来传基站经纬度 + // 用aux来传xyz + record.setAuxe(device.getRoll()); + record.setAuxn(device.getPitch()); + record.setAuxd(device.getYaw()); + recordsToSend.add(record); break; } diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java index 32c25cd5..5e5202f9 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java @@ -68,6 +68,21 @@ public class GXXfzForwarder extends Forwarder{ // 经纬度 data.setDevLng(locationRecord.getR9250e()); data.setDevLat(locationRecord.getR9250n()); + + //倾角 + XFZData.Data data2 = new XFZData.Data(); + dataList.add(data2); + data2.setDataTime(locationRecord.getCreatetime().format(formatter)); + data2.setDevNum(locationRecord.getDeviceid()); + data2.setDevtype("InclinoMeter"); + // 角度 + data2.setX(NumberUtils.scale(locationRecord.getAuxe(), 3)); + data2.setY(NumberUtils.scale(locationRecord.getAuxn(), 3)); + data2.setZ(NumberUtils.scale(locationRecord.getAuxd(), 3)); + // 经纬度 + data2.setDevLng(locationRecord.getR9250e()); + data2.setDevLat(locationRecord.getR9250n()); + // 发送 batchNum++;