fix：“优化mqtt接口"

src/main/java/com/szwl/controller/MqttController.java

@@ -61,6 +61,12 @@ public class MqttController {
     @ApiOperation("添加订阅主题")
     @PostMapping("/addTopic")
     public ResponseModel<?> addTopic(@RequestBody MqttTopics mqttTopics){
+        LambdaQueryWrapper<MqttTopics> query = Wrappers.lambdaQuery();
+        query.eq(MqttTopics::getTopic, mqttTopics.getTopic());
+        MqttTopics mqttTopic = mqttTopicsService.getOne(query);
+        if(mqttTopic != null) {
+            return R.fail("主题已存在");
+        }
         mqttTopics.setCreateDate(new Date());
         mqttTopicsService.save(mqttTopics);
         mqttService.subscribe(mqttTopics.getTopic(), mqttTopics.getQos());
@@ -70,12 +76,10 @@ public class MqttController {
     @ApiOperation("删除订阅主题")
     @PostMapping("/delTopic")
     public ResponseModel<?> delTopic(@RequestBody MqttTopics mqtt) {
-        LambdaQueryWrapper<MqttTopics> query = Wrappers.lambdaQuery();
-        query.eq(MqttTopics::getTopic, mqtt.getTopic());
-        MqttTopics mqttTopic = mqttTopicsService.getOne(query);
-        if(mqttTopic != null) {
-            mqttTopicsService.removeById(mqttTopic);
-            mqttService.unsubscribe(mqttTopic.getTopic());
+        MqttTopics mqttTopics = mqttTopicsService.getById(mqtt.getId());
+        if(mqttTopics != null) {
+            mqttTopicsService.removeById(mqttTopics);
+            mqttService.unsubscribe(mqttTopics.getTopic());
             return R.ok();
         } else {
             return R.fail("主题不存在");

src/main/java/com/szwl/controller/TAdminController.java

@@ -239,7 +239,7 @@ public class TAdminController {
         query.eq(TAdmin::getParentId, parentId);
         query.eq(TAdmin::getId, param.getId());
         List<TAdmin> list = tAdminService.list(query);
-        if (list.size() > 0) {
+        if (!list.isEmpty()) {
             TAdmin admin = list.get(0);
             // 管理的机器 需要再建立一个关系表 type区分全部还是部分
             String equipmentIds = param.getEquipmentIds();
@@ -267,7 +267,7 @@ public class TAdminController {
             LambdaQueryWrapper<SysUserRole> query1 = Wrappers.lambdaQuery();
             query1.eq(SysUserRole::getUserId, admin.getId());
             List<SysUserRole> list1 = sysUserRoleService.list(query1);
-            if (list1.size() > 0) {
+            if (!list1.isEmpty()) {
                 for (SysUserRole sysUserRole : list1) {
                     sysUserRoleService.removeById(sysUserRole.getId());
                 }
@@ -414,6 +414,7 @@ public class TAdminController {
                 }
                 addLoginUserParam.setRoleName(roleName.toString());
                 addLoginUserParam.setRoleList(ids);
+                addLoginUserParam.setType(admin.getType());
                 returnList.add(addLoginUserParam);
             }