Merge branch '2024-3-1' into 'master_dev'

fix:批量新增国标视频时未限制设备协议

See merge request yunteng/thingskit!355

@@ -16,6 +16,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
+import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.*;
 import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
@@ -109,7 +110,10 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
             String organizationId  = dto.getOrganizationId();
             List<TkVideoGbtDeviceDTO> deviceList = new ArrayList<>();
             List<DeviceDTO> deviceDTOS =  tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
-                    null,dto.getTenantId(),organizationId,null,null,null);
+                    null,dto.getTenantId(),organizationId,null,null, TransportTypeEnum.GBT28181);
+            if(deviceDTOS.isEmpty()){
+                return dto;
+            }
             for(DeviceDTO device:deviceDTOS){
                 List<VideoChanelDTO> chanelDTOS =   tkVideoChannelService.getListByDeviceId(device.getTbDeviceId(),dto.getTenantId());
                 if(chanelDTOS.isEmpty()){