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

测试：2419385串口1统计没有收到d331，改用TCP推d331

Browse Source
This commit is contained in:
weidong 2024-06-16 00:09:19 +08:00
parent 011a49e008
commit 4f3eeaef93
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import com.imdroid.sideslope.bd.Gga;
import com.imdroid.sideslope.message.D331RtcmMessage;
import com.imdroid.sideslope.sal.Device;
import com.imdroid.sideslope.sal.DeviceService;
import com.imdroid.sideslope.server.DeviceChannel;
import com.imdroid.sideslope.server.OnlineChannels;
import com.imdroid.sideslope.service.DataPersistService;
import io.netty.buffer.ByteBuf;
@ -52,12 +53,21 @@ public class D331RtcmMessageExecutor implements Executor<D331RtcmMessage, Void>
for (Device device : deviceList) {
if (device.getOpMode() != GnssDevice.OP_MODE_USE) continue;
String deviceId = device.getDeviceId();
if(deviceId.equals("2419385")){
DeviceChannel channel = OnlineChannels.INSTANCE.getConfigChannel(deviceId);
if(channel != null && channel.isOnline()){
ByteBuf buf = Unpooled.buffer();
buf.writeBytes(forwardBytes);
channel.writeAndFlush(buf);
}
}
else {
OnlineChannels.INSTANCE.get(deviceId).ifPresent(deviceChannel -> {
if (logger.isDebugEnabled()) {
logger.debug("forward d331 rtcm message to device {}", deviceId);
}
if(deviceId.startsWith("2307")){
forwardBytes[2] = (byte) (forwardBytes[2]&0x07);//兼容不带序号的测站
if (deviceId.startsWith("2307")) {
forwardBytes[2] = (byte) (forwardBytes[2] & 0x07);//兼容不带序号的测站
}
ByteBuf buf = Unpooled.buffer();
buf.writeBytes(forwardBytes);
@ -65,6 +75,7 @@ public class D331RtcmMessageExecutor implements Executor<D331RtcmMessage, Void>
});
}
}
}
// 如果30分钟内收到不到d3f0和d3f2，则根据UDP最后一个报文触发状态更新和统计
LocalDateTime now = LocalDateTime.now();