第二版

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

@@ -59,7 +59,8 @@ public class DeviceService {
     private CareMemberInfoService careMemberInfoService;
     @Resource
     private CareSysUserService careSysUserService;
-
+    @Resource
+    private CareMqttMsgService careMqttMsgService;
 
     /**
      * 删除设备
@@ -160,7 +161,7 @@ public class DeviceService {
         device.setClientId(HexUtil.toHex(time));
         this.careDeviceService.save(device);
         //保存完后，启动通道
-        MqttTool.addOne(device, careDeviceService, bmsEventOrderService, careEventOrderService, careHouseService, careOrganizationService, careStationService);
+        MqttTool.addOne(device, careDeviceService, bmsEventOrderService, careEventOrderService, careHouseService, careOrganizationService, careStationService,careMqttMsgService);
 
     }
 
@@ -308,7 +309,7 @@ public class DeviceService {
 
         if(DeviceActiveStatusEnum.ACTIVE.getValue().equals(device.getActiveStatus())) {
             //保存完后，启动通道
-            MqttTool.addOne(device, careDeviceService, bmsEventOrderService, careEventOrderService, careHouseService, careOrganizationService, careStationService);
+            MqttTool.addOne(device, careDeviceService, bmsEventOrderService, careEventOrderService, careHouseService, careOrganizationService, careStationService,careMqttMsgService);
         }
     }
     /**