From b3e3805b7422e52197c1cdd9ef719f7b75d7058a Mon Sep 17 00:00:00 2001 From: yarnom Date: Mon, 17 Nov 2025 18:41:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A5=E5=BF=97=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E4=B8=BAinfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/D331RtcmMessageExecutor.java | 10 ++---- .../beidou/util/GeoCoordConverterUtil.java | 33 ------------------- .../common/util}/GeoCoordConverterUtil.java | 2 +- 3 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 sec-beidou/src/main/java/com/imdroid/beidou/util/GeoCoordConverterUtil.java rename {sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd => sec-common/src/main/java/com/imdroid/common/util}/GeoCoordConverterUtil.java (99%) diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java index 04d29736..e4d79c14 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java @@ -269,13 +269,9 @@ public class D331RtcmMessageExecutor implements Executor // ByteUtil.bytesToHexString(buf.array())); } - if (logger.isDebugEnabled()) { - try { - logger.debug("insert1005 hex for base {} to {}: {}", - deviceBs.getDeviceId(), deviceId, - ByteUtil.bytesToHexString(buf1005.array())); - } catch (Exception ignore) {} - } + logger.info("insert1005 hex for base {} to {}: {}", + deviceBs.getDeviceId(), deviceId, + ByteUtil.bytesToHexString(buf1005.array())); return buf1005; } diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/util/GeoCoordConverterUtil.java b/sec-beidou/src/main/java/com/imdroid/beidou/util/GeoCoordConverterUtil.java deleted file mode 100644 index 11783e72..00000000 --- a/sec-beidou/src/main/java/com/imdroid/beidou/util/GeoCoordConverterUtil.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.imdroid.beidou.util; - -public class GeoCoordConverterUtil { - public static class LLA_Coordinate { - public double Latitude; - public double Longitude; - public double Altitude; - public LLA_Coordinate(double lat,double lon,double alt){ this.Latitude=lat; this.Longitude=lon; this.Altitude=alt; } - } - public static class ECEF_Coordinate { - public double ECEF_X; - public double ECEF_Y; - public double ECEF_Z; - public ECEF_Coordinate(double x,double y,double z){ this.ECEF_X=x; this.ECEF_Y=y; this.ECEF_Z=z; } - } - public static ECEF_Coordinate LLA2ECEF(LLA_Coordinate L){ - double a = 6378137.0; - double e2 = 6.69437999014e-3; - double lat = Math.toRadians(L.Latitude); - double lon = Math.toRadians(L.Longitude); - double h = L.Altitude; - double sinLat = Math.sin(lat); - double cosLat = Math.cos(lat); - double cosLon = Math.cos(lon); - double sinLon = Math.sin(lon); - double N = a / Math.sqrt(1 - e2 * sinLat * sinLat); - double x = (N + h) * cosLat * cosLon; - double y = (N + h) * cosLat * sinLon; - double z = (N * (1 - e2) + h) * sinLat; - return new ECEF_Coordinate(x,y,z); - } -} - diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/GeoCoordConverterUtil.java b/sec-common/src/main/java/com/imdroid/common/util/GeoCoordConverterUtil.java similarity index 99% rename from sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/GeoCoordConverterUtil.java rename to sec-common/src/main/java/com/imdroid/common/util/GeoCoordConverterUtil.java index 6f0fd951..361cd851 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/GeoCoordConverterUtil.java +++ b/sec-common/src/main/java/com/imdroid/common/util/GeoCoordConverterUtil.java @@ -1,4 +1,4 @@ -package com.imdroid.sideslope.bd; +package com.imdroid.common.util; import static java.lang.Math.*;