调整mqtt日志

src/main/java/com/yunfeiyun/agmp/iots/core/manager/MqttManager.java

@@ -112,7 +112,7 @@ public class MqttManager {
             MqttCore mqttCore = mqttCoreMap.get(connectionId);
             if(null != mqttCore){
                 // MqttCore已经存在
-               mqttCore.subscribe(topics);
+               mqttCore.subscribe(topics,cfgYf);
                mqttCore.bindTopicToDeviceId(mqttTopicValues);
             }else {
                 // 创建新的mqttCore

src/main/java/com/yunfeiyun/agmp/iots/core/mqtt/DeviceTopicService.java

@@ -85,7 +85,7 @@ public class DeviceTopicService {
             case ServiceNameConst.SERVICE_YF_XYCB_2: {
                 return getYfXycb2BatchSubTopic(deviceId);
             }
-            case ServiceNameConst.SERVICE_BIG_DATA_MONITOR: {
+            case ServiceNameConst.SERVICE_EZVIZ_MINITOR: {
                 return getHKBatchSubTopic();
             }
             case ServiceNameConst.SERVICE_XPH_YF_QXZ:

src/main/java/com/yunfeiyun/agmp/iots/core/mqtt/network/MqttCore.java

@@ -222,14 +222,14 @@ public class MqttCore {
      * @param topics
      * @throws MqttException
      */
-    public void subscribe(String[] topics) throws MqttException {
+    public void subscribe(String[] topics,MqttConfig cfgYf) throws MqttException {
         // 否则向mqttConfig中追加订阅
         mqttConfig.setSubTopic(Stream.concat(Stream.of(topics),Stream.of(mqttConfig.getSubTopic())).toArray(String[]::new));
         if(getClient().isConnected()){
             // 如果此mqtt已经建立了连接,则正常订阅
             for(String topic :topics){
                 getClient().subscribe(topic);
-                log.info("[MQTT] {} 连接已建立 追加订阅主题 {}", mqttConfig.getDeviceType(), topic);
+                log.info("[MQTT] {} 连接已建立 追加订阅主题 {}", cfgYf.getDeviceType(), topic);
             }
         }
     }
@@ -253,7 +253,6 @@ public class MqttCore {
     public void bindTopicToDeviceId(List<MqttTopicValue> mqttTopicValues){
         for(MqttTopicValue mqttTopicValue:mqttTopicValues){
             topicToDevId.put(mqttTopicValue.getTopic(),mqttTopicValue.getDevId());
-
         }
     }
 //    public void unBindTopicToDeviceId(List<MqttTopicValue> mqttTopicValues){