From ec63fb17c5ba3e5b2a5a4106c25b4e249a2f980f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 22 十一月 2022 18:44:51 +0800
Subject: [PATCH] changes

---
 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