合并调试分支

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:
@@ -265,15 +265,15 @@ public class DeviceTopicService {
      * @param connectionId
      * @return
      */
-    public String[] getDeviceCodesByConectionId(String connectionId) {
-        List<String> ids = iotDeviceService.getDeviceCodesByConectionId(connectionId);
+    public String[] getDeviceCodesByDevConnBid(String devconnBid) {
+        List<String> ids = iotDeviceService.getDeviceCodesByDevconnBid(devconnBid);
         if (ids == null || ids.isEmpty()) {
             return new String[]{};
         }
         return ids.toArray(new String[]{});
     }
 
-    public List<IotDevice> getDevicesByConectionId(String connectionId) {
-        return iotDeviceService.getDevicesByConectionId(connectionId);
+    public List<IotDevice> getDevicesByDevConnBid(String devConnBid) {
+        return iotDeviceService.getDevicesByDevconnBid(devConnBid);
     }
 }

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

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttClient;
+import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

src/main/java/com/yunfeiyun/agmp/iots/device/mapper/BusinessCoreMapper.java

@@ -1,7 +1,6 @@
 package com.yunfeiyun.agmp.iots.device.mapper;
 
 import com.yunfeiyun.agmp.iots.common.modal.IotDeviceconnResVo;
-import com.yunfeiyun.agmp.iots.common.modal.TosDevicetypeResVo;
 
 import java.util.List;
 
@@ -11,5 +10,6 @@ public interface BusinessCoreMapper {
      *
      * @return
      */
-    List<IotDeviceconnResVo> selectTosDevicetypeResVoList();
+    List<IotDeviceconnResVo> selectDevConnResVoList();
+
 }

src/main/java/com/yunfeiyun/agmp/iots/device/mapper/IotDeviceMapper.java

@@ -96,9 +96,9 @@ public interface IotDeviceMapper {
 
     int updateIotDeviceStatusByType(@Param("devStatus") String devStatus,@Param("firmBid") String firmBid,@Param("devtypeBid")String devtypeBid);
 
-    List<String> getDeviceCodesByConectionId(@Param("connectionId") String connectionId);
+    List<String> getDeviceCodesByDevconnBid(@Param("devconnBid") String devconnBid);
 
-    List<IotDevice> getDevicesByConectionId(String connectionId);
+    List<IotDevice> getDevicesByDevconnBid(String devconnBid);
 
     List<IotDevice> selectIotDeviceByDevtypeBidList(List<String> devTypeBidList);
 }

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

@@ -123,7 +123,7 @@ public class BzyDeviceImpl extends DeviceAbstractImpl implements IBzyDevice {
             }
         }
 
-        MqttPublisher mqttPublisher = mqttManager.getPublisherByService(SERVICE_NAME);
+        MqttPublisher mqttPublisher = mqttManager.getPublisherByDevConnBid(SERVICE_NAME);
         mqttPublisher.publish(IotMqttConstant.YFBzyTopic.TOPIC_BZY_CMD_PREFIX + cmdModel.getIotDevice().getDevCode(), mqttMsgContent);
         mqttPublisher.publish(IotMqttConstant.YFBzyTopic.TOPIC_BZY_CMD_PREFIX_2 + cmdModel.getIotDevice().getDevCode(), mqttMsgContent);
         log.info("【孢子仪】发送指令完毕！");

src/main/java/com/yunfeiyun/agmp/iots/mq/listener/IotmBaseDataChannelAwareMessageListener.java

@@ -8,16 +8,13 @@ import com.yunfeiyun.agmp.common.utils.spring.SpringUtils;
 import com.yunfeiyun.agmp.iot.common.constant.mq.IotActionEnums;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
-import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
-import com.yunfeiyun.agmp.iot.common.model.cmd.CmdModel;
+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.TypeCacheService;
 import com.yunfeiyun.agmp.iots.core.cmd.core.CmdDispatcherService;
 import com.yunfeiyun.agmp.iots.core.manager.ConnectionManager;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.core.mqtt.DeviceTopicService;
-import com.yunfeiyun.agmp.iots.core.mqtt.modal.MqttTopicValue;
 import com.yunfeiyun.agmp.iots.device.common.Device;
 import com.yunfeiyun.agmp.iots.device.serviceImp.IotCbdImgService;
 import lombok.extern.slf4j.Slf4j;
@@ -29,9 +26,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 负责处理AGMP 子系统的消息

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

@@ -21,9 +21,8 @@ public class BusinessCoreService {
      *
      * @return
      */
-    public List<IotDeviceconnResVo> selectTosDevicetypeResVoList() {
-
-        return businessCoreMapper.selectTosDevicetypeResVoList();
+    public List<IotDeviceconnResVo> selectDevConnResVoList() {
+        return businessCoreMapper.selectDevConnResVoList();
     }
 
 }

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

@@ -130,9 +130,9 @@ public interface IIotDeviceService {
 
     public void updateIotDeviceBatch(List<IotDevice> iotDeviceList);
 
-    List<String> getDeviceCodesByConectionId(String connectionId);
+    List<String> getDeviceCodesByDevconnBid(String connectionId);
 
-    List<IotDevice> getDevicesByConectionId(String connectionId);
+    List<IotDevice> getDevicesByDevconnBid(String connectionId);
 
     List<IotDevice> selectIotDeviceByDevtypeBidList(List<String> devTypeBidList);
 }

src/main/java/com/yunfeiyun/agmp/iots/service/impl/IotDeviceServiceImpl.java

@@ -317,14 +317,14 @@ public class IotDeviceServiceImpl implements IIotDeviceService {
     }
 
     @Override
-    public List<String> getDeviceCodesByConectionId(String connectionId) {
-        return iotDeviceMapper.getDeviceCodesByConectionId(connectionId);
+    public List<String> getDeviceCodesByDevconnBid(String devConnBid) {
+        return iotDeviceMapper.getDeviceCodesByDevconnBid(devConnBid);
     }
 
     @Override
-    public List<IotDevice> getDevicesByConectionId(String connectionId) {
+    public List<IotDevice> getDevicesByDevconnBid(String devConnBid) {
 
-        return iotDeviceMapper.getDevicesByConectionId(connectionId);
+        return iotDeviceMapper.getDevicesByDevconnBid(devConnBid);
     }
 
     @Override

src/main/resources/mapper/BusinessCoreMapper.xml

@@ -6,7 +6,7 @@
 
 
     <!-- * 这个方法的定位就是：获取设备型号的信息，用于构建链接 *-->
-    <select id="selectTosDevicetypeResVoList"
+    <select id="selectDevConnResVoList"
             resultType="com.yunfeiyun.agmp.iots.common.modal.IotDeviceconnResVo">
             SELECT
                 ic.*,
@@ -14,7 +14,6 @@
         it.devtypeCode ,
         ifd.firmName,
         ifd.firmBid
-
                 from
                 IotDeviceconn ic
         LEFT JOIN TosDevicetype it on ic.devtypeBid = it.devtypeBid

src/main/resources/mapper/IotDeviceMapper.xml

@@ -528,12 +528,6 @@
             </foreach>
         </where>
     </select>
-    <select id="getDevicesByConectionId" resultType="com.yunfeiyun.agmp.iot.common.domain.IotDevice">
-                select  * from IotDevice where devconnBid=#{connectionId} and devDelstatus='0'
-    </select>
-    <select id="getDeviceCodesByConectionId" resultType="java.lang.String">
-        select  devCode from IotDevice where devconnBid=#{connectionId} and devDelstatus='0'
-    </select>
 </mapper>