fix: 删除设备时,需删除gbt28181设备的视频通道

@@ -41,6 +41,7 @@ import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
+import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
 import org.thingsboard.server.service.gateway_device.GatewayNotificationsService;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
@@ -63,7 +64,7 @@ public class TkDeviceController extends BaseController {
   private final TkDeviceProfileService ytDeviceProfileService;
   private final GatewayNotificationsService gatewayNotificationsService;
   private final TkAlarmInfoService tkAlarmInfoService ;
-
+  private final TkVideoChannelService tkVideoChannelService;
 
   @PostMapping("/batch/update")
   @ApiOperation("批量修改设备")
@@ -344,13 +345,14 @@ public class TkDeviceController extends BaseController {
   public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
     String currentTenantId = getCurrentUser().getCurrentTenantId();
-    List<String> tdIds = tkdeviceService.findTbDeviceIdAndCheckForDelete(currentTenantId, deleteDTO.getIds());
-    if(null !=tdIds){
-      for (String id : tdIds) {
+    List<String> tbIds = tkdeviceService.findTbDeviceIdAndCheckForDelete(currentTenantId, deleteDTO.getIds());
+    if(null !=tbIds){
+      for (String id : tbIds) {
         deleteTbDevice(id);
         deleteAlarm(id);
       }
       tkdeviceService.deleteDevices(currentTenantId, deleteDTO.getIds());
+      tkVideoChannelService.clearDeviceChannelByDeviceIds(currentTenantId,tbIds);
     }
   }
 

@@ -71,12 +71,20 @@ public class TkVideoChannelServiceImpl
   }
 
   @Override
+  @Transactional
   public int clearDeviceChannel(String tbDeviceId) {
     return baseMapper.delete(new LambdaQueryWrapper<TkVideoChannelEntity>()
             .eq(TkVideoChannelEntity::getDeviceId, tbDeviceId));
   }
 
   @Override
+  @Transactional
+  public int clearDeviceChannelByDeviceIds(String tenantId,List<String> tbDeviceIds) {
+    return baseMapper.delete(new LambdaQueryWrapper<TkVideoChannelEntity>()
+            .eq(TkVideoChannelEntity::getTenantId,tenantId)
+            .in(TkVideoChannelEntity::getDeviceId, tbDeviceIds));
+  }
+  @Override
   public Map<String, String> findPlayingChannel(String tbDeviceId) {
     List<TkVideoChannelEntity> channelList =
             baseMapper.selectList(
@@ -94,6 +102,7 @@ public class TkVideoChannelServiceImpl
   }
 
   @Override
+  @Transactional
   public VideoChanelDTO updateChannelInfo(VideoChanelDTO videoChanelDTO) {
     if (StringUtils.isEmpty(videoChanelDTO.getId())) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
@@ -105,6 +114,7 @@ public class TkVideoChannelServiceImpl
   }
 
   @Override
+  @Transactional
   public boolean updateVideoChannelStreamId(
       String streamId, String deviceCode, String channelId) {
     TkVideoChannelEntity entity =
@@ -124,6 +134,7 @@ public class TkVideoChannelServiceImpl
   }
 
   @Override
+  @Transactional
   public void updateVideoChannelState(String tbDeviceId, StatusEnum online) {
     TkVideoChannelEntity entity = new TkVideoChannelEntity();
     entity.setStatus(online);

@@ -28,7 +28,14 @@ public interface TkVideoChannelService extends BaseService<TkVideoChannelEntity>
    * @param tbDeviceId
    * @return
    */
-  int clearDeviceChannel(String tbDeviceId);  /**
+  int clearDeviceChannel(String tbDeviceId);
+  /**
+   * 清除摄像头的视频通道
+   * @param tbDeviceIds tb设备ID列表
+   * @return 清除结果
+   */
+  int clearDeviceChannelByDeviceIds(String tenantId,List<String> tbDeviceIds);
+  /**
    * 查询点播中的摄像头通道
    * @param tbDeviceId
    * @return