第二版,后台bug

src/main/java/com/care/bms/service/DeviceService.java

@@ -16,6 +16,7 @@ import com.care.common.vo.UserLogindConvertVO;
 import com.care.common.vo.device.DeviceVO;
 import com.care.common.vo.order.OrderContactorVO;
 import com.care.common.vo.order.OrderOlderVO;
+import com.care.mqtt.service.MqttConnectorPoolService;
 import lombok.Synchronized;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -52,14 +53,14 @@ public class DeviceService {
     @Resource
     private CareSysUserService careSysUserService;
     @Resource
-    private MqttConnectorPoolInitService mqttConnectorPoolInitService;
+    private MqttConnectorPoolService mqttConnectorPoolService;
     /**
      * 删除设备
      * @param id
      * @return
      */
     public boolean deleteById(Long id){
-        mqttConnectorPoolInitService.removeOne(this.careDeviceService.getById(id));
+        mqttConnectorPoolService.removeOne(this.careDeviceService.getById(id));
         return this.careDeviceService.removeById(id);
     }
 
@@ -142,6 +143,7 @@ public class DeviceService {
         CareDevice device = new CareDevice();
         BeanUtil.copyProperties(vo,device);
 
+        //设备上线
         device.setStatus(DeviceStatusEnum.ONLINE.getValue());
         device.setCreateTime(new Date());
         device.setOrgId(loginUser.getOrgId());
@@ -149,9 +151,10 @@ public class DeviceService {
         device.setTopic("5JPD/monitor/"+device.getDevCode()+"/event");
         Long time = System.currentTimeMillis();
         device.setClientId(HexUtil.toHex(time));
+
         this.careDeviceService.save(device);
         //保存完后，启动通道
-        mqttConnectorPoolInitService.addOne(device);
+        mqttConnectorPoolService.addOne(device);
 
     }
 
@@ -162,12 +165,13 @@ public class DeviceService {
     @Transactional(rollbackFor = Exception.class)
     public void updateDevice(DeviceVO vo) {
 
-
         //保存设备
         CareDevice device = this.careDeviceService.getById(vo.getId());
 
         if (DeviceActiveStatusEnum.ACTIVE.getValue().equals(device.getActiveStatus())) {
-            mqttConnectorPoolInitService.removeOne(device);
+            //设备离线
+            device.setStatus(DeviceStatusEnum.OFFLINE.getValue());
+            mqttConnectorPoolService.removeOne(device);
         }
 
         MyBeanUtils.copyProperties(vo, device);
@@ -310,8 +314,10 @@ public class DeviceService {
         }
 
         if(DeviceActiveStatusEnum.ACTIVE.getValue().equals(device.getActiveStatus())) {
+            //设备上线
+            device.setStatus(DeviceStatusEnum.ONLINE.getValue());
             //保存完后，启动通道
-            mqttConnectorPoolInitService.addOne(device);
+            mqttConnectorPoolService.addOne(device);
         }
     }
     /**

src/main/java/com/care/common/entity/CareRoom.java

@@ -56,6 +56,9 @@ public class CareRoom implements Serializable {
     @TableField("Z")
     private Double z;
 
+    @ApiModelProperty("mqtt返回配置结果")
+    @TableField("ACK")
+    private String ack;
 
     @ApiModelProperty("createTime")
     @TableField("CREATE_TIME")

src/main/java/com/care/common/entity/CareRoomGate.java

@@ -66,6 +66,9 @@ public class CareRoomGate implements Serializable {
     @TableField("HIGHT")
     private Double hight;
 
+    @ApiModelProperty("mqtt返回配置结果")
+    @TableField("ACK")
+    private String ack;
 
     @ApiModelProperty("createTime")
     @TableField("CREATE_TIME")

src/main/java/com/care/common/entity/CareRoomRegion.java

@@ -81,6 +81,9 @@ public class CareRoomRegion implements Serializable {
     @TableField("ROTATION")
     private Double rotation;
 
+    @ApiModelProperty("mqtt返回配置结果")
+    @TableField("ACK")
+    private String ack;
 
     @ApiModelProperty("createTime")
     @TableField("CREATE_TIME")

src/main/java/com/care/common/entity/CareRoomSensor.java

@@ -57,6 +57,10 @@ public class CareRoomSensor implements Serializable {
     private Double z;
 
 
+    @ApiModelProperty("mqtt返回配置结果")
+    @TableField("ACK")
+    private String ack;
+
     @ApiModelProperty("createTime")
     @TableField("CREATE_TIME")
     private Date createTime;

src/main/java/com/care/common/init/InitRunner.java

@@ -1,8 +1,8 @@
 package com.care.common.init;
 
 
-import com.care.bms.service.MqttConnectorPoolInitService;
-import com.care.bms.service.MqttThreadPoolInitService;
+import com.care.mqtt.service.MqttConnectorPoolService;
+import com.care.mqtt.service.MqttThreadPoolService;
 import com.care.common.util.CommonConfUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -18,17 +18,17 @@ public class InitRunner implements CommandLineRunner {
     private static final Logger logger = LogManager.getLogger(InitRunner.class);
 
     @Autowired
-    private MqttConnectorPoolInitService mqttConnectorPoolInitService;
+    private MqttConnectorPoolService mqttConnectorPoolService;
     @Autowired
-    private MqttThreadPoolInitService mqttThreadPoolInitService;
+    private MqttThreadPoolService mqttThreadPoolService;
 
     @Override
     public void run(String... args) throws Exception {
         String mqttOn = CommonConfUtil.getConf("mqtt.on");
         if ("1".equals(mqttOn)){
             logger.info("初始化MQTTstart ...........................");
-            mqttConnectorPoolInitService.init();
-            mqttThreadPoolInitService.init();
+            mqttConnectorPoolService.init();
+            mqttThreadPoolService.init();
             logger.info("初始化MQTTend ...........................");
         }
     }

src/main/java/com/care/installation/controller/RoomController.java

@@ -191,4 +191,17 @@ public class RoomController {
         }
     }
 
+    /**
+     * 查询配置房间信息的结果
+     * @return
+     */
+    @GetMapping("getCommitRoomInfoResult")
+    @ApiOperation(tags = {"设备安装"},value = "查询配置房间信息的结果")
+    public Result<Object> getConfigureRoomInfoResult(@RequestParam("devCode") String devCode) {
+        if (this.roomService.getConfigureRoomInfoResult(devCode)){
+            return  Result.success("配置成功");
+        } else{
+            return  Result.error("配置失败");
+        }
+    }
 }

src/main/java/com/care/installation/service/MqttPublishService.java

@@ -1,68 +0,0 @@
-package com.care.installation.service;
-
-
-import com.care.bms.mqtt.MqttDataConnector;
-
-import com.care.common.entity.CareDevice;
-import com.care.common.util.CommonConfUtil;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @Author: stw
- * @Date: 2021/8/14
- * @Desc:
- */
-@Service
-public class MqttPublishService {
-
-
-    /**
-     * 初始化mqtt
-     */
-    private MqttDataConnector init(String cliendId) {
-        try {
-            MqttDataConnector xbMqttDataConnector = new MqttDataConnector();
-            Map<String, String> configParams = new HashMap<>();
-            String host = "ws://" + CommonConfUtil.getConf("mqtt.broker") + ":" + CommonConfUtil.getConf("mqtt.port");
-            String username = CommonConfUtil.getConf("mqtt.username");
-            String password = CommonConfUtil.getConf("mqtt.password");
-            configParams.put("MQTT_HOST", host);
-            configParams.put("MQTT_CLIENTID", cliendId);
-            configParams.put("MQTT_USERNAME", username);
-            configParams.put("MQTT_PASSWORD", password);
-            xbMqttDataConnector.createIotDataSource(configParams);
-            return xbMqttDataConnector;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * 发布消息
-     */
-    public boolean publish(CareDevice careDevice,String data) {
-        try {
-            String topic = careDevice.getTopic();
-            String cliendId = careDevice.getClientId();
-            if (StringUtils.isEmpty(topic) || StringUtils.isEmpty(cliendId)) {
-                return false;
-            }
-            String publishTopic = topic.replace("event","control");
-            MqttDataConnector mqttDataConnector = init(cliendId);
-            if(mqttDataConnector == null){
-                return false;
-            }
-            mqttDataConnector.publish(publishTopic, data);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-}

src/main/java/com/care/installation/service/RoomService.java

@@ -9,6 +9,7 @@ import com.care.common.enums.DeviceActiveStatusEnum;
 import com.care.common.service.*;
 import com.care.common.util.JsonUtil;
 import com.care.installation.vo.*;
+import com.care.mqtt.service.MqttPublishService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -200,10 +201,6 @@ public class RoomService {
             if (CollUtil.isNotEmpty(roomRegionVOList)){
                 mqttPublishService.publish(careDevice, getRoomRegionVOMqttData(roomRegionVOList));
             }
-            //TODO 返回值
-
-            //激活
-            careDevice.setActiveStatus(DeviceActiveStatusEnum.ACTIVE.getValue());
             return careDeviceService.updateById(careDevice);
         } catch (Exception e) {
             e.printStackTrace();
@@ -211,6 +208,67 @@ public class RoomService {
         }
     }
 
+    /**
+     * 查询配置房间信息的Mqtt返回结果
+     * @return
+     */
+    public Boolean getConfigureRoomInfoResult(String devCode) {
+        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareDevice::getDevCode,devCode);
+        CareDevice careDevice = careDeviceService.getOne(queryWrapper);
+
+        QueryWrapper<CareRoom> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.lambda().eq(CareRoom::getRoomId,devCode);
+        CareRoom careRoom = careRoomService.getOne(queryWrapper2);
+        boolean careRoomBool = "true".equals(careRoom.getAck());
+
+        QueryWrapper<CareRoomSensor> queryWrapper3 = new QueryWrapper<>();
+        queryWrapper3.lambda().eq(CareRoomSensor::getRoomId,devCode);
+        CareRoomSensor careRoomSensor = careRoomSensorService.getOne(queryWrapper3);
+        boolean careRoomSensorBool = "true".equals(careRoomSensor.getAck());
+
+        QueryWrapper<CareRoomGate> queryWrapper4 = new QueryWrapper<>();
+        queryWrapper4.lambda().eq(CareRoomGate::getRoomId,devCode);
+        List<CareRoomGate> careRoomGateList = careRoomGateService.list(queryWrapper4);
+        boolean careRoomGateListBool = true;
+        if(CollUtil.isNotEmpty(careRoomGateList)){
+           for(CareRoomGate careRoomGate : careRoomGateList) {
+               if(!"true".equals(careRoomGate.getAck())){
+                   careRoomGateListBool = false;
+                   break;
+               }
+           }
+        } else { //不允许为空
+            careRoomGateListBool = false;
+        }
+
+        QueryWrapper<CareRoomRegion> queryWrapper5 = new QueryWrapper<>();
+        queryWrapper5.lambda().eq(CareRoomRegion::getRoomId,devCode);
+        List<CareRoomRegion> careRoomRegionList = careRoomRegionService.list(queryWrapper5);
+        boolean careRoomRegionListBool = true;
+        if(CollUtil.isNotEmpty(careRoomRegionList)){ //允许为空
+            for(CareRoomRegion careRoomRegion : careRoomRegionList) {
+                if(!"true".equals(careRoomRegion.getAck())){
+                    careRoomRegionListBool = false;
+                    break;
+                }
+            }
+        }
+
+        if (careRoomBool && careRoomSensorBool && careRoomGateListBool && careRoomRegionListBool) {
+            //激活
+            careDevice.setActiveStatus(DeviceActiveStatusEnum.ACTIVE.getValue());
+            careDeviceService.updateById(careDevice);
+            return true;
+        } else {
+            careDevice.setActiveStatus(DeviceActiveStatusEnum.NOACTIVE.getValue());
+            careDeviceService.updateById(careDevice);
+            return false;
+        }
+    }
+
+
+
     private String getRoomMqttData( RoomVO vo) throws Exception {
         Map<String,Object> data = new HashMap<>();
         data.put("type","RoomVO");

src/main/java/com/care/installation/vo/RoomGateVO.java

@@ -46,6 +46,8 @@ public class RoomGateVO implements Serializable {
     @ApiModelProperty("高(m)")
     private Double hight;
 
+    @ApiModelProperty("mqtt返回配置结果")
+    private String ack;
 
     @ApiModelProperty("createTime")
     private Date createTime;

src/main/java/com/care/installation/vo/RoomRegionVO.java

@@ -60,6 +60,8 @@ public class RoomRegionVO implements Serializable {
     @ApiModelProperty("旋转角度")
     private Double rotation;
 
+    @ApiModelProperty("mqtt返回配置结果")
+    private String ack;
 
     @ApiModelProperty("createTime")
     private Date createTime;

src/main/java/com/care/installation/vo/RoomSensorVO.java

@@ -44,6 +44,8 @@ public class RoomSensorVO implements Serializable {
     @ApiModelProperty("z(m)")
     private Double z;
 
+    @ApiModelProperty("mqtt返回配置结果")
+    private String ack;
 
     @ApiModelProperty("createTime")
     private Date createTime;

src/main/java/com/care/installation/vo/RoomVO.java

@@ -38,6 +38,8 @@ public class RoomVO implements Serializable {
     @ApiModelProperty("z(m)")
     private Double z;
 
+    @ApiModelProperty("mqtt返回配置结果")
+    private String ack;
 
     @ApiModelProperty("createTime")
     private Date createTime;

src/main/java/com/care/bms/service/MqttConnectorPoolInitService.java

@@ -1,9 +1,9 @@
-package com.care.bms.service;
+package com.care.mqtt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.care.bms.mqtt.MqttDataConnector;
-import com.care.bms.mqtt.MqttMessageListener;
-import com.care.bms.mqtt.MqttDataConnectorPool;
+import com.care.mqtt.tool.MqttDataConnector;
+import com.care.mqtt.tool.MqttMessageListener;
+import com.care.mqtt.tool.MqttDataConnectorPool;
 import com.care.common.entity.*;
 import com.care.common.enums.*;
 import com.care.common.service.*;
@@ -20,7 +20,7 @@ import java.util.*;
  * @Desc:
  */
 @Service
-public class MqttConnectorPoolInitService {
+public class MqttConnectorPoolService {
     @Resource
     private CareDeviceService careDeviceService;
     @Resource
@@ -38,9 +38,9 @@ public class MqttConnectorPoolInitService {
     /**
      * 添加一个设备到服务
      */
-    public void addOne(CareDevice careDevice) {
-        if (org.springframework.util.StringUtils.isEmpty(careDevice.getTopic()) || org.springframework.util.StringUtils.isEmpty(careDevice.getClientId())) {
-            return;
+    public MqttDataConnector addOne(CareDevice careDevice) {
+        if (StringUtils.isEmpty(careDevice.getTopic()) || StringUtils.isEmpty(careDevice.getClientId())) {
+            return null;
         }
         MqttDataConnector xbMqttDataConnector = new MqttDataConnector();
         Map<String, String> configParams = new HashMap<>();
@@ -61,12 +61,11 @@ public class MqttConnectorPoolInitService {
 
             MqttDataConnectorPool.getMqttDataConnectorMap().put(cliendId, xbMqttDataConnector);
 
-            //设备上线
-            careDevice.setStatus(DeviceStatusEnum.ONLINE.getValue());
-
+            return xbMqttDataConnector;
         } catch (Exception e) {
             e.printStackTrace();
         }
+        return null;
     }
 
     /**
@@ -81,9 +80,6 @@ public class MqttConnectorPoolInitService {
             MqttDataConnectorPool.getMqttDataConnectorMap().get(clientId).destroy();
             MqttDataConnectorPool.getMqttDataConnectorMap().remove(clientId);
         }
-
-        //设备下线
-        careDevice.setStatus(DeviceStatusEnum.OFFLINE.getValue());
     }
 
 }

src/main/java/com/care/bms/service/MqttMsgService.java

@@ -1,4 +1,4 @@
-package com.care.bms.service;
+package com.care.mqtt.service;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -48,7 +48,15 @@ public class MqttMsgService {
     @Resource
     private CareEventOrderChambService careEventOrderChambService;
     @Resource
-    private MqttThreadPoolInitService MqttThreadPoolInitService;
+    private MqttThreadPoolService MqttThreadPoolService;
+    @Resource
+    private CareRoomSensorService careRoomSensorService;
+    @Resource
+    private CareRoomService careRoomService;
+    @Resource
+    private CareRoomGateService careRoomGateService;
+    @Resource
+    private CareRoomRegionService careRoomRegionService;
 
     private static Logger logger = LoggerFactory.getLogger(MqttMsgService.class);
 
@@ -59,6 +67,64 @@ public class MqttMsgService {
      * @throws Exception
      */
     public void handleMessage(String topic, String mqttMessageStr) throws Exception {
+        if(topic.contains("event")){ //工单的消息
+            handleOrderEventMessage(topic,mqttMessageStr);
+        } else { //房间信息配置的返回消息
+            handleConfigureRoomInfoResultMessage(topic,mqttMessageStr);
+        }
+    }
+
+    /**
+     * 查询配置房间信息的结果消息 处理
+     * @param topic
+     * @param mqttMessageStr
+     */
+    private void handleConfigureRoomInfoResultMessage(String topic, String mqttMessageStr) {
+        Map map = JSON.parseObject(mqttMessageStr);
+        String type = (String) map.get("type");
+
+        if(StringUtils.isEmpty(type)) {
+            logger.error("不是正确格式的消息");
+            return;
+        }
+        QueryWrapper<CareDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CareDevice::getTopic,topic.replaceAll("event","control"));
+        CareDevice careDevice = careDeviceService.getOne(queryWrapper);
+        if(careDevice == null) {
+            logger.error("数据库中没找到对应设备");
+            return;
+        }
+        String devCode = careDevice.getDevCode();
+
+        Map msg = (Map) map.get("msg");
+        String ack = String.valueOf(msg.get("ack"));
+
+        if("CfgAreaAck".equals(type)) { //房间信息
+            UpdateWrapper<CareRoom> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.lambda().eq(CareRoom::getRoomId,devCode).set(CareRoom::getAck,ack);
+            careRoomService.update(updateWrapper);
+        } else if("CfgDevicePositionAck".equals(type)) { //传感器
+            UpdateWrapper<CareRoomSensor> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.lambda().eq(CareRoomSensor::getRoomId,devCode).set(CareRoomSensor::getAck,ack);
+            careRoomSensorService.update(updateWrapper);
+        } else if("CfgGatesAck".equals(type)) { //门
+            UpdateWrapper<CareRoomGate> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.lambda().eq(CareRoomGate::getRoomId,devCode).set(CareRoomGate::getAck,ack);
+            careRoomGateService.update(updateWrapper);
+        } else if("CfgRegionsAck".equals(type)) { //区域
+            UpdateWrapper<CareRoomRegion> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.lambda().eq(CareRoomRegion::getRoomId,devCode).set(CareRoomRegion::getAck,ack);
+            careRoomRegionService.update(updateWrapper);
+        }
+
+    }
+        /**
+         * 工单事件的消息 处理
+         * @param topic
+         * @param mqttMessageStr
+         */
+    private void handleOrderEventMessage(String topic, String mqttMessageStr) {
+
         try {
 
             Map map = JSON.parseObject(mqttMessageStr);
@@ -75,6 +141,7 @@ public class MqttMsgService {
                 logger.error("数据库中没找到对应设备");
                 return;
             }
+
             Date date = DateUtil.date();
 
             CareMqttMsg careMqttMsg = new CareMqttMsg();
@@ -145,7 +212,7 @@ public class MqttMsgService {
                         orderDb.setStatus(OrderStatusEnum.CANCEL.getValue());
                         this.careEventOrderService.updateById(orderDb);
 
-                         //管家工单标记为取消
+                        //管家工单标记为取消
                         CareEventOrderChamb careEventOrderChamb = this.careEventOrderChambService.getChambOrderByOrderId(orderDb.getId());
                         careEventOrderChamb.setStatus(ChambOrderStatusEnum.CANCEL.getValue());
                         this.careEventOrderChambService.updateById(careEventOrderChamb);
@@ -185,7 +252,7 @@ public class MqttMsgService {
                         this.careMqttMsgService.save(careMqttMsg);
 
                         //进行调度处理
-                        MqttThreadPoolInitService.addScheduled(careMqttMsg,careMqttMsg.getDelayTime() * 60 * 1000);
+                        MqttThreadPoolService.addScheduled(careMqttMsg,careMqttMsg.getDelayTime() * 60 * 1000);
                     } else { //取消： 更新mqtt消息为已取消，等待执行的调度到时会取消执行
                         careMqttMsg.setStatus(MqttMsgStatusEnum.HANDLED.getValue());
                         this.careMqttMsgService.save(careMqttMsg);
@@ -204,7 +271,6 @@ public class MqttMsgService {
         }
     }
 
-
     private Integer getDelayTime(String type, CareDevice careDevice) {
         if ("FallDown".equals(type)) { //跌到
             return careDevice.getFallResponseTime();

src/main/java/com/care/mqtt/service/MqttPublishService.java

@@ -0,0 +1,49 @@
+package com.care.mqtt.service;
+
+
+import com.care.mqtt.tool.MqttDataConnector;
+
+import com.care.common.entity.CareDevice;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author: stw
+ * @Date: 2021/8/14
+ * @Desc:
+ */
+@Service
+public class MqttPublishService {
+    @Resource
+    private MqttConnectorPoolService mqttConnectorPoolService;
+
+
+    /**
+     * 发布消息
+     */
+    public boolean publish(CareDevice careDevice,String data) {
+        try {
+
+            String topic = careDevice.getTopic();
+            String cliendId = careDevice.getClientId();
+            if (StringUtils.isEmpty(topic) || StringUtils.isEmpty(cliendId)) {
+                return false;
+            }
+
+            String publishTopic = topic.replace("event","control");
+            careDevice.setTopic(publishTopic);
+
+            MqttDataConnector mqttDataConnector = mqttConnectorPoolService.addOne(careDevice);
+
+            mqttDataConnector.publish(publishTopic, data);
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+}

src/main/java/com/care/bms/service/MqttThreadPoolInitService.java

@@ -1,4 +1,4 @@
-package com.care.bms.service;
+package com.care.mqtt.service;
 
 
 import cn.hutool.core.collection.CollUtil;
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
  * @Desc:
  */
 @Service
-public class MqttThreadPoolInitService {
+public class MqttThreadPoolService {
     @Resource
     private CareDeviceService careDeviceService;
     @Resource

src/main/java/com/care/bms/mqtt/MqttDataConnector.java

@@ -1,4 +1,4 @@
-package com.care.bms.mqtt;
+package com.care.mqtt.tool;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.*;

src/main/java/com/care/bms/mqtt/MqttDataConnectorPool.java

@@ -1,4 +1,4 @@
-package com.care.bms.mqtt;
+package com.care.mqtt.tool;
 
 
 import java.util.HashMap;

src/main/java/com/care/bms/mqtt/MqttMessageListener.java

@@ -1,14 +1,12 @@
-package com.care.bms.mqtt;
+package com.care.mqtt.tool;
 
 
-import com.care.bms.service.MqttMsgService;
+import com.care.mqtt.service.MqttMsgService;
 import org.eclipse.paho.client.mqttv3.IMqttMessageListener;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Map;
-
 
 /**
  * 订阅信息监听类

src/main/java/com/care/bms/mqtt/SslUtil.java

@@ -1,4 +1,4 @@
-package com.care.bms.mqtt;
+package com.care.mqtt.tool;
 
 import org.apache.commons.lang3.StringUtils;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;