From 9e110d1218bbca1ce83728d04f237de55f29a87d Mon Sep 17 00:00:00 2001 From: yarnom Date: Tue, 28 Oct 2025 16:00:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=96=AD=E8=81=94=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/D331RtcmMessageExecutor.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) 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 90120cd9..e8bf4a19 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 @@ -122,21 +122,14 @@ public class D331RtcmMessageExecutor implements Executor deviceBs.setGeoidSeparation(gga.getGeoidSeparation()); } - // 添加NTRIP处理 + rtkCluster 推送 + // 添加NTRIP处理 if(deviceBs.getForwardToNtrip()) { byte[] srcdata = message.getSrcData(); - String hex = ByteUtil.bytesToHexString(srcdata); - // 1) NTRIP：发送提取后的 RTCM 帧 - sendToNtrip(id, hex); + String rtcm = ByteUtil.bytesToHexString(srcdata); + sendToNtrip(id, rtcm); - // 2) rtkCluster：优先发送干净的 RTCM 帧（去除任何封装），退化时发送原始数据 try { - String rtcmsHex = RtcmGgaUtil.getRtcms(hex).toString(); - if (rtcmsHex != null && !rtcmsHex.isEmpty()) { - rtkClusterService.sendRtcmBytes(id, ByteUtil.hexStringTobyte(rtcmsHex)); - } else { - rtkClusterService.sendRtcmBytes(id, srcdata); - } + rtkClusterService.sendRtcm(id, rtcm); } catch (Exception e) { logger.debug("send to rtkCluster failed for {}: {}", id, e.getMessage()); }