1、不根据1005判断是否推送,而是是否有固定解

This commit is contained in:
weidong 2025-04-28 20:31:46 +08:00
parent c4ed5e6d3f
commit 007ad0efcb

View File

@ -6,7 +6,6 @@ import com.imdroid.secapi.client.BeidouClient;
import com.imdroid.secapi.dto.GnssDevice; import com.imdroid.secapi.dto.GnssDevice;
import com.imdroid.common.util.ByteUtil; import com.imdroid.common.util.ByteUtil;
import com.imdroid.sideslope.bd.Gga; import com.imdroid.sideslope.bd.Gga;
import com.imdroid.sideslope.bd.UBXUtil;
import com.imdroid.sideslope.message.D331RtcmMessage; import com.imdroid.sideslope.message.D331RtcmMessage;
import com.imdroid.sideslope.ntrip.UdpNtripServer; import com.imdroid.sideslope.ntrip.UdpNtripServer;
import com.imdroid.sideslope.service.Device; import com.imdroid.sideslope.service.Device;
@ -15,7 +14,6 @@ import com.imdroid.sideslope.server.DeviceChannel;
import com.imdroid.sideslope.server.OnlineChannels; import com.imdroid.sideslope.server.OnlineChannels;
import com.imdroid.sideslope.service.DataPersistService; import com.imdroid.sideslope.service.DataPersistService;
import com.imdroid.sideslope.bd.RtcmGgaUtil; import com.imdroid.sideslope.bd.RtcmGgaUtil;
//import com.imdroid.common.util.RtcmGgaUtil;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -62,7 +60,8 @@ public class D331RtcmMessageExecutor implements Executor<D331RtcmMessage, Void>
for (Device device : deviceList) { for (Device device : deviceList) {
if (device.getOpMode() != GnssDevice.OP_MODE_USE) continue; if (device.getOpMode() != GnssDevice.OP_MODE_USE) continue;
if (device.getGnssSampleRate()>1 && (deviceBs.getD3xxCount()%device.getGnssSampleRate()) != 0) { if (device.getGnssSampleRate()>1 && (deviceBs.getD3xxCount()%device.getGnssSampleRate()) != 0) {
if(!UBXUtil.has1005(forwardBytes)) continue; //1005必推 //if(!UBXUtil.has1005(forwardBytes)) continue; //1005必推
if(device.getFixedNum()>0) continue;
} }
String deviceId = device.getDeviceId(); String deviceId = device.getDeviceId();
if(device.getDataChannelType() == Device.CHANNEL_TYPE_UDP) { if(device.getDataChannelType() == Device.CHANNEL_TYPE_UDP) {