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