瀏覽代碼

修改sn号重复注册问题

李进 2 年之前
父節點
當前提交
2e52945050

+ 2 - 0
device-api-service/src/main/java/com/xy/entity/MqttUser.java

@@ -37,6 +37,8 @@ public class MqttUser implements Serializable {
 
     private Boolean isSuperuser;
 
+    private String topic;
+
     private LocalDateTime created;
 
 

+ 2 - 0
device-api-service/src/main/java/com/xy/service/DeviceRegisterServiceImpl.java

@@ -14,6 +14,7 @@ import com.xy.dto.MqttUserDto;
 import com.xy.entity.*;
 import com.xy.mapper.*;
 import com.xy.utils.*;
+import com.xy.utils.consts.CommConsts;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -111,6 +112,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
         mqttUserInfo.setUsername(deviceId);
         mqttUserInfo.setPasswordHash(deviceId);
         mqttUserInfo.setCreated(LocalDateTime.now());
+        mqttUserInfo.setTopic(CommConsts.DEVICE_MQTT_TOPIC_SUFFIX);
         mqttUserService.save(mqttUserInfo);
         return R.ok();
     }

+ 3 - 0
device-api/src/main/java/com/xy/dto/MqttUserDto.java

@@ -62,6 +62,9 @@ public class MqttUserDto {
 
         private Boolean isSuperuser;
 
+        @ApiModelProperty("订阅topic")
+        private String topic;
+
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime created;