From 19439b0512c84d6e2c282afa2f93e30a85585247 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Tue, 31 Oct 2023 13:29:14 +0800
Subject: [PATCH] =?UTF-8?q?mqtt=E8=B4=A6=E5=8F=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/EquipmentDeliveryController.java         | 10 +++++++---
 .../com/njcn/csdevice/service/IMqttUserService.java    |  7 +++++++
 .../csdevice/service/impl/MqttUserServiceImpl.java     |  7 +++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
index ad4d9e1..5d07027 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
@@ -67,10 +67,14 @@ public class EquipmentDeliveryController extends BaseController {
     @DeviceLog(operateType = DeviceOperate.ADD)
     public HttpResult<Boolean> addEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm){
         String methodDescribe = getMethodDescribe("addEquipmentDelivery");
-        Boolean flag = csEquipmentDeliveryService.save (csEquipmentDeliveryAddParm);
+        Boolean flag = csEquipmentDeliveryService.save(csEquipmentDeliveryAddParm);
         if (flag){
-            //初始化装置mqtt连接信息(使用sha256加密)
-            mqttUserService.insertMqttUser(csEquipmentDeliveryAddParm.getNdid());
+            //查询mqtt用户名和密码是否存在
+            boolean result = mqttUserService.findMqttUser(csEquipmentDeliveryAddParm.getNdid());
+            if (result){
+                //初始化装置mqtt连接信息(使用sha256加密)
+                mqttUserService.insertMqttUser(csEquipmentDeliveryAddParm.getNdid());
+            }
         }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IMqttUserService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IMqttUserService.java
index 6311359..02f67cd 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IMqttUserService.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IMqttUserService.java
@@ -13,6 +13,13 @@ import com.njcn.csdevice.pojo.po.MqttUser;
  */
 public interface IMqttUserService extends IService<MqttUser> {
 
+    /**
+     * 查询新增的mqtt用户名和密码是否存在
+     * @param userName 用户名
+     * @return boolean
+     */
+    boolean findMqttUser(String userName);
+
     /**
      * 根据密码生成mqtt连接信息
      * @param password
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/MqttUserServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/MqttUserServiceImpl.java
index 6a06acb..c8965bb 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/MqttUserServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/MqttUserServiceImpl.java
@@ -9,6 +9,7 @@ import com.njcn.csdevice.pojo.po.MqttUser;
 import com.njcn.csdevice.service.IMqttUserService;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
 import java.util.Random;
 
 /**
@@ -23,6 +24,12 @@ import java.util.Random;
 @DS("mqtt")
 public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> implements IMqttUserService {
 
+    @Override
+    public boolean findMqttUser(String userName) {
+        MqttUser mqttUser = this.lambdaQuery().eq(MqttUser::getUsername,userName).one();
+        return Objects.isNull(mqttUser);
+    }
+
     @Override
     public void insertMqttUser(String password) {
         Random r = new Random();