Compare commits

..

No commits in common. "16059ee5d4568be21757a1401f755ebffda70ca1" and "acb05152521b17f24697d69eaae97e15bece951a" have entirely different histories.

View File

@ -50,9 +50,6 @@ public class D331RtcmMessageExecutor implements Executor<D331RtcmMessage, Void>
@Autowired @Autowired
private GNSSDataCalcService gnssCalcService; private GNSSDataCalcService gnssCalcService;
// 指定仅对该基站启用1005插入功能请将值替换为目标基站ID
private static final String TARGET_BASE_STATION_ID_FOR_1005 = "6541918";
// 添加一个成员变量用于追踪每个测站最后一次转发D300数据的时间 // 添加一个成员变量用于追踪每个测站最后一次转发D300数据的时间
private final Map<String, Long> lastD300ForwardTimeMap = new ConcurrentHashMap<>(); private final Map<String, Long> lastD300ForwardTimeMap = new ConcurrentHashMap<>();
private static final long D300_FORWARD_INTERVAL = 5000; // 5秒单位毫秒 private static final long D300_FORWARD_INTERVAL = 5000; // 5秒单位毫秒
@ -186,13 +183,14 @@ public class D331RtcmMessageExecutor implements Executor<D331RtcmMessage, Void>
ByteBuf buf = Unpooled.buffer(); ByteBuf buf = Unpooled.buffer();
buf.writeBytes(forwardBytes); buf.writeBytes(forwardBytes);
//推送策略F9P基站505兼容博通510推送 添加指定基站ID的推送 //推送策略F9P基站505兼容博通510推送
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)){
TARGET_BASE_STATION_ID_FOR_1005.equals(deviceBs.getDeviceId())){
buf = insert1005(deviceBs, deviceId, buf); buf = insert1005(deviceBs, deviceId, buf);
} }
deviceChannel.writeAndFlush(buf);
}
} }
private ByteBuf insert1005(Device deviceBs, String deviceId, ByteBuf buf){ private ByteBuf insert1005(Device deviceBs, String deviceId, ByteBuf buf){