|
@@ -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);
|