Commit 81da75c32e165d4e352530cf01f78ea2459aeae2

Authored by chenjunyu_1481036421
1 parent 10d7bbb5

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

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