1、取消临时推送历史数据

This commit is contained in:
weidong 2025-07-01 11:42:44 +08:00
parent ae28807818
commit e6ad5a0a3d

View File

@ -28,17 +28,18 @@ import java.util.List;
@EnableScheduling @EnableScheduling
public class GZYMQTTForwarder extends Forwarder { public class GZYMQTTForwarder extends Forwarder {
static final String FORWARDER_NAME = "贵州交勘院MQTT"; static final String FORWARDER_NAME = "贵州交勘院MQTT";
@Value("${mqtt.server.brokerUrl}") @Value("${gzymqtt.server.brokerUrl}")
private String brokerUrl; private String brokerUrl;
@Value("${mqtt.server.username}") @Value("${gzymqtt.server.username}")
private String username; private String username;
@Value("${mqtt.server.password}") @Value("${gzymqtt.server.password}")
private String password; private String password;
@Value("${mqtt.server.clientid}") @Value("${gzymqtt.server.clientid}")
private String clientid; private String clientid;
@Value("${mqtt.server.topic}") @Value("${gzymqtt.server.topic}")
private String topic; private String topic;
//@Value("${gzymqtt.server.enabled}")
private boolean enabled=true;
@Autowired @Autowired
GnssStatusMsgMapper statusMsgMapper; GnssStatusMsgMapper statusMsgMapper;
MQTTClient mqttClient; MQTTClient mqttClient;
@ -47,6 +48,7 @@ public class GZYMQTTForwarder extends Forwarder {
void registerMe() throws MqttException { void registerMe() throws MqttException {
init(FORWARDER_NAME, "MQTT "+brokerUrl,2,FWD_DEVICE_ALIAS_NAME,30); init(FORWARDER_NAME, "MQTT "+brokerUrl,2,FWD_DEVICE_ALIAS_NAME,30);
mqttClient = new MQTTClient(brokerUrl, username, password,clientid); mqttClient = new MQTTClient(brokerUrl, username, password,clientid);
if(!enabled) return;
try{ try{
mqttClient.connect(); mqttClient.connect();
} }
@ -61,6 +63,7 @@ public class GZYMQTTForwarder extends Forwarder {
@Scheduled(cron = "0 0 0/1 * * ?") // 每小时执行一次 @Scheduled(cron = "0 0 0/1 * * ?") // 每小时执行一次
//@Scheduled(cron = "0 0/5 * * * ?") // 每30分钟执行一次 //@Scheduled(cron = "0 0/5 * * * ?") // 每30分钟执行一次
private void forwardGnss() { private void forwardGnss() {
if(!enabled) return;
logger.debug("gzy mqtt forwardGnss"); logger.debug("gzy mqtt forwardGnss");
if(mqttClient.isConnected()) { if(mqttClient.isConnected()) {
forwardCurrentGnss(); forwardCurrentGnss();
@ -76,6 +79,11 @@ public class GZYMQTTForwarder extends Forwarder {
} }
} }
@Scheduled(cron = "0 0/5 * * * ?") // 每30分钟执行一次
void forwardHistoryGnss() {
super.forwardHistoryGnss();
}
@Override @Override
int send(String projectId, List<GnssCalcData> records, LocalDateTime sentTime) { int send(String projectId, List<GnssCalcData> records, LocalDateTime sentTime) {
int sendNum = 0; int sendNum = 0;