zhaiyifei 10 месяцев назад
Родитель
Сommit
6d81afe15a

+ 0 - 6
src/main/java/com/yunfeiyun/agmp/iots/core/manager/ConnectionManager.java

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

+ 0 - 7
src/main/java/com/yunfeiyun/agmp/iots/core/manager/MqttManager.java

@@ -8,11 +8,9 @@ import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictEnum;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
-import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
 import com.yunfeiyun.agmp.iot.common.enums.IotDeviceconnTypeEnum;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 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;
@@ -24,7 +22,6 @@ import com.yunfeiyun.agmp.iots.service.IIotDeviceService;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -51,9 +48,6 @@ public class MqttManager {
     @Autowired
     private DeviceconnCacheService deviceconnCacheService;
 
-    @Autowired
-    private IotMqttTopicCacheService iotMqttTopicCacheService;
-
     /**
      * 实现类名称-->mqtt
      */
@@ -108,7 +102,6 @@ public class MqttManager {
                         mqttTopicValues.add(mqttTopicValue);
                     }
                 }
-                iotMqttTopicCacheService.addTopicCache(iotDevice.getDevCode(),topics);
             }
             String[] topics = new String[mqttTopicValues.size()];
             if (!mqttTopicValues.isEmpty()) {