From 51af3e4e7c5fb612576b98fd6407f6b65859f374 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期三, 16 十一月 2022 15:58:06 +0800
Subject: [PATCH] 区分消息订阅类型，新增上下线监听，修复定时帧缺少CRC32，替换设备在线状态查询方法
---
ximon-admin/src/main/java/com/sandu/ximon/admin/localMQTT/util/MqttClientUtil.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/localMQTT/util/MqttClientUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/localMQTT/util/MqttClientUtil.java
index 5802b1f..5b9a528 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/localMQTT/util/MqttClientUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/localMQTT/util/MqttClientUtil.java
@@ -32,7 +32,7 @@
public static String publishPrefix = "v1/devices/request/";
- public static String clientId = "java_server";
+ public static String clientId = "java_server_msg";
public static final Map<String, String> MQTT_RETURN_FRAME_MAP = new ConcurrentHashMap<>();
@@ -63,13 +63,14 @@
String returnFrame = null ;
returnFrame = MQTT_RETURN_FRAME_MAP.get(topic);
- for (int i = 0;i < 10;i++){
- if (!StringUtil.strIsNullOrEmpty(returnFrame)){
- sleep(500);
+ for (int i = 0;i < 50;i++){
+ if (StringUtil.strIsNullOrEmpty(returnFrame)){
+ sleep(100);
returnFrame = MQTT_RETURN_FRAME_MAP.get(topic);
}else {
log.info("杩斿洖鏃堕棿锛歿} ms",System.currentTimeMillis() - start) ;
- MQTT_RETURN_FRAME_MAP.remove(topic);
+ String remove = MQTT_RETURN_FRAME_MAP.remove(topic);
+ log.info("remove缁撴灉锛歿} ",remove);
return returnFrame;
}
}
@@ -81,6 +82,7 @@
} catch (MqttException e) {
log.error("MqttClient send msg faild!", e);
+ return("閫氫俊瓒呮椂");
}
return null;
}
--
Gitblit v1.9.3