diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/service/TCPClient.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/service/TCPClient.java index 587c7bdc..a5168ce2 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/service/TCPClient.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/service/TCPClient.java @@ -1,6 +1,5 @@ package com.imdroid.beidou_fwd.service; -import com.imdroid.common.util.ThreadManager; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -13,7 +12,6 @@ import org.slf4j.LoggerFactory; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; -import java.util.concurrent.TimeUnit; public class TCPClient { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -93,7 +91,7 @@ public class TCPClient { new Thread(this::connect, host+":"+port+" forwarder tcp-client").start(); for(int i=0; i<20; i++){ Thread.sleep(50); - if(channel.isActive()) return true; + if(channel!=null && channel.isActive()) return true; } return false; } @@ -102,7 +100,7 @@ public class TCPClient { ByteBuf sendBuffer = Unpooled.buffer(); sendBuffer.writeBytes(json.getBytes(StandardCharsets.UTF_8)); logger.info("send to {}: {}",host,json); - if(!channel.isActive()){ + if(channel==null || !channel.isActive()){ try { if(!tryReconnect()) return; } catch (Exception e) { diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJSForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJSForwarder.java index 49dc92e7..da2f3c47 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJSForwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJSForwarder.java @@ -34,7 +34,7 @@ public class GXJSForwarder extends GXXfzForwarder{ /** * 每半小时转发GNSS解算结果 */ - @Scheduled(cron = "0 15,45 * * * ?") // 每30分钟执行一次 + @Scheduled(cron = "0 0/10 * * * ?") // 每30分钟执行一次 private void forwardGnss() { if(!enabled) return; logger.debug("gxjs forwardGnss"); diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java index fb644827..159a8b04 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java @@ -71,7 +71,7 @@ public class GXXfzForwarder extends Forwarder{ // 发送 batchNum++; - if(batchNum==50){ + if(batchNum==20){ String json = "#" + GsonUtil.toJson(xfzTcpMessage) + "!"; //logger.debug("project {}: forwad {} gnss records to {}",projectId, dataList.size(),fwdGroupId); //logger.debug(json);