|
|
@@ -9,7 +9,6 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
|
|
|
import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
|
|
|
import com.yunfeiyun.agmp.iot.common.model.mq.IotDeviceEditMqModel;
|
|
|
import com.yunfeiyun.agmp.iot.common.service.DeviceconnCacheService;
|
|
|
-import com.yunfeiyun.agmp.iot.common.service.IotMqttTopicCacheService;
|
|
|
import com.yunfeiyun.agmp.iots.common.modal.IotDeviceconnResVo;
|
|
|
import com.yunfeiyun.agmp.iots.core.mqtt.DeviceTopicService;
|
|
|
import com.yunfeiyun.agmp.iots.core.mqtt.modal.MqttTopicValue;
|
|
|
@@ -41,8 +40,6 @@ public class ConnectionManager {
|
|
|
private DeviceTopicService deviceTopicService;
|
|
|
@Resource
|
|
|
private DeviceconnCacheService deviceconnCacheService;
|
|
|
- @Resource
|
|
|
- private IotMqttTopicCacheService iotMqttTopicCacheService;
|
|
|
|
|
|
private boolean INIT_SUCCESS = false;
|
|
|
|
|
|
@@ -225,7 +222,6 @@ public class ConnectionManager {
|
|
|
mqttTopicValue.setDevId(iotDevice.getDevBid());
|
|
|
mqttTopicValue.setServiceName(IotDeviceDictEnum.findServiceNameByDevTypeBid(iotDevice.getDevtypeBid()));
|
|
|
mqttTopicValue.setTopic(s);
|
|
|
- iotMqttTopicCacheService.addTopicCache(iotDevice.getDevCode(),topics);
|
|
|
mqttTopicValues.add(mqttTopicValue);
|
|
|
}
|
|
|
}
|
|
|
@@ -378,7 +374,6 @@ public class ConnectionManager {
|
|
|
IotDeviceconn iotDeviceconn = deviceconnCacheService.getIotDeviceConnByDevconnBid(iotDevice.getDevconnBid());
|
|
|
String connId = mqttManager.getMqttConnectionId(iotDeviceconn);
|
|
|
mqttManager.topicSingleSubscribeDevice(connId, serviceName, mqttTopicValues);
|
|
|
- iotMqttTopicCacheService.addTopicCache(iotDevice.getDevCode(),topics);
|
|
|
}
|
|
|
|
|
|
private void httpDeviceCreateHandle(IotDevice iotDevice) {
|
|
|
@@ -408,7 +403,6 @@ public class ConnectionManager {
|
|
|
IotDeviceconn iotDeviceconn = deviceconnCacheService.getIotDeviceConnByIotDevice(iotDevice);
|
|
|
String connId = mqttManager.getMqttConnectionId(iotDeviceconn);
|
|
|
mqttManager.topicBatchUnSubscribeDevices(connId, serviceName, mqttTopicValues);
|
|
|
- iotMqttTopicCacheService.removeTopicCache(iotDevice.getDevCode());
|
|
|
}
|
|
|
|
|
|
private void httpDeleteDeviceHandle(IotDevice iotDevice) {
|