李进 пре 2 година
родитељ
комит
371fe2283b

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

@@ -2,17 +2,17 @@ package com.xy.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author lijin
@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="MqttUser对象", description="")
+@ApiModel(value = "MqttUser对象", description = "")
 public class MqttUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -43,8 +43,6 @@ public class MqttUser implements Serializable {
 
     private String topic;
 
-    private String ipAddress;
-
     private LocalDateTime created;
 
 

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

@@ -9,7 +9,6 @@ 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;
@@ -56,8 +55,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
 
     private MqttUserServiceImpl mqttUserService;
 
-    private MqttConfig mqttConfig;
-
     private DeviceSysinfoServiceImpl deviceSysinfoService;
 
     private DeviceCreateIdsServiceImpl deviceCreateIdsService;
@@ -127,7 +124,6 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
             mqttUserInfo.setTopic(deviceId + CommConsts.DEVICE_MQTT_TOPIC_SUFFIX);
             mqttUserInfo.setSn(deviceRegister.getDeviceSn());
             mqttUserInfo.setDeviceId(deviceRegister.getDeviceId());
-            mqttUserInfo.setIpAddress(mqttConfig.getUrl());
             mqttUserService.save(mqttUserInfo);
         } else {
             updateById(deviceRegister);