阶段提交：初步修改链接类规整

src/main/java/com/yunfeiyun/agmp/iots/core/cmd/core/task/CmdTaskService.java

@@ -14,7 +14,6 @@ import com.yunfeiyun.agmp.iot.common.domain.IotCmdexec;
 import com.yunfeiyun.agmp.iot.common.domain.IotCmdtask;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.resvo.IotFirmdevResVo;
-import com.yunfeiyun.agmp.iot.common.exception.IotBaseException;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
 import com.yunfeiyun.agmp.iot.common.model.task.TaskResult;
@@ -22,9 +21,8 @@ import com.yunfeiyun.agmp.iots.core.cmd.core.serial.SerialTaskModel;
 import com.yunfeiyun.agmp.iots.core.cmd.model.CmdExecModel;
 import com.yunfeiyun.agmp.iots.device.common.Device;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.service.*;
-import com.yunfeiyun.agmp.iots.exception.IotException;
 import com.yunfeiyun.agmp.iots.mq.IotsMqService;
 import com.yunfeiyun.agmp.iots.service.CmdResultCheckService;
 import lombok.extern.slf4j.Slf4j;
@@ -34,7 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.security.KeyException;
 import java.util.*;
 
 /**

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

@@ -0,0 +1,93 @@
+package com.yunfeiyun.agmp.iots.core.manager;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.yunfeiyun.agmp.common.utils.StringUtils;
+import com.yunfeiyun.agmp.iot.common.domain.IotFirmdev;
+import com.yunfeiyun.agmp.iot.common.domain.resvo.IotFirmdevResVo;
+import com.yunfeiyun.agmp.iots.device.service.IIotFirmdevService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.util.TextUtils;
+import org.eclipse.paho.client.mqttv3.MqttException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+
+@Component
+@Slf4j
+public class ConnectionManager {
+
+    @Autowired
+    private MqttManager mqttManager;
+
+    @Autowired
+    private HttpManager httpManager;
+
+    @Autowired
+    private IIotFirmdevService iotFirmdevService;
+
+    /**
+     * 加载数据库设备配置
+     *
+     * @throws MqttException
+     */
+    @PostConstruct
+    public void init() throws MqttException {
+        log.info("【初始化】协议");
+        IotFirmdev iotFirmdev = new IotFirmdev();
+        //先把所有型号查出来
+        List<IotFirmdevResVo> iotFirmdevResVos = iotFirmdevService.selectIotFirmdevList(iotFirmdev);
+        for (IotFirmdevResVo iotFirmdevResVo : iotFirmdevResVos) {
+            log.info("【初始化】【开始】协议加载，厂家：{},类型：{} ，配置：{}", iotFirmdevResVo.getFirmName(), iotFirmdevResVo.getDevtypeBid(), iotFirmdevResVo.getFirmdevCfg());
+            //将配置信息转换成jsonObject
+            JSONObject jsonConfig = parseConfigJson(iotFirmdevResVo.getFirmdevCfg());
+
+            if (jsonConfig == null) {
+                log.info("【初始化】协议加载，厂家：{},失败：配置为空", iotFirmdevResVo.getFirmName());
+                continue;
+            }
+
+            String type = jsonConfig.getString("type");
+            if (TextUtils.isEmpty(type)) {
+                continue;
+            }
+            switch (type) {
+                case "mqtt":
+                    mqttManager.initConfig(iotFirmdevResVo, jsonConfig);
+                    break;
+                case "modbus-tcp": {
+                   //先不处理，对接到了再梳理
+                    break;
+                }
+                case "http": {
+                    httpManager.init(iotFirmdevResVo, jsonConfig);
+                    break;
+                }
+                default: {
+                    log.info("【初始化】其它类型:{}，跳过", type);
+                    continue;
+                }
+            }
+            log.info("【初始化】【完成】协议加载，厂家：{},类型：{} ，", iotFirmdevResVo.getFirmName(), iotFirmdevResVo.getDevtypeBid());
+
+        }
+
+    }
+
+    private JSONObject parseConfigJson(String config) {
+        if (StringUtils.isEmpty(config)) {
+            log.error("【初始化】协议加载, 对接配置 empty， {}", config);
+            return null;
+        }
+        JSONObject jsonConfig = null;
+        try {
+            jsonConfig = JSONObject.parseObject(config);
+        } catch (Exception e) {
+            log.error("【初始化】解析配置文件错误: \n" + config + "\n" + e);
+        }
+        return jsonConfig;
+    }
+
+}
+

src/main/java/com/yunfeiyun/agmp/iots/core/http/HttpManager.java

@@ -1,9 +1,10 @@
-package com.yunfeiyun.agmp.iots.core.http;
+package com.yunfeiyun.agmp.iots.core.manager;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.iot.common.domain.resvo.IotFirmdevResVo;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
+import com.yunfeiyun.agmp.iots.core.http.*;
 import com.yunfeiyun.agmp.iots.device.service.XphHttpDevice;
 import com.yunfeiyun.agmp.iots.device.service.XphHttpGpQxzDevice;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,13 +1,13 @@
-package com.yunfeiyun.agmp.iots.core.mqtt;
+package com.yunfeiyun.agmp.iots.core.manager;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.yunfeiyun.agmp.common.framework.web.domain.server.Sys;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotFirmdev;
 import com.yunfeiyun.agmp.iot.common.domain.resvo.IotFirmdevResVo;
 import com.yunfeiyun.agmp.iot.common.enums.DevType;
-import com.yunfeiyun.agmp.iots.core.http.HttpManager;
+import com.yunfeiyun.agmp.iots.core.manager.HttpManager;
+import com.yunfeiyun.agmp.iots.core.mqtt.DeviceTopicService;
 import com.yunfeiyun.agmp.iots.device.common.Device;
 import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
@@ -40,21 +40,13 @@ public class MqttManager {
      * 实现类名称-->mqtt
      */
     private Map<String, MqttCore> serviceMqttMap = new HashMap<>();
-    /**
-     * 厂家+设备类型--> mqtt
-     */
-    private Map<String, MqttCore> firmDevTypeMqttMap = new HashMap<>();
+
     /**
      * spring 自动注入
      */
     @Resource
     private Map<String, Device> deviceHandlerMap;
 
-    /**
-     * 厂家 -> 实现类
-     */
-    private Map<String, Map<String, MqttCore>> firmDeviceTypeMap = new HashMap<>();
-
     @Resource
     private CmdResultCheckService cmdResultCheckService;
 
@@ -72,65 +64,13 @@ public class MqttManager {
     private HttpManager httpManager;
 
     /**
-     * 加载数据库设备配置
-     *
-     * @throws MqttException
-     */
-    @PostConstruct
-    public void init() throws MqttException {
-        log.info("【初始化】协议");
-        IotFirmdev iotFirmdev = new IotFirmdev();
-        List<IotFirmdevResVo> iotFirmdevResVos = iotFirmdevService.selectIotFirmdevList(iotFirmdev);
-        for (IotFirmdevResVo iotFirmdevResVo : iotFirmdevResVos) {
-            log.info("【初始化】【开始】协议加载，厂家：{},类型：{} ，配置：{}", iotFirmdevResVo.getFirmName(), iotFirmdevResVo.getDevtypeBid(), iotFirmdevResVo.getFirmdevCfg());
-            if (TextUtils.isEmpty(iotFirmdevResVo.getFirmdevCfg())) {
-                log.error("【初始化】协议加载, 对接配置 empty， {}", iotFirmdevResVo);
-                continue;
-            }
-            //将配置信息转换成jsonObject
-            JSONObject jsonConfig = null;
-            try {
-                jsonConfig = JSONObject.parseObject(iotFirmdevResVo.getFirmdevCfg());
-            } catch (Exception e) {
-                log.error("【初始化】解析配置文件错误: \n" + iotFirmdevResVo.getFirmdevCfg() + "\n" + e);
-            }
-
-            if (jsonConfig != null) {
-                String type = jsonConfig.getString("type");
-                if (TextUtils.isEmpty(type)) {
-                    continue;
-                }
-                if (type.equals("mqtt") || type.equals("modbus-tcp")) {
-                    try {
-                        initConfig(iotFirmdevResVo, jsonConfig);
-                    } catch (Exception e) {
-                        log.error("【初始化】加载配置文件错误: \n" + jsonConfig + "\n" + e);
-                        e.printStackTrace();
-                    }
-                } else if (type.equals("http")) {
-                    initHttp(iotFirmdevResVo, jsonConfig);
-                } else {
-                    log.info("【初始化】其它类型，跳过");
-                    continue;
-                }
-            } else {
-                log.info("【初始化】协议加载，厂家：{},失败：配置为空", iotFirmdevResVo.getFirmName());
-            }
-            log.info("【初始化】【完成】协议加载，厂家：{},类型：{} ，", iotFirmdevResVo.getFirmName(), iotFirmdevResVo.getDevtypeBid());
-
-        }
-
-    }
-
-
-    /**
      * 根据厂家配置构建MqttCore
      *
      * @param iotFirmdevResVo
      * @param jsonConfig
      * @throws MqttException
      */
-    void initConfig(IotFirmdevResVo iotFirmdevResVo, JSONObject jsonConfig) throws MqttException {
+    public void initConfig(IotFirmdevResVo iotFirmdevResVo, JSONObject jsonConfig) throws MqttException {
         MqttConfig cfgYf = getMqttConfig(iotFirmdevResVo, jsonConfig);
         String firmBizId = cfgYf.getFirmBizId();
         String serviceName = cfgYf.getServiceName();
@@ -139,42 +79,19 @@ public class MqttManager {
         String deviceTypeId = cfgYf.getDeviceTypeBizId();
         log.info("【初始化厂商 配置 】 {} {} 开始 ##########################", firmName, type);
         MqttCore mqttCore = new MqttCore();
-        if (type.equals("mqtt")) {
-            String[] topics = deviceTopicService.getBatchTopic(serviceName, getDeviceIdByFirmBizId(firmBizId, deviceTypeId));
-            cfgYf.setSubTopic(topics);
-            cfgYf.setServiceName(serviceName);
-            MqttCore oldMqttCore = null;
-            try{
-                oldMqttCore = getMqttCoreByService(serviceName);
-                if(Objects.equals(serviceName, "XPH_SERVICE")){
-                    mqttCore = oldMqttCore;
-                }
-            }catch (Exception ignored){
-
-            }
-//            if(oldMqttCore != null && Objects.equals(serviceName, "XPH_SERVICE")){
-//                mqttCore = oldMqttCore;
-//            }else{
-//                mqttCore.buildMqttCore(cfgYf, cmdResultCheckService);
-//            }
-            log.info("【mqtt：{} 】  {} ", cfgYf.getDeviceType(), firmBizId);
-            log.info("【初始化厂商 加载 配置】 {} {} {} ", firmName, type, topics);
-
-            addFirmDeviceTypeMap(firmBizId, serviceName, deviceTypeId, mqttCore);
-
-            if(oldMqttCore != null && Objects.equals(serviceName, "XPH_SERVICE")){
-                subscribeByBatch(topics, mqttCore);
-            }else{
-                mqttCore.buildMqttCore(cfgYf, cmdResultCheckService);
-            }
-
-        } else {
-            mqttCore.setMqttConfig(cfgYf);
-            addFirmDeviceTypeMap(firmBizId, serviceName, deviceTypeId, mqttCore);
+        String[] topics = deviceTopicService.getBatchTopic(serviceName, getDeviceIdByFirmBizId(firmBizId, deviceTypeId));
+        cfgYf.setSubTopic(topics);
+        cfgYf.setServiceName(serviceName);
+        log.info("【mqtt：{} 】  {} ", cfgYf.getDeviceType(), firmBizId);
+        log.info("【初始化厂商 加载 配置】 {} {} {} ", firmName, type, topics);
+        //这里从配置获取到一个链接的唯一标识，内部处理复用问题，目前来看，链接id只要相同就实现复用链接
+        if("私有".equals("查询字段")){
+            addPrivateConnectionMap("connectionId", mqttCore);
+        }else{
+            addConmonConnectionMap("connectionId", mqttCore);
         }
-
-        // addFirmDeviceTypeMap(firmBizId, serviceName, deviceTypeId, mqttCore);
-
+        // 这个checker待梳理
+        mqttCore.buildMqttCore(cfgYf, cmdResultCheckService);
         log.info("【初始化厂商 配置 】 {} {} 完成 ##########################", firmName, type);
     }
 
@@ -304,46 +221,40 @@ public class MqttManager {
         return mqttCore;
     }
 
-
     /**
-     * 根据厂家id和设备devtypeBid找到mqtt
-     *
-     * @param firmId
-     * @param devtypeBid
-     * @return
+     * 添加私有的链接：自行修改入参，链接的id生成
+     * @param connectionId
+     * @param mqttCore
      */
-    public MqttCore getMqttCoreByFirmAndDevType(String firmId, String devtypeBid) {
-        return firmDevTypeMqttMap.get(firmId + "-" + devtypeBid);
+    public void addPrivateConnectionMap(String connectionId, MqttCore mqttCore) {
+        putConnection(connectionId,mqttCore);
+
     }
 
     /**
-     * 将厂家、设备类型与mqtt core 映射
-     *
-     * @param firmBizId
-     * @param serviceName
-     * @param deviceTypeId
+     * 添加公有的链接：自行修改入参，链接的id生成
+     * @param connectionId
      * @param mqttCore
      */
-    public void addFirmDeviceTypeMap(String firmBizId, String serviceName, String deviceTypeId, MqttCore mqttCore) {
-        if (!firmDeviceTypeMap.containsKey(firmBizId)) {
-            firmDeviceTypeMap.put(firmBizId, new HashMap<>());
-        }
-        Map<String, MqttCore> mqttCoreMap = firmDeviceTypeMap.get(firmBizId);
-        if (!mqttCoreMap.containsKey(serviceName)) {
-            // 维护 厂家--> List<mqtt>
-            mqttCoreMap.put(serviceName, mqttCore);
-        }
+    public void addConmonConnectionMap(String connectionId, MqttCore mqttCore) {
+        putConnection(connectionId,mqttCore);
+
+    }
 
-        // 维护 厂家+设备类型--> mqtt
-        firmDevTypeMqttMap.put(firmBizId + "-" + deviceTypeId, mqttCore);
-        if (!serviceMqttMap.containsKey(serviceName)) {
+    /**
+     * 放链接
+     * @param connectionId
+     * @param mqttCore
+     */
+    void putConnection(String connectionId, MqttCore mqttCore){
+        if (!serviceMqttMap.containsKey(connectionId)) {
             // 维护 服务名字--> mqtt
-            serviceMqttMap.put(serviceName, mqttCore);
+            serviceMqttMap.put(connectionId, mqttCore);
+        } else {
+            log.info("【MQTT】重复配置 connectionId:{} ", connectionId);
         }
-
     }
 
-
     /**
      * 根据serviceName 获取mqttcore
      *
@@ -351,21 +262,15 @@ public class MqttManager {
      * @return
      */
     public MqttCore getMqttCore(String serviceName) {
-        for (Map<String, MqttCore> serviceMap : firmDeviceTypeMap.values()) {
-            if (serviceMap.containsKey(serviceName)) {
-                return serviceMap.get(serviceName);
-            }
-        }
-        return null;
+        return serviceMqttMap.get(serviceName);
     }
 
     /**
      * 打印已经加载的配置信息
      */
     public void showConfig() {
-        for (String serviceName : firmDevTypeMqttMap.keySet()) {
-            MqttCore mqttCore = firmDevTypeMqttMap.get(serviceName);
-            log.info("【MQTT】已经记载的配置 FirmBizName:{} ,FirmBizId-devType:{}, ServiceType:{}, ServiceName:{} ,SubTopic:{}", mqttCore.getFirmName(), serviceName, mqttCore.getServiceType(), mqttCore.getSubTopic());
+        for (MqttCore mqttCore : serviceMqttMap.values()) {
+            log.info("【MQTT】已经记载的配置 FirmBizName:{} ,FirmBizId-devType:{}, ServiceType:{}, ServiceName:{} ,SubTopic:{}", mqttCore.getFirmName(), mqttCore.getServiceName(), mqttCore.getServiceType(), mqttCore.getSubTopic());
         }
     }
 
@@ -410,6 +315,7 @@ public class MqttManager {
 
     /**
      * 两个小时内没有产生更新便认为是设备订阅失效，重新订阅
+     *
      * @param iotFirmdevResVo
      * @param jsonConfig
      */
@@ -444,16 +350,16 @@ public class MqttManager {
         MqttCore mqttCore = getMqttCoreByService(serviceName);
         try {
             MqttClient mqttClient = mqttCore.getClient();
-            if(!mqttClient.isConnected()){
+            if (!mqttClient.isConnected()) {
                 mqttCore.buildMqttCore(cfgYf, cmdResultCheckService);
-            }else{
-                for(String topic : topics){
+            } else {
+                for (String topic : topics) {
                     mqttClient.unsubscribe(topic);
                     mqttClient.subscribe(topic);
                 }
             }
 
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("【设备重新订阅】【订阅】【重连】：设备：{} {} ", topics, mqttCore.getServiceType());
         }
     }
@@ -468,7 +374,7 @@ public class MqttManager {
             try {
                 JSONObject jsonConfig = JSONObject.parseObject(iotFirmdevResVo.getFirmdevCfg());
                 String type = jsonConfig.getString("type");
-                if(!Objects.equals(type, "mqtt")){
+                if (!Objects.equals(type, "mqtt")) {
                     continue;
                 }
                 startSubscribe(iotFirmdevResVo, jsonConfig);

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/AdznGssqDeviceImpl.java

@@ -20,13 +20,12 @@ import com.yunfeiyun.agmp.iot.common.util.tmn.CustomerIdUtil;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iots.core.http.AdznHttpClient;
 import com.yunfeiyun.agmp.iots.core.http.HttpClient;
-import com.yunfeiyun.agmp.iots.core.http.HttpManager;
+import com.yunfeiyun.agmp.iots.core.manager.HttpManager;
 import com.yunfeiyun.agmp.iots.device.service.*;
 import com.yunfeiyun.agmp.iots.mq.IotsMqService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/BySfDeviceImpl.java

@@ -10,7 +10,7 @@ import com.yunfeiyun.agmp.iot.common.constant.mqtt.IotMqttConstant;
 import com.yunfeiyun.agmp.iot.common.domain.*;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttPublisher;
 import com.yunfeiyun.agmp.iots.device.service.*;
 import com.yunfeiyun.agmp.iots.device.service.IIotDeviceconfigService;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/BzyDeviceImpl.java

@@ -15,7 +15,7 @@ import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.IotAddressService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttPublisher;
 import com.yunfeiyun.agmp.iots.device.domain.bzy.YfBzyReqMsg;
 import com.yunfeiyun.agmp.iots.device.domain.bzy.YfBzyTakephotoMsg;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/CqCbdDeviceImpl.java

@@ -20,7 +20,7 @@ import com.yunfeiyun.agmp.iots.device.domain.cbd.YfCbdTakephotoMsg;
 import com.yunfeiyun.agmp.iots.device.service.*;
 import com.yunfeiyun.agmp.iots.device.domain.cbd.YfCbdConfigMsg;
 import com.yunfeiyun.agmp.iots.device.domain.cbd.YfCbdReqMsg;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttPublisher;
 import com.yunfeiyun.agmp.iots.service.IotDeviceAddressService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/HpfZnkg/IotHpfWsmjZnkgServiceImpl.java

@@ -5,32 +5,17 @@ import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
-import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
-import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictEnum;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.constant.mq.IotMqConstant;
-import com.yunfeiyun.agmp.iot.common.constant.mqtt.IotMqttConstant;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
-import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconfig;
-import com.yunfeiyun.agmp.iot.common.domain.IotXphGssqdata;
-import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
-import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
-import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iot.common.util.tmn.CustomerIdUtil;
-import com.yunfeiyun.agmp.iots.core.cmd.core.CmdDispatcherService;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
-import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttPublisher;
 import com.yunfeiyun.agmp.iots.device.common.hpfznkg.HpfZnkgDeviceServiceConst;
-import com.yunfeiyun.agmp.iots.device.common.xph.XphDeviceServiceConst;
 import com.yunfeiyun.agmp.iots.device.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iots.device.service.IIotDeviceconfigService;
 import com.yunfeiyun.agmp.iots.device.service.IIotDevicelasteddataService;
-import com.yunfeiyun.agmp.iots.device.serviceImp.xph.IotXphServiceAbs;
 import com.yunfeiyun.agmp.iots.mq.IotsMqService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.support.RabbitExceptionTranslator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/HtSfDeviceImpl.java

@@ -10,7 +10,7 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.core.tcp.TaskQueueService;
 import com.yunfeiyun.agmp.iots.core.tcp.model.SynDeviceStatusModel;
 import com.yunfeiyun.agmp.iots.core.tcp.model.SynDeviceStatusTask;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/IHikVisionEzvizDeviceImpl.java

@@ -14,7 +14,7 @@ import com.yunfeiyun.agmp.iot.common.domain.IotMonitorCapture;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iots.core.http.EzvizHttpClient;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.HttpDeviceAbstractImpl;
 import com.yunfeiyun.agmp.iots.device.common.ezviz.EzvizApi;
 import com.yunfeiyun.agmp.iots.device.service.IHikVisionEzvizDevice;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/IotHpfZnkgServiceImpl.java

@@ -1,6 +1,5 @@
 package com.yunfeiyun.agmp.iots.device.serviceImp;
 
-import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;
@@ -12,10 +11,9 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.constant.mqtt.IotMqttConstant;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttPublisher;
 import com.yunfeiyun.agmp.iots.device.common.hpfznkg.HpfZnkgDeviceServiceConst;
-import com.yunfeiyun.agmp.iots.device.domain.bzy.YfBzyTakephotoMsg;
 import com.yunfeiyun.agmp.iots.device.service.IIotCmdlogService;
 import com.yunfeiyun.agmp.iots.device.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iots.device.service.IIotHpfZnkgService;
@@ -25,10 +23,7 @@ import org.apache.http.util.TextUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 @Component(ServiceNameConst.SERVICE_HPF_ZNKG)
 @Slf4j

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/IotYrSfServiceImpl.java

@@ -5,14 +5,13 @@ import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.constant.cmd.CmdDef;
-import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictEnum;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.constant.mqtt.IotMqttConstant;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotYrSfdata;
 import com.yunfeiyun.agmp.iot.common.domain.YrSfDataDto;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttPublisher;
 import com.yunfeiyun.agmp.iots.device.service.*;
 import lombok.extern.slf4j.Slf4j;
@@ -20,14 +19,13 @@ import org.apache.http.util.TextUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
 /**
  * 性诱测报详细信息Service业务层处理
- * 
+ *
  * @author 杨晓辉
  * @date 2024-06-03
  */

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/XmznZndpDeviceImpl.java

@@ -3,7 +3,6 @@ package com.yunfeiyun.agmp.iots.device.serviceImp;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.common.constant.Constants;
-import com.yunfeiyun.agmp.common.enums.RedisCacheKey;
 import com.yunfeiyun.agmp.common.framework.manager.RedisCacheManager;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
@@ -28,14 +27,12 @@ import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.IotAddressService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
-import com.yunfeiyun.agmp.iots.core.http.HttpManager;
+import com.yunfeiyun.agmp.iots.core.manager.HttpManager;
 import com.yunfeiyun.agmp.iots.core.http.XmznHttpClient;
 import com.yunfeiyun.agmp.iots.device.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.*;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/XphDeviceImpl.java

@@ -1,46 +1,20 @@
 package com.yunfeiyun.agmp.iots.device.serviceImp;
 
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.yunfeiyun.agmp.common.utils.DateUtils;
-import com.yunfeiyun.agmp.common.utils.JSONUtils;
-import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.spring.SpringUtils;
-import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
-import com.yunfeiyun.agmp.iot.common.constant.cmd.CmdDef;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
-import com.yunfeiyun.agmp.iot.common.constant.mqtt.IotMqttConstant;
-import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;
-import com.yunfeiyun.agmp.iot.common.domain.IotBzydata;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
-import com.yunfeiyun.agmp.iot.common.domain.IotYfqxzdata;
-import com.yunfeiyun.agmp.iot.common.exception.IotBaseException;
-import com.yunfeiyun.agmp.iot.common.model.address.IotAddressModel;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
-import com.yunfeiyun.agmp.iot.common.service.IotAddressService;
-import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
-import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttPublisher;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.xph.XphDeviceServiceConst;
-import com.yunfeiyun.agmp.iots.device.domain.bzy.YfBzyTakephotoMsg;
-import com.yunfeiyun.agmp.iots.device.domain.yfqxz.YfQxzConfigMsg;
-import com.yunfeiyun.agmp.iots.device.domain.yfqxz.YfQxzLedMsg;
-import com.yunfeiyun.agmp.iots.device.domain.yfqxz.YfQxzMsg;
-import com.yunfeiyun.agmp.iots.device.domain.yfqxz.YfQxzReqMsg;
 import com.yunfeiyun.agmp.iots.device.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.TextUtils;
-import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
-import java.util.function.Function;
 
 
 /**

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/XphHttpDeviceImpl.java

@@ -15,7 +15,7 @@ import com.yunfeiyun.agmp.iot.common.model.IotWarncheck;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iot.common.service.SfCtrlCodeService;
-import com.yunfeiyun.agmp.iots.core.http.HttpManager;
+import com.yunfeiyun.agmp.iots.core.manager.HttpManager;
 import com.yunfeiyun.agmp.iots.core.http.XphHttpClient;
 import com.yunfeiyun.agmp.iots.device.domain.xphhttp.XphHttpControlData;
 import com.yunfeiyun.agmp.iots.device.service.*;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/YfQxzDeviceImpl.java

@@ -22,7 +22,7 @@ import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.IotAddressService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttPublisher;
 import com.yunfeiyun.agmp.iots.device.domain.bzy.YfBzyTakephotoMsg;
 import com.yunfeiyun.agmp.iots.device.domain.yfqxz.YfQxzConfigMsg;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/YfScdDeviceImpl.java

@@ -12,7 +12,7 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.IotAddressService;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttPublisher;
 import com.yunfeiyun.agmp.iots.device.service.*;
 import com.yunfeiyun.agmp.iots.service.IotDeviceAddressService;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/YfXycb2DeviceImpl.java

@@ -6,11 +6,9 @@ import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictEnum;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
-import com.yunfeiyun.agmp.iot.common.constant.mqtt.IotMqttConstant;
 import com.yunfeiyun.agmp.iot.common.domain.*;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
-import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttPublisher;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttException;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/ZhaoHeSfDeviceImpl.java

@@ -9,7 +9,7 @@ import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.SfCtrlCodeService;
 import com.yunfeiyun.agmp.iot.common.util.tmn.CustomerIdUtil;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
-import com.yunfeiyun.agmp.iots.core.http.HttpManager;
+import com.yunfeiyun.agmp.iots.core.manager.HttpManager;
 import com.yunfeiyun.agmp.iots.core.http.ZhaoHeSfHttpClient;
 import com.yunfeiyun.agmp.iots.device.domain.zhaohesf.ZhaoHeSfControlData;
 import com.yunfeiyun.agmp.iots.device.service.*;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/ZjsfXycbDeviceImpl.java

@@ -2,7 +2,6 @@ package com.yunfeiyun.agmp.iots.device.serviceImp;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.yunfeiyun.agmp.common.constant.ResConstants;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
@@ -10,11 +9,8 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.domain.*;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iot.common.util.tmn.cbd.CbdInsectIdentifyUtil;
-import com.yunfeiyun.agmp.iots.core.http.HttpManager;
-import com.yunfeiyun.agmp.iots.core.http.XphHttpClient;
+import com.yunfeiyun.agmp.iots.core.manager.HttpManager;
 import com.yunfeiyun.agmp.iots.core.http.ZjsfXycbHttpClient;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
 import com.yunfeiyun.agmp.iots.device.service.*;
 import com.yunfeiyun.agmp.iots.service.IotDeviceAddressService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/xph/IotXphGssqServiceImpl.java

@@ -8,7 +8,7 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotXphGssqdata;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.xph.XphDeviceServiceConst;
 import com.yunfeiyun.agmp.iots.device.service.IIotDevicelasteddataService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/xph/IotXphLdswJcServiceImpl.java

@@ -8,7 +8,7 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotXphLdswJcdata;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.xph.XphDeviceServiceConst;
 import com.yunfeiyun.agmp.iots.device.service.IIotDevicelasteddataService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/xph/IotXphServiceAbs.java

@@ -8,7 +8,7 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.enums.EnumWarnType;
 import com.yunfeiyun.agmp.iot.common.model.IotWarncheck;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iots.device.service.IIotXphService;
 import com.yunfeiyun.agmp.iots.device.service.WarnService;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/xph/IotXphSzzxJcServiceImpl.java

@@ -8,7 +8,7 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotXphSzzxJcdata;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.xph.XphDeviceServiceConst;
 import com.yunfeiyun.agmp.iots.device.service.IIotDevicelasteddataService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/xphhttp/XphHttpGpQxzDeviceImpl.java

@@ -4,8 +4,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
-import com.yunfeiyun.agmp.iot.common.constant.cmd.CmdDef;
-import com.yunfeiyun.agmp.iot.common.constant.device.xph.XphRelayEnum;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.constant.mq.IotMqConstant;
@@ -15,9 +13,8 @@ import com.yunfeiyun.agmp.iot.common.model.IotWarncheck;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iot.common.service.SfCtrlCodeService;
-import com.yunfeiyun.agmp.iots.core.http.HttpManager;
+import com.yunfeiyun.agmp.iots.core.manager.HttpManager;
 import com.yunfeiyun.agmp.iots.core.http.XphHttpClient;
-import com.yunfeiyun.agmp.iots.device.domain.xphhttp.XphHttpControlData;
 import com.yunfeiyun.agmp.iots.device.service.*;
 import com.yunfeiyun.agmp.iots.mq.IotsMqService;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/yunfeiyun/agmp/iots/mq/IotsMqReceiver.java

@@ -12,7 +12,7 @@ import com.yunfeiyun.agmp.iot.common.constant.mq.IotMqConstant;
 import com.yunfeiyun.agmp.iot.common.model.IotWarncheck;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
 import com.yunfeiyun.agmp.iots.core.cmd.core.CmdDispatcherService;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.HttpDevice;
 import com.yunfeiyun.agmp.iots.device.service.IIotFirmdevService;
 import com.yunfeiyun.agmp.iots.device.service.WarnService;

src/main/java/com/yunfeiyun/agmp/iots/service/IotStatusService.java

@@ -5,7 +5,7 @@ import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.model.device.IotDeviceStatusResVo;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttCore;
 import com.yunfeiyun.agmp.iots.device.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iots.device.service.IIotDeviceconfigService;
@@ -139,14 +139,14 @@ public class IotStatusService {
                         // so:不管之前在线，还是一直离线先都尝试重新链接订阅
                         //if ("1".equals(iotDeviceStatusResVo.getDevStatus())) {
                         // 获取该类型用的mqttcore 问：会不会没有呢，不会，系统初始化时候必须先建立
-                        MqttCore mqttCore = mqttManager.getMqttCoreByFirmAndDevType(firmBizId, devtypeBid);
+                       /* MqttCore mqttCore = mqttManager.getMqttCoreByFirmAndDevType(firmBizId, devtypeBid);
                         if (mqttCore != null) {
                             log.info("【设备检测】【尝试重连】：设备：{} {} 上次时间：{}，30分钟没有更新数据,厂家：{}，厂家名称：{}，设备类型：{}", devName, devCode, vTime, firmBizId, mqttCore.getFirmName(), devtypeBid);
                             reConnection(mqttCore.getServiceName(), devCode, devName, devtypeBid);
                             errorNum += 1;
                         } else {
                             log.error("【设备检测】【重连异常】【重视！！！】未找到服务 设备：{} code: {} 厂家id：{}，厂家名称：{}，设备类型：{}", devName, devCode, firmBizId, devtypeBid);
-                        }
+                        }*/
                     } else {
                         cleanStatCount(devCode, iotDeviceStatusResVo.getDevName());
                         log.info("【设备检测】【正常】：设备：{} {} 上次时间：{}", iotDeviceStatusResVo.getDevName(), iotDeviceStatusResVo.getDevCode(), vTime);

src/main/java/com/yunfeiyun/agmp/iots/task/MqttSubScheduler.java

@@ -1,21 +1,11 @@
 package com.yunfeiyun.agmp.iots.task;
 
-import com.alibaba.fastjson2.JSONObject;
-import com.yunfeiyun.agmp.iot.common.domain.IotFirmdev;
-import com.yunfeiyun.agmp.iot.common.domain.resvo.IotFirmdevResVo;
-import com.yunfeiyun.agmp.iots.core.mqtt.DeviceTopicService;
-import com.yunfeiyun.agmp.iots.core.mqtt.MqttManager;
-import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttConfig;
-import com.yunfeiyun.agmp.iots.core.mqtt.network.MqttCore;
-import com.yunfeiyun.agmp.iots.device.service.IIotFirmdevService;
+import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-import java.util.Objects;
-
 @Slf4j
 @Component
 public class MqttSubScheduler {

src/main/java/com/yunfeiyun/agmp/iots/task/ZhaoHeSfScheduler.java

@@ -1,7 +1,5 @@
 package com.yunfeiyun.agmp.iots.task;
 
-import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
-import com.yunfeiyun.agmp.iots.core.http.HttpManager;
 import com.yunfeiyun.agmp.iots.core.http.ZhaoHeSfHttpClient;
 import com.yunfeiyun.agmp.iots.device.service.IZhaoHeSfDevice;
 import lombok.extern.slf4j.Slf4j;