From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
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