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