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 568a17b0..a3b05a1d 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 @@ -119,7 +119,7 @@ public class TCPClient { } catch (Exception e) { logger.error(e.toString()); } - },isIdle?60:10, TimeUnit.SECONDS); + },isIdle?30:10, TimeUnit.SECONDS); } } 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 c224d009..668c78df 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 @@ -7,7 +7,6 @@ import com.imdroid.common.util.GsonUtil; import com.imdroid.common.util.NumberUtils; import com.imdroid.secapi.dto.GnssCalcData; -import javax.annotation.PostConstruct; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -15,7 +14,7 @@ import java.util.List; public class GXXfzForwarder extends Forwarder{ TCPClient xfzTcpClient; - static class XFZTCPListener implements TCPListener{ + class XFZTCPListener implements TCPListener{ public static final int STATE_NO_ACK = 0; public static final int STATE_OK = 1; public static final int STATE_FAILED = 2; @@ -36,6 +35,7 @@ public class GXXfzForwarder extends Forwarder{ @Override public void onMessage(String msg) { + logger.info("{} client rx: {}",fwdGroupId, msg); if(msg.contains("succeed")) state = STATE_OK; else state = STATE_FAILED; } @@ -108,8 +108,8 @@ public class GXXfzForwarder extends Forwarder{ boolean checkResult() throws InterruptedException { // 等待应答,最多等1s - for(int i=0; i<10; i++){ - Thread.sleep(100); + for(int i=0; i<20; i++){ + Thread.sleep(50); if(listener.state == XFZTCPListener.STATE_OK) return true; else if(listener.state == XFZTCPListener.STATE_FAILED) return false; }