diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJKForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJKForwarder.java index fb1df241..8855f14a 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJKForwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJKForwarder.java @@ -36,7 +36,7 @@ public class GXJKForwarder extends Forwarder { @PostConstruct void registerMe() throws MqttException { - init(FORWARDER_NAME, "MQTT "+brokerUrl,7,FWD_DEVICE_NAME,60); + init(FORWARDER_NAME, "MQTT "+brokerUrl,7,FWD_DEVICE_NAME,10); mqttClient = new MQTTClient(brokerUrl, username, password,clientid); mqttClient.connect(); } @@ -44,7 +44,7 @@ public class GXJKForwarder extends Forwarder { /** * 每半小时转发GNSS解算结果 */ - @Scheduled(cron = "0 0 0/1 * * ?") // 每30分钟执行一次 + @Scheduled(cron = "0 0/10 * * * ?") // 每30分钟执行一次 private void forwardGnss() { logger.info("gxjk forwardGnss"); forwardCurrentGnss(); diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java index 8db2e8b8..c3c8b45a 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java @@ -2,15 +2,13 @@ package com.imdroid.sideslope.executor; import com.imdroid.common.util.HexUtil; import com.imdroid.secapi.client.BeidouClient; -import com.imdroid.secapi.dto.GnssMsg; -import com.imdroid.secapi.dto.GnssMsgMapper; -import com.imdroid.secapi.dto.GnssStatus; +import com.imdroid.secapi.client.RtcmClient; +import com.imdroid.secapi.dto.*; import com.imdroid.sideslope.message.D3F0SelfCheckMessage; import com.imdroid.sideslope.sal.DeviceService; import com.imdroid.sideslope.sal.Device; import com.imdroid.sideslope.service.DataPersistService; import com.imdroid.common.util.ThreadManager; -import com.imdroid.sideslope.web.ApiController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -19,6 +17,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.time.LocalDateTime; + /** * @author Layton * @date 2023/2/2 20:40 @@ -38,16 +37,22 @@ public class D3F0SelfCheckMessageExecutor implements Executor