From 97bf45987f903570ad7f7ede08be3736b3c222e0 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Mon, 19 May 2025 17:14:12 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mqtt):=20=E8=B0=83=E6=95=B4MQTT?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=A4=8D=E7=94=A8=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E5=85=88=E8=AE=A2=E9=98=85=E4=B8=BB=E9=A2=98=E5=86=8D=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor(qywx): 移除QyTemplateDTO中未使用的operator字段
---
 .../main/java/com/agileboot/domain/mqtt/MqttService.java  | 3 ++-
 .../agileboot/domain/qywx/template/dto/QyTemplateDTO.java | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/mqtt/MqttService.java b/agileboot-domain/src/main/java/com/agileboot/domain/mqtt/MqttService.java
index 00db632..fa561cb 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/mqtt/MqttService.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/mqtt/MqttService.java
@@ -64,8 +64,9 @@ public class MqttService implements MqttCallback {
                 .orElse(null);
                 
             if (existingConfig != null) {
-                log.info("复用已有MQTT连接：{} 账号：{}", config.getServerUrl(), config.getUsername());
+                existingConfig.client.subscribe(config.getTopicFilter());
                 clientConfigs.add(new ClientConfig(existingConfig.client, config));
+                log.info("复用已有MQTT连接：{} 账号：{}", config.getServerUrl(), config.getUsername());
                 continue;
             }
             
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/template/dto/QyTemplateDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/template/dto/QyTemplateDTO.java
index 3777fa7..ddde9f1 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/template/dto/QyTemplateDTO.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/template/dto/QyTemplateDTO.java
@@ -18,11 +18,6 @@ public class QyTemplateDTO {
         if (entity != null) {
             BeanUtil.copyProperties(entity, this);
             
-            /*SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId());
-            if (creator != null) {
-                this.operator = creator.getUsername();
-            }*/
-            
             this.enableStatus = "1".equals(entity.getEnable()) ? "启用" : "停用";
             this.gettokenTimeStr = DateUtil.format(entity.getGettokenTime(), "yyyy-MM-dd HH:mm:ss");
         }
@@ -55,9 +50,6 @@ public class QyTemplateDTO {
     @ExcelColumn(name = "凭证有效期（秒）")
     private Integer expiresIn;
 
-    @ExcelColumn(name = "操作人")
-    private String operator;
-
     @ExcelColumn(name = "状态")
     private String enableStatus;