From b90e25f350cafea8a5f47b226fc348c81822cd37 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 14 Jan 2025 17:33:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/hard/service/impl/HardManagerServiceImpl.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java
index bfc423c84..cf4312028 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java
@@ -20,7 +20,6 @@ import com.bsd.pjcloud.hard.api.utils.HardUtil;
 import com.bsd.pjcloud.hard.api.vo.HardManagerVo;
 import com.bsd.pjcloud.hard.mapper.HardGroupMapper;
 import com.bsd.pjcloud.hard.mapper.HardManagerMapper;
-import com.bsd.pjcloud.hard.service.HardGroupService;
 import com.bsd.pjcloud.hard.service.HardManagerService;
 import com.bsd.pjcloud.hard.mqtt.config.MqttConfig;
 import com.bsd.pjcloud.hard.utils.MqTopicUtil;
@@ -127,13 +126,13 @@ public class HardManagerServiceImpl extends ServiceImpl<HardManagerMapper, HardM
         baseMapper.insert(dto);
         // topic
         HardManagerEntity updateObj = HardManagerEntity.builder().id(dto.getId()).build();
-        String topic = createMqConfigByAction(mchDeptId, null, 1) + "/#";
+        String topic = createMqConfigByAction(dto.getHardGroupId(), null, 1) + "/#";
         updateObj.setMainTopic(topic);
         // client id
-        String clientId = createMqConfigByAction(mchDeptId, dto.getId(), 2);
+        String clientId = createMqConfigByAction(dto.getHardGroupId(), dto.getId(), 2);
         updateObj.setMqClientId(clientId);
         // username TODO 密码9位随机数字加字母
-        String mqUsername = createMqConfigByAction(mchDeptId, dto.getId(), 3);
+        String mqUsername = createMqConfigByAction(dto.getHardGroupId(), dto.getId(), 3);
         updateObj.setMqUsername(mqUsername);
         updateObj.setMqPassword(RandomUtil.randomString(9));
         baseMapper.updateById(updateObj);