fix: 删除设备时,删除gbt28181视频配置

@@ -35,10 +35,7 @@ import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.BaseController;
-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.*;
 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.alarm.TbAlarmService;
 import org.thingsboard.server.service.entitiy.alarm.TbAlarmService;
@@ -69,6 +66,7 @@ public class TkDeviceController extends BaseController {
   private final TkOrganizationService organizationService;
   private final TkOrganizationService organizationService;
   private final CacheUtils cacheUtils;
   private final CacheUtils cacheUtils;
   private final TkVideoChannelService tkVideoChannelService;
   private final TkVideoChannelService tkVideoChannelService;
+  private final TkVideoService tkVideoService;
   @PostMapping("/batch/update")
   @PostMapping("/batch/update")
   @ApiOperation("批量修改设备")
   @ApiOperation("批量修改设备")
   @PreAuthorize(
   @PreAuthorize(
@@ -353,6 +351,7 @@ public class TkDeviceController extends BaseController {
         deleteAlarm(id);
         deleteAlarm(id);
       }
       }
       tkVideoChannelService.clearDeviceChannelByDeviceIds(currentTenantId,tbIds);
       tkVideoChannelService.clearDeviceChannelByDeviceIds(currentTenantId,tbIds);
+      tkVideoService.deleteGBT28181VideosByDeviceIds(currentTenantId,tbIds);
     }
     }
   }
   }
 
 

@@ -69,18 +69,20 @@ public class ZLMediaKitHookController extends BaseController {
       String cameraCode = result.get(FastIotConstants.ZLMediaBody.CAMERA_CODE).asText();
       String cameraCode = result.get(FastIotConstants.ZLMediaBody.CAMERA_CODE).asText();
       VideoChanelDTO chanelDTO =
       VideoChanelDTO chanelDTO =
           tkVideoChannelService.findVideoChannelById(cameraCode, channelId, null);
           tkVideoChannelService.findVideoChannelById(cameraCode, channelId, null);
-      controlService.byeCmdInSsrcTransaction(
-          chanelDTO.getTenantId(),
-          false,
-          chanelDTO.getDeviceId(),
-          cameraCode,
-          channelId,
-          result.get(FastIotConstants.ZLMediaBody.SSRCINFO_STREAM).asText(),
-          fromDeviceRpcResponse -> {});
-      tkVideoChannelService.updateVideoChannelStreamId(
-          null,
-          cameraCode,
-          channelId); // storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+      if(null != chanelDTO){
+        controlService.byeCmdInSsrcTransaction(
+                chanelDTO.getTenantId(),
+                false,
+                chanelDTO.getDeviceId(),
+                cameraCode,
+                channelId,
+                result.get(FastIotConstants.ZLMediaBody.SSRCINFO_STREAM).asText(),
+                fromDeviceRpcResponse -> {});
+        tkVideoChannelService.updateVideoChannelStreamId(
+                null,
+                cameraCode,
+                channelId); // storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+      }
     }
     }
     return result;
     return result;
   }
   }

@@ -253,7 +253,18 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
         return videoDTOList.get(0);
         return videoDTOList.get(0);
     }
     }
 
 
-
+    @Override
+    @Transactional
+    public boolean deleteGBT28181VideosByDeviceIds(String tenantId, List<String> deviceIds) {
+        boolean result = false;
+        if(null !=deviceIds && deviceIds.size()>FastIotConstants.MagicNumber.ZERO){
+            for (String deviceId : deviceIds) {
+                baseMapper.deleteVideosByDeviceIds(tenantId,deviceId);
+            }
+            result = true;
+        }
+        return result;
+    }
     void  saveGbtS(TkVideoGbtDTO dto){
     void  saveGbtS(TkVideoGbtDTO dto){
         List<TkVideoGbtDeviceDTO> deviceList =  dto.getGbtDeviceDTOS();
         List<TkVideoGbtDeviceDTO> deviceList =  dto.getGbtDeviceDTOS();
         deviceList.forEach(device -> {
         deviceList.forEach(device -> {

@@ -44,4 +44,8 @@ public interface TkVideoMapper extends BaseMapper<TkVideoEntity> {
      * @return
      * @return
      */
      */
     List<TkVideoDTO> getVideoInfosByOrganizationIds(@Param("tenantId") String tenantId, @Param("organizationIds") List<String> organizationIds);
     List<TkVideoDTO> getVideoInfosByOrganizationIds(@Param("tenantId") String tenantId, @Param("organizationIds") List<String> organizationIds);
+
+
+    int deleteVideosByDeviceIds(@Param("tenantId") String tenantId, @Param("deviceId") String deviceId);
+
 }
 }

@@ -122,4 +122,6 @@ public interface TkVideoService extends BaseService<TkVideoEntity> {
    * @return 视频列表
    * @return 视频列表
    */
    */
   List<TkVideoDTO> getVideoList(String organizationId, String tenantId);
   List<TkVideoDTO> getVideoList(String organizationId, String tenantId);
+  boolean deleteGBT28181VideosByDeviceIds(String tenantId,List<String> deviceIds);
+
 }
 }

@@ -113,5 +113,10 @@
             </if>
             </if>
         </where>
         </where>
     </select>
     </select>
-
+    <delete id="deleteVideosByDeviceIds">
+        DELETE FROM tk_device_camera
+        WHERE
+            tenant_id = #{tenantId}
+          AND POSITION ( #{deviceId} IN params ) >0
+    </delete>
 </mapper>
 </mapper>