From 69310a7de3d963c2bf46250b0965a2c7e8532f1e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 29 七月 2025 13:40:56 +0800
Subject: [PATCH] mqtt调整:实现订阅多个mqtt服务

---
 cnas-device/src/main/java/com/ruoyi/device/mqtt/MQConfig.java |   57 ++++++---------------------------------------------------
 1 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQConfig.java b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQConfig.java
index a88b29c..c00e36c 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQConfig.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQConfig.java
@@ -1,64 +1,19 @@
 package com.ruoyi.device.mqtt;
 
 import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 @Component
 @Data
+@ConfigurationProperties(prefix = "")
 public class MQConfig {
 
 	/**
-	 * MQTT-鏈嶅姟绔�-IP
+	 * 璇诲彇yml鐨刴qtt閰嶇疆淇℃伅
 	 */
-	@Value("${mqtt.url}")
-	private String url;
+	private List<DeviceMqttConfig> mqtt;
 
-	/**
-	 * MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�
-	 */
-	@Value("${mqtt.username}")
-	private String username;
-
-	/**
-	 * MQTT-鏈嶅姟绔�-瀵嗙爜
-	 */
-	@Value("${mqtt.password}")
-	private String password;
-
-	/**
-	 * 瓒呮椂鏃堕棿
-	 */
-	@Value("${mqtt.timeout}")
-	private int timeout;
-
-	/**
-	 * 蹇冭烦妫�娴嬫椂闂�
-	 */
-	@Value("${mqtt.keepalive}")
-	private int keepAlive;
-
-	/**
-	 * 蹇冭烦鍖呯骇鍒�
-	 */
-	@Value("${mqtt.qos}")
-	private int qos;
-
-	/**
-	 * 鏈嶅姟绔繛鎺ヨ秴鏃舵椂闂�
-	 */
-	@Value("${mqtt.completion-timeout}")
-	private int completionTimeout;
-
-	/**
-	 * clientId
-	 */
-	@Value("${mqtt.clientId}")
-	private String clientId;
-
-	/**
-	 * 璁㈤槄涓婚
-	 */
-	@Value("${mqtt.subscribe}")
-	private String subscribe;
 }

--
Gitblit v1.9.3