修改sn号重复注册问题

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

@@ -31,6 +31,8 @@ public class MqttUser implements Serializable {
 
     private String sn;
 
+    private Long deviceId;
+
     private String username;
 
     private String passwordHash;
@@ -41,6 +43,8 @@ public class MqttUser implements Serializable {
 
     private String topic;
 
+    private String ipAddress;
+
     private LocalDateTime created;
 
 

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

@@ -8,6 +8,7 @@ import com.xy.annotation.Lock;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.collections.map.JMap;
+import com.xy.config.MqttConfig;
 import com.xy.dto.DeviceQualityDto;
 import com.xy.dto.DeviceRegisterDto;
 import com.xy.dto.MqttUserDto;
@@ -54,6 +55,8 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
 
     private MqttUserServiceImpl mqttUserService;
 
+    private MqttConfig mqttConfig;
+
     @PostMapping("save")
     @ApiOperation("添加")
     @Transactional(rollbackFor = Exception.class)
@@ -114,6 +117,8 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
         mqttUserInfo.setCreated(LocalDateTime.now());
         mqttUserInfo.setTopic(CommConsts.DEVICE_MQTT_TOPIC_SUFFIX);
         mqttUserInfo.setSn(deviceRegister.getDeviceSn());
+        mqttUserInfo.setDeviceId(deviceRegister.getDeviceId());
+        mqttUserInfo.setIpAddress(mqttConfig.getUrl());
         mqttUserService.save(mqttUserInfo);
         return R.ok();
     }

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

@@ -55,6 +55,9 @@ public class MqttUserDto {
         @ApiModelProperty("sn号")
         private String sn;
 
+        @ApiModelProperty("设备id")
+        private Long deviceId;
+
         @ApiModelProperty("账号")
         private String username;
 
@@ -68,6 +71,9 @@ public class MqttUserDto {
         @ApiModelProperty("订阅topic")
         private String topic;
 
+        @ApiModelProperty("连接地址")
+        private String ipAddress;
+
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime serverTime;