第二版,安装小程序

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

@@ -6,7 +6,7 @@ import cn.hutool.core.util.HexUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.care.bms.mqtt.MqttTool;
+import com.care.bms.mqtt.MqttSubscribeTool;
 import com.care.common.entity.*;
 import com.care.common.enums.*;
 import com.care.common.exception.BDException;
@@ -68,7 +68,7 @@ public class DeviceService {
      * @return
      */
     public boolean deleteById(Long id){
-        MqttTool.removeOne(this.careDeviceService.getById(id));
+        MqttSubscribeTool.removeOne(this.careDeviceService.getById(id));
         return this.careDeviceService.removeById(id);
     }
 
@@ -160,7 +160,7 @@ public class DeviceService {
         device.setClientId(HexUtil.toHex(time));
         this.careDeviceService.save(device);
         //保存完后，启动通道
-        MqttTool.addOne(device, careDeviceService, bmsEventOrderService, careEventOrderService, careHouseService, careOrganizationService, careStationService,careMqttMsgService);
+        MqttSubscribeTool.addOne(device, careDeviceService, bmsEventOrderService, careEventOrderService, careHouseService, careOrganizationService, careStationService,careMqttMsgService);
 
     }
 
@@ -176,7 +176,7 @@ public class DeviceService {
         CareDevice device = this.careDeviceService.getById(vo.getId());
 
         if (DeviceActiveStatusEnum.ACTIVE.getValue().equals(device.getActiveStatus())) {
-            MqttTool.removeOne(device);
+            MqttSubscribeTool.removeOne(device);
         }
 
         MyBeanUtils.copyProperties(vo, device);
@@ -320,7 +320,7 @@ public class DeviceService {
 
         if(DeviceActiveStatusEnum.ACTIVE.getValue().equals(device.getActiveStatus())) {
             //保存完后，启动通道
-            MqttTool.addOne(device, careDeviceService, bmsEventOrderService, careEventOrderService, careHouseService, careOrganizationService, careStationService,careMqttMsgService);
+            MqttSubscribeTool.addOne(device, careDeviceService, bmsEventOrderService, careEventOrderService, careHouseService, careOrganizationService, careStationService,careMqttMsgService);
         }
     }
     /**