From d771c1ba5c456f69e1819abf7a0d8695a79a868d Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Tue, 31 Mar 2026 15:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8Dmqtt=E6=9C=AA=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E6=97=B6=EF=BC=8C=E7=B1=BB=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IotCommonP3ServiceImpl.java      | 15 ++++++++++-----
 .../modules/mqtt/controller/MqttController.java   |  2 ++
 .../jeecg/modules/mqtt/service/MqttService.java   |  2 ++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP3ServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP3ServiceImpl.java
index 1b076c8..c248a84 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP3ServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP3ServiceImpl.java
@@ -736,11 +736,16 @@ public class IotCommonP3ServiceImpl {
 
     public boolean sendMqttDeviceQuery(SurvDeviceDeploy deploy, List<String> variables) {
         boolean result = true;
-        log.error("===========预发送指令========={}============",variables.size());
-        if(deploy!=null && variables!=null && !variables.isEmpty()){
-            QueryCmd queryCmd = LhIotUtil.ConstructCmd(variables);
-            String cmdStr = JSONObject.toJSONString(queryCmd);
-            mqttService.sendMessage(deploy.getDeviceIotUrl(),cmdStr);
+        try{
+            log.error("===========预发送指令========={}============", variables.size());
+            if (deploy != null && variables != null && !variables.isEmpty()) {
+                QueryCmd queryCmd = LhIotUtil.ConstructCmd(variables);
+                String cmdStr = JSONObject.toJSONString(queryCmd);
+                mqttService.sendMessage(deploy.getDeviceIotUrl(), cmdStr);
+            }
+        }catch (Exception e){
+            //抛出未注入时的报错
+            e.printStackTrace();
         }
         return result;
     }
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/controller/MqttController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/controller/MqttController.java
index 2488183..8827295 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/controller/MqttController.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/controller/MqttController.java
@@ -4,6 +4,7 @@ import org.jeecg.modules.mqtt.service.MqttService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -14,6 +15,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/api/mqtt")
 @RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "mqtt", name = "enabled", havingValue = "true")
 public class MqttController {
     @Autowired(required = false)
     private final MqttService mqttService;
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/service/MqttService.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/service/MqttService.java
index 85839c6..d5835c8 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/service/MqttService.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/mqtt/service/MqttService.java
@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -18,6 +19,7 @@ import java.util.concurrent.CompletableFuture;
 @Slf4j
 @Service
 @RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "mqtt", name = "enabled", havingValue = "true")
 public class MqttService {
 
     private final MqttClient mqttClient;