Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Revert "基站数据流插入1005"

Browse Source 
This reverts commit 68e9f63929fce404d80618f53047f1cf1a8a9d7d.
This commit is contained in:
yarnom 2025-11-17 17:53:11 +08:00
parent 68e9f63929
commit 21da58fd8a
1 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java
View File

@ -183,35 +183,15 @@ public class D331RtcmMessageExecutor implements Executor<D331RtcmMessage, Void>
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("forward d331 rtcm from {} to device {}", deviceBs.getDeviceId(), deviceId); logger.debug("forward d331 rtcm from {} to device {}", deviceBs.getDeviceId(), deviceId);
} }
// 为每个设备生成独立的数据副本，确保按需修改（如2307）不影响其他设备
byte[] perDeviceBytes = forwardBytes;
if(deviceId.startsWith("2307")){
// 处理2307型号的测站，兼容不带序号的测站（修改应发生在写入 ByteBuf 之前）
perDeviceBytes = forwardBytes.clone();
perDeviceBytes[2] = (byte) (perDeviceBytes[2] & 0x07);
}
ByteBuf buf = Unpooled.buffer(); ByteBuf buf = Unpooled.buffer();
buf.writeBytes(perDeviceBytes); buf.writeBytes(forwardBytes);
// 推送策略： //推送策略：F9P基站（505）兼容博通（510）推送 添加指定基站ID的推送
// 1) 保持原 F9P（505）→ 博通（510）兼容逻辑不变
// 2) 仅对指定基站 ID 追加 1005（不影响其它基站）
boolean needInsert1005 = false;
if ((deviceBs.getModel()==null || deviceBs.getModel() == GnssDevice.MODEL_G505) && if ((deviceBs.getModel()==null || deviceBs.getModel() == GnssDevice.MODEL_G505) &&
(device.getModel()!=null && device.getModel()==GnssDevice.MODEL_G510)) { (device.getModel()!=null && device.getModel()==GnssDevice.MODEL_G510)||
needInsert1005 = true; // 原兼容逻辑 TARGET_BASE_STATION_ID_FOR_1005.equals(deviceBs.getDeviceId())){
}
if (TARGET_BASE_STATION_ID_FOR_1005.equals(deviceBs.getDeviceId())) {
needInsert1005 = true; // 仅特定基站额外插入
}
if (needInsert1005) {
buf = insert1005(deviceBs, deviceId, buf); buf = insert1005(deviceBs, deviceId, buf);
} }
// 实际发送到设备通道
deviceChannel.writeAndFlush(buf);
} }
} }
@ -226,9 +206,7 @@ public class D331RtcmMessageExecutor implements Executor<D331RtcmMessage, Void>
//logger.info("Adding D300 string for device: {}", deviceId); //logger.info("Adding D300 string for device: {}", deviceId);
// 获取当前buf中的数据 // 获取当前buf中的数据
int readableLen = buf.readableBytes(); byte[] originalData = buf.array();
byte[] originalData = new byte[readableLen];
buf.getBytes(0, originalData);
String originalHex = ByteUtil.bytesToHexString(originalData); String originalHex = ByteUtil.bytesToHexString(originalData);
// 找到D300和D301的位置 // 找到D300和D301的位置