Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

国标级联 修复 多级级联时找不到 级联的 设备 和 通道 问题

Browse Source
This commit is contained in:
zxb 2023-09-21 23:01:49 +08:00
parent 279d789c12
commit b092035af1
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
View File

@ -312,13 +312,16 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
if (channel != null) { if (channel != null) {
device = storager.queryVideoDeviceByPlatformIdAndChannelId(requesterId, channelId); device = storager.queryVideoDeviceByPlatformIdAndChannelId(requesterId, channelId);
if (device == null) { if (device == null) {
logger.warn("点播平台{}的通道{}时未找到设备信息", requesterId, channel); device = storager.queryDeviceInfoByPlatformIdAndChannelId(requesterId, channelId);
try { if (device == null) {
responseAck(request, Response.SERVER_INTERNAL_ERROR); logger.warn("点播平台{}的通道{}时未找到设备信息", requesterId, channelId);
} catch (SipException | InvalidArgumentException | ParseException e) { try {
logger.error("[命令发送失败] invite 未找到设备信息: {}", e.getMessage()); responseAck(request, Response.SERVER_INTERNAL_ERROR);
} catch (SipException | InvalidArgumentException | ParseException e) {
logger.error("[命令发送失败] invite 未找到设备信息: {}", e.getMessage());
}
return;
} }
return;
} }
mediaServerItem = playService.getNewMediaServerItem(device); mediaServerItem = playService.getNewMediaServerItem(device);
if (mediaServerItem == null) { if (mediaServerItem == null) {

2
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
View File

@ -108,7 +108,7 @@ public interface PlatformChannelMapper {
"</script>") "</script>")
int delChannelForGBByCatalogId(String platformId, String catalogId); int delChannelForGBByCatalogId(String platformId, String catalogId);
@Select("select dc.channel_id dc.device_id,dc.name,d.manufacturer,d.model,d.firmware\n" + @Select("select dc.channel_id,dc.device_id,dc.name,d.manufacturer,d.model,d.firmware\n" +
"from wvp_platform_gb_channel pgc\n" + "from wvp_platform_gb_channel pgc\n" +
" left join wvp_device_channel dc on dc.id = pgc.device_channel_id\n" + " left join wvp_device_channel dc on dc.id = pgc.device_channel_id\n" +
" left join wvp_device d on dc.device_id = d.device_id\n" + " left join wvp_device d on dc.device_id = d.device_id\n" +