diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java index 88a1a9af..bc259afc 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java @@ -252,10 +252,6 @@ public class Forwarder { } void checkOfflineDevice(String offDeviceId, String refDeviceId1, String refDeviceId2){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - //queryWrapper.eq("tenantid",tenantId); - queryWrapper.eq("state",0); - queryWrapper.eq("deviceid",offDeviceId); GnssStatus offDevice = gnssStatusMapper.getByDeviceId(offDeviceId); if(offDevice == null) return; @@ -308,9 +304,9 @@ public class Forwarder { locationRecord.setB562n(offGnssCalcData.getB562n()+Math.random()*4-2); locationRecord.setB562d(offGnssCalcData.getB562d()+Math.random()*8-4); - locationRecord.setRpose(offGnssCalcData.getRpose()+deltaE); - locationRecord.setRposn(offGnssCalcData.getRposn()+deltaN); - locationRecord.setRposd(offGnssCalcData.getRposd()+deltaD); + locationRecord.setRpose(offGnssCalcData.getRpose()+deltaE*0.5+deltaN*0.5); + locationRecord.setRposn(offGnssCalcData.getRposn()+deltaN*0.8+deltaD*0.2); + locationRecord.setRposd(offGnssCalcData.getRposd()+deltaD*0.8+deltaE*0.2); locationRecord.setPps(-1);//标记为虚拟数据 gnssDataMapper.insert(locationRecord); } diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYForwarder.java index bdd4687d..e2b2611c 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYForwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYForwarder.java @@ -38,6 +38,7 @@ public class ZNYForwarder extends Forwarder{ private void checkDevice() { logger.info("zny checkDevice"); checkOfflineDevice("2345072","2345076","2345064"); + checkOfflineDevice("2345074","2345089","2345071"); } @Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次 diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/tcp/RtcmTcpHandler.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/tcp/RtcmTcpHandler.java index 26cf2953..270db68e 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/tcp/RtcmTcpHandler.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/server/tcp/RtcmTcpHandler.java @@ -6,12 +6,9 @@ import com.imdroid.sideslope.executor.MessageParser; import com.imdroid.sideslope.message.BaseMessage; import com.imdroid.sideslope.server.OnlineChannels; import io.netty.buffer.ByteBuf; -import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; -import io.netty.handler.timeout.IdleState; -import io.netty.handler.timeout.IdleStateEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component;