From 544afa4dabaccb0248bf0b6fcfdc7b9b6c2ea9f2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 13 一月 2026 17:56:38 +0800
Subject: [PATCH] 合格率统计重构:根据物料属性分类返回对应的合格/不合格数据量

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

diff --git a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQClient.java b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQClient.java
index 1c3c548..9f002c5 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQClient.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQClient.java
@@ -52,13 +52,13 @@
 	 * WEB鏈嶅姟鍣ㄨ繛鎺QTT鏈嶅姟鍣ㄥ嚱鏁�
 	 * @param mqttConfig yml涓璏QTT鐨勯厤缃�
 	 */
-	public void connect(MQConfig mqttConfig) throws MqttException {
+	public void connect(DeviceMqttConfig mqttConfig) throws MqttException {
 		client = new MqttClient(mqttConfig.getUrl(), mqttConfig.getClientId(), new MemoryPersistence());
 		MqttConnectOptions options = getOption(mqttConfig.getUsername(), mqttConfig.getPassword(),
-				mqttConfig.getTimeout(), mqttConfig.getKeepAlive());
+				mqttConfig.getTimeout(), mqttConfig.getKeepalive());
 		MQClient.setClient(client);
 		//杩炴帴澶辫触璋冪敤鍥炶皟鍑芥暟锛岄噸鏂拌繛鎺�
-		client.setCallback(new MQCallback<Object>(this, mqttConfig));
+		client.setCallback(new MQCallback(this, mqttConfig));
 		if (!client.isConnected()) {
 			client.connect(options);
 			// 璁㈤槄涓婚

--
Gitblit v1.9.3