优化直播流点播流程， 添加流代理接口添加直接关联国标功能

panlinlin

2021-05-07 bd570d167be9671f46ec27568b2a591713897323

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/InviteRequestProcessor.java

@@ -92,10 +92,18 @@
            DeviceChannel channel = storager.queryChannelInParentPlatform(requesterId, channelId);

            GbStream gbStream = storager.queryStreamInParentPlatform(requesterId, channelId);

            // 不是通道可能是直播流

            if (channel != null || gbStream != null ) {

            if (channel != null && gbStream == null ) {

               if (channel.getStatus() == 0) {

                  logger.info("通道离线，返回400");

                  responseAck(evt, Response.BAD_REQUEST, "channel [" + channel.getChannelId() + "] offline");

                  return;

               }

               responseAck(evt, Response.CALL_IS_BEING_FORWARDED); // 通道存在，发181，呼叫转接中

            }else if(channel == null && gbStream != null){

               Boolean streamReady = zlmrtpServerFactory.isStreamReady(gbStream.getApp(), gbStream.getStream());

               if (!streamReady) {

                  logger.info("[ app={}, stream={} ]通道离线，返回400",gbStream.getApp(), gbStream.getStream());

                  responseAck(evt, Response.BAD_REQUEST, "channel [" + gbStream.getGbId() + "] offline");

                  return;

               }

               responseAck(evt, Response.CALL_IS_BEING_FORWARDED); // 通道存在，发181，呼叫转接中

@@ -240,9 +248,6 @@
               // 写入redis， 超时时回复

               redisCatchStorage.updateSendRTPSever(sendRtpItem);



               // 检测直播流是否在线

               Boolean streamReady = zlmrtpServerFactory.isStreamReady(gbStream.getApp(), gbStream.getStream());

               if (streamReady) {

                  sendRtpItem.setStatus(1);

                  redisCatchStorage.updateSendRTPSever(sendRtpItem);

                  // TODO 添加对tcp的支持

@@ -267,7 +272,6 @@
                     e.printStackTrace();

                  } catch (ParseException e) {

                     e.printStackTrace();

                  }

               }

            }