规范数据库，添加必要约束，优化通道批量导入功能

648540858

2022-02-24 a42dda2bd3cc1cf8c20cc61e7ad9211eadecbaf3

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -1,45 +1,46 @@
package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;



import java.text.ParseException;

import com.alibaba.fastjson.JSONObject;

import com.genersoft.iot.vmp.common.StreamInfo;

import com.genersoft.iot.vmp.conf.SipConfig;

import com.genersoft.iot.vmp.conf.UserSetup;

import com.genersoft.iot.vmp.gb28181.bean.Device;

import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;

import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;

import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;

import com.genersoft.iot.vmp.gb28181.utils.DateUtil;

import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;

import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;

import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;

import com.genersoft.iot.vmp.service.IMediaServerService;

import com.genersoft.iot.vmp.service.bean.SSRCInfo;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.genersoft.iot.vmp.storager.IVideoManagerStorager;

import gov.nist.javax.sip.SipProviderImpl;

import gov.nist.javax.sip.SipStackImpl;

import gov.nist.javax.sip.message.SIPRequest;

import gov.nist.javax.sip.stack.SIPDialog;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.context.annotation.DependsOn;

import org.springframework.stereotype.Component;

import org.springframework.util.StringUtils;



import javax.sip.*;

import javax.sip.address.SipURI;

import javax.sip.header.CallIdHeader;

import javax.sip.header.ViaHeader;

import javax.sip.message.Request;



import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;

import com.genersoft.iot.vmp.common.StreamInfo;

import com.genersoft.iot.vmp.conf.MediaConfig;

import com.genersoft.iot.vmp.conf.UserSetup;

import com.genersoft.iot.vmp.media.zlm.*;

import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;

import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;

import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.genersoft.iot.vmp.storager.IVideoManagerStorager;

import gov.nist.javax.sip.message.SIPRequest;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.context.annotation.DependsOn;

import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Component;



import com.genersoft.iot.vmp.conf.SipConfig;

import com.genersoft.iot.vmp.gb28181.bean.Device;

import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;

import com.genersoft.iot.vmp.gb28181.utils.DateUtil;

import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;

import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;

import org.springframework.util.StringUtils;

import java.lang.reflect.Field;

import java.text.ParseException;

import java.util.HashSet;



/**    

 * @Description:设备能力接口，用于定义设备的控制、查询能力   
 * @description:设备能力接口，用于定义设备的控制、查询能力   
 * @author: swwheihei

 * @date:   2020年5月3日 下午9:22:48     

 */

@@ -52,15 +53,13 @@
   @Autowired

   private SipConfig sipConfig;



   @Lazy

   @Autowired

   @Qualifier(value="tcpSipProvider")

   private SipProvider tcpSipProvider;

   private SipProviderImpl tcpSipProvider;



   @Lazy

   @Autowired

   @Qualifier(value="udpSipProvider")

   private SipProvider udpSipProvider;

   private SipProviderImpl udpSipProvider;



   @Autowired

   private SIPRequestHeaderProvider headerProvider;

@@ -75,9 +74,6 @@
   private IRedisCatchStorage redisCatchStorage;



   @Autowired

   private ZLMRTPServerFactory zlmrtpServerFactory;



   @Autowired

   private UserSetup userSetup;



   @Autowired

@@ -86,9 +82,9 @@
   @Autowired

   private SipSubscribe sipSubscribe;



   public SipConfig getSipConfig() {

      return sipConfig;

   }

   @Autowired

   private IMediaServerService mediaServerService;





   /**

    * 云台方向放控制，使用配置文件中的默认镜头移动速度

@@ -100,7 +96,7 @@
    */

   @Override

   public boolean ptzdirectCmd(Device device, String channelId, int leftRight, int upDown) {

      return ptzCmd(device, channelId, leftRight, upDown, 0, sipConfig.getSpeed(), 0);

      return ptzCmd(device, channelId, leftRight, upDown, 0, sipConfig.getPtzSpeed(), 0);

   }



   /**

@@ -126,7 +122,7 @@
    */  

   @Override

   public boolean ptzZoomCmd(Device device, String channelId, int inOut) {

      return ptzCmd(device, channelId, 0, 0, inOut, 0, sipConfig.getSpeed());

      return ptzCmd(device, channelId, 0, 0, inOut, 0, sipConfig.getPtzSpeed());

   }



   /**

@@ -266,7 +262,7 @@
   public boolean frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2) {

      try {

         String cmdStr= frontEndCmdString(cmdCode, parameter1, parameter2, combineCode2);

         logger.info("控制字符串：" + cmdStr);

         logger.debug("控制字符串：" + cmdStr);

         StringBuffer ptzXml = new StringBuffer(200);

         ptzXml.append("<?xml version=\"1.0\" ?>\r\n");

         ptzXml.append("<Control>\r\n");

@@ -334,26 +330,13 @@
     * @param errorEvent sip错误订阅

     */

   @Override

   public void playStreamCmd(IMediaServerItem mediaServerItem, Device device, String channelId, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event errorEvent) {

      String streamId = null;

   public void playStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event errorEvent) {

      String streamId = ssrcInfo.getStreamId();

      try {

         if (device == null) return;

         String streamMode = device.getStreamMode().toUpperCase();



         String ssrc = streamSession.createPlaySsrc();

         if (mediaServerItem.isRtpEnable()) {

            streamId = String.format("gb_play_%s_%s", device.getDeviceId(), channelId);

         }else {

            streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();

         }

         Integer mediaPort = null;

         // 使用动态udp端口

         if (mediaServerItem.isRtpEnable()) {

            mediaPort = zlmrtpServerFactory.createRTPServer(mediaServerItem, streamId);

         }else {

            mediaPort = mediaServerItem.getRtpProxyPort();

         }

         logger.info("{} 分配的ZLM为: {} [{}:{}]", streamId, mediaServerItem.getId(), mediaServerItem.getIp(), mediaPort);

         logger.info("{} 分配的ZLM为: {} [{}:{}]", streamId, mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());

         // 添加订阅

         JSONObject subscribeKey = new JSONObject();

         subscribeKey.put("app", "rtp");

@@ -361,7 +344,7 @@
         subscribeKey.put("regist", true);

         subscribeKey.put("mediaServerId", mediaServerItem.getId());

         subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,

               (IMediaServerItem mediaServerItemInUse, JSONObject json)->{

               (MediaServerItem mediaServerItemInUse, JSONObject json)->{

            if (userSetup.isWaitTrack() && json.getJSONArray("tracks") == null) return;

            event.response(mediaServerItemInUse, json);

            subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);

@@ -369,19 +352,18 @@
         //

         StringBuffer content = new StringBuffer(200);

         content.append("v=0\r\n");

//         content.append("o=" + sipConfig.getSipId() + " 0 0 IN IP4 "+mediaInfo.getWanIp()+"\r\n");

         content.append("o="+"00000"+" 0 0 IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");

         content.append("o="+ sipConfig.getId()+" 0 0 IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");

         content.append("s=Play\r\n");

         content.append("c=IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");

         content.append("t=0 0\r\n");



         if (userSetup.isSeniorSdp()) {

            if("TCP-PASSIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

            }else if ("TCP-ACTIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

            }else if("UDP".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" RTP/AVP 96 126 125 99 34 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 126 125 99 34 98 97\r\n");

            }

            content.append("a=recvonly\r\n");

            content.append("a=rtpmap:96 PS/90000\r\n");

@@ -402,11 +384,11 @@
            }

         }else {

            if("TCP-PASSIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 98 97\r\n");

            }else if ("TCP-ACTIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 98 97\r\n");

            }else if("UDP".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" RTP/AVP 96 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 98 97\r\n");

            }

            content.append("a=recvonly\r\n");

            content.append("a=rtpmap:96 PS/90000\r\n");

@@ -421,20 +403,25 @@
            }

         }



         content.append("y="+ssrc+"\r\n");//ssrc

         content.append("y="+ssrcInfo.getSsrc()+"\r\n");//ssrc



         String tm = Long.toString(System.currentTimeMillis());



         CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, "FromInvt" + tm, null, ssrc, callIdHeader);

         Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, "FromInvt" + tm, null, ssrcInfo.getSsrc(), callIdHeader);



         ClientTransaction transaction = transmitRequest(device, request, (e -> {

         String finalStreamId = streamId;

         transmitRequest(device, request, (e -> {

            streamSession.remove(device.getDeviceId(), channelId);

            mediaServerService.releaseSsrc(mediaServerItem, ssrcInfo.getSsrc());

            errorEvent.response(e);

         }));

         streamSession.put(device.getDeviceId(), channelId ,ssrc,streamId, transaction);

         }), e ->{

            streamSession.put(device.getDeviceId(), channelId ,ssrcInfo.getSsrc(), finalStreamId, mediaServerItem.getId(), ((ResponseEvent)e.event).getClientTransaction());

            streamSession.put(device.getDeviceId(), channelId , e.dialog);

         });



         

      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

@@ -450,30 +437,21 @@
    * @param endTime 结束时间,格式要求：yyyy-MM-dd HH:mm:ss

    */ 

   @Override

   public void playbackStreamCmd(IMediaServerItem mediaServerItem,Device device, String channelId, String startTime, String endTime, ZLMHttpHookSubscribe.Event event

   public void playbackStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId, String startTime, String endTime, ZLMHttpHookSubscribe.Event event

         , SipSubscribe.Event errorEvent) {

      try {

         String ssrc = streamSession.createPlayBackSsrc();

         String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();



         Integer mediaPort = null;

         // 使用动态udp端口

         if (mediaServerItem.isRtpEnable()) {

            mediaPort = zlmrtpServerFactory.createRTPServer(mediaServerItem, streamId);

         }else {

            mediaPort = mediaServerItem.getRtpProxyPort();

         }

         logger.info("{} 分配的ZLM为: {} [{}:{}]", streamId, mediaServerItem.getId(), mediaServerItem.getIp(), mediaPort);

         logger.info("{} 分配的ZLM为: {} [{}:{}]", ssrcInfo.getStreamId(), mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());



         // 添加订阅

         JSONObject subscribeKey = new JSONObject();

         subscribeKey.put("app", "rtp");

         subscribeKey.put("stream", streamId);

         subscribeKey.put("stream", ssrcInfo.getStreamId());

         subscribeKey.put("regist", true);

         subscribeKey.put("mediaServerId", mediaServerItem.getId());

         logger.debug("录像回放添加订阅，订阅内容：" + subscribeKey.toString());

         subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,

               (IMediaServerItem mediaServerItemInUse, JSONObject json)->{

               (MediaServerItem mediaServerItemInUse, JSONObject json)->{

            if (userSetup.isWaitTrack() && json.getJSONArray("tracks") == null) return;

            event.response(mediaServerItemInUse, json);

            subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);

@@ -481,7 +459,7 @@


         StringBuffer content = new StringBuffer(200);

           content.append("v=0\r\n");

           content.append("o="+sipConfig.getSipId()+" 0 0 IN IP4 "+sipConfig.getSipIp()+"\r\n");

           content.append("o="+sipConfig.getId()+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

           content.append("s=Playback\r\n");

           content.append("u="+channelId+":0\r\n");

           content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");

@@ -494,11 +472,11 @@


         if (userSetup.isSeniorSdp()) {

            if("TCP-PASSIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

            }else if ("TCP-ACTIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

            }else if("UDP".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" RTP/AVP 96 126 125 99 34 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 126 125 99 34 98 97\r\n");

            }

            content.append("a=recvonly\r\n");

            content.append("a=rtpmap:96 PS/90000\r\n");

@@ -519,11 +497,11 @@
            }

         }else {

            if("TCP-PASSIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 98 97\r\n");

            }else if ("TCP-ACTIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 98 97\r\n");

            }else if("UDP".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" RTP/AVP 96 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 98 97\r\n");

            }

            content.append("a=recvonly\r\n");

            content.append("a=rtpmap:96 PS/90000\r\n");

@@ -538,18 +516,20 @@
            }

         }



           content.append("y="+ssrc+"\r\n");//ssrc

           content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc

           

         String tm = Long.toString(System.currentTimeMillis());



         CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

               : udpSipProvider.getNewCallId();



           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader);

           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader, ssrcInfo.getSsrc());



           ClientTransaction transaction = transmitRequest(device, request, errorEvent);

           streamSession.put(device.getDeviceId(), channelId, ssrc, streamId, transaction);



           transmitRequest(device, request, errorEvent, okEvent -> {

            ResponseEvent responseEvent = (ResponseEvent) okEvent.event;

              streamSession.put(device.getDeviceId(), channelId, ssrcInfo.getSsrc(), ssrcInfo.getStreamId(), mediaServerItem.getId(), responseEvent.getClientTransaction());

            streamSession.put(device.getDeviceId(), channelId, okEvent.dialog);

         });

      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      }

@@ -565,30 +545,20 @@
    * @param downloadSpeed 下载倍速参数

    */ 

   @Override

   public void downloadStreamCmd(IMediaServerItem mediaServerItem,Device device, String channelId, String startTime, String endTime, String downloadSpeed, ZLMHttpHookSubscribe.Event event

   public void downloadStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId, String startTime, String endTime, String downloadSpeed, ZLMHttpHookSubscribe.Event event

         , SipSubscribe.Event errorEvent) {

      try {

         String ssrc = streamSession.createPlayBackSsrc();

         String streamId = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();



         Integer mediaPort = null;

         // 使用动态udp端口

         if (mediaServerItem.isRtpEnable()) {

            mediaPort = zlmrtpServerFactory.createRTPServer(mediaServerItem, streamId);

         }else {

            mediaPort = mediaServerItem.getRtpProxyPort();

         }

         logger.info("{} 分配的ZLM为: {} [{}:{}]", streamId, mediaServerItem.getId(), mediaServerItem.getIp(), mediaPort);

         logger.info("{} 分配的ZLM为: {} [{}:{}]", ssrcInfo.getStreamId(), mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());



         // 添加订阅

         JSONObject subscribeKey = new JSONObject();

         subscribeKey.put("app", "rtp");

         subscribeKey.put("stream", streamId);

         subscribeKey.put("stream", ssrcInfo.getStreamId());

         subscribeKey.put("regist", true);

         subscribeKey.put("mediaServerId", mediaServerItem.getId());

         logger.debug("录像回放添加订阅，订阅内容：" + subscribeKey.toString());

         subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,

               (IMediaServerItem mediaServerItemInUse, JSONObject json)->{

               (MediaServerItem mediaServerItemInUse, JSONObject json)->{

            if (userSetup.isWaitTrack() && json.getJSONArray("tracks") == null) return;

            event.response(mediaServerItemInUse, json);

            subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);

@@ -596,7 +566,7 @@


         StringBuffer content = new StringBuffer(200);

           content.append("v=0\r\n");

           content.append("o="+sipConfig.getSipId()+" 0 0 IN IP4 "+sipConfig.getSipIp()+"\r\n");

           content.append("o="+sipConfig.getId()+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");

           content.append("s=Download\r\n");

           content.append("u="+channelId+":0\r\n");

           content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");

@@ -609,11 +579,11 @@


         if (userSetup.isSeniorSdp()) {

            if("TCP-PASSIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

            }else if ("TCP-ACTIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");

            }else if("UDP".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" RTP/AVP 96 126 125 99 34 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 126 125 99 34 98 97\r\n");

            }

            content.append("a=recvonly\r\n");

            content.append("a=rtpmap:96 PS/90000\r\n");

@@ -634,11 +604,11 @@
            }

         }else {

            if("TCP-PASSIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 98 97\r\n");

            }else if ("TCP-ACTIVE".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" TCP/RTP/AVP 96 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 98 97\r\n");

            }else if("UDP".equals(streamMode)) {

               content.append("m=video "+ mediaPort +" RTP/AVP 96 98 97\r\n");

               content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 98 97\r\n");

            }

            content.append("a=recvonly\r\n");

            content.append("a=rtpmap:96 PS/90000\r\n");

@@ -654,17 +624,17 @@
         }

         content.append("a=downloadspeed:" + downloadSpeed + "\r\n");



           content.append("y="+ssrc+"\r\n");//ssrc

           content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc

           

         String tm = Long.toString(System.currentTimeMillis());



         CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

               : udpSipProvider.getNewCallId();



           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader);

           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader, ssrcInfo.getSsrc());



           ClientTransaction transaction = transmitRequest(device, request, errorEvent);

           streamSession.put(device.getDeviceId(), channelId, ssrc, streamId, transaction);

           streamSession.put(device.getDeviceId(), channelId, ssrcInfo.getSsrc(), ssrcInfo.getStreamId(), mediaServerItem.getId(), transaction);



      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

@@ -684,53 +654,39 @@
    */

   @Override

   public void streamByeCmd(String deviceId, String channelId, SipSubscribe.Event okEvent) {

      StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);

      try {

         ClientTransaction transaction = streamSession.getTransaction(deviceId, channelId);

         // 服务重启后, 无法直接发送bye， 通过手动构建发送

//         if (transaction == null) {

//

//            if (streamInfo != null) {

//               MediaServerItem mediaServerItem = redisCatchStorage.getMediaInfo(streamInfo.getMediaServerId());

//               JSONObject mediaList = zlmresTfulUtils.getMediaList(mediaServerItem,streamInfo.getApp(), streamInfo.getStreamId());

//               if (mediaList != null) { // 仍在推流才发送

//                  if (mediaList.getInteger("code") == 0) {

//                     JSONArray data = mediaList.getJSONArray("data");

//                     if (data != null && data.size() > 0) {

//                        Device device = storager.queryVideoDevice(deviceId);

//                        if (device != null) {

//                           StreamInfo.TransactionInfo transactionInfo = streamInfo.getTransactionInfo();

//                           try {

//                              Request byteRequest = headerProvider.createByteRequest(device, channelId,

//                                    transactionInfo.branch,

//                                    transactionInfo.localTag,

//                                    transactionInfo.remoteTag,

//                                    transactionInfo.callId);

//                              transmitRequest(device, byteRequest);

//                           } catch (InvalidArgumentException e) {

//                              e.printStackTrace();

//                           }

//                        }

//                     }

//                  }

//               }

//               redisCatchStorage.stopPlay(streamInfo);

//            }

//

//            if (okEvent != null) {

//               okEvent.response(null);

//            }

//            return;

//         }

         if (transaction == null) {

            logger.warn("[ {} -> {}]停止视频流的时候发现事务已丢失", deviceId, channelId);

            SipSubscribe.EventResult<Object> eventResult = new SipSubscribe.EventResult<>();

            if (okEvent != null) {

               okEvent.response(eventResult);

            }

            return;

         }

         Dialog dialog = transaction.getDialog();

         SIPDialog dialog = streamSession.getDialog(deviceId, channelId);

         if (dialog == null) {

            logger.warn("[ {} -> {}]停止视频流的时候发现对话已丢失", deviceId, channelId);

            return;

         }

         SipStack sipStack = udpSipProvider.getSipStack();

         SIPDialog sipDialog = ((SipStackImpl) sipStack).putDialog(dialog);

         if (dialog != sipDialog) {

            dialog = sipDialog;

         }else {

            dialog.setSipProvider(udpSipProvider);

            try {

               Field sipStackField = SIPDialog.class.getDeclaredField("sipStack");

               sipStackField.setAccessible(true);

               sipStackField.set(dialog, sipStack);

               Field eventListenersField = SIPDialog.class.getDeclaredField("eventListeners");

               eventListenersField.setAccessible(true);

               eventListenersField.set(dialog, new HashSet<>());

            } catch (NoSuchFieldException | IllegalAccessException e) {

               e.printStackTrace();

            }

         }



         Request byeRequest = dialog.createRequest(Request.BYE);

         SipURI byeURI = (SipURI) byeRequest.getRequestURI();

         SIPRequest request = (SIPRequest)transaction.getRequest();

@@ -752,7 +708,12 @@


         dialog.sendRequest(clientTransaction);



         streamSession.remove(deviceId, channelId);

         SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(deviceId, channelId);

         if (ssrcTransaction != null) {

            MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransaction.getMediaServerId());

            mediaServerService.releaseSsrc(mediaServerItem, ssrcTransaction.getSsrc());

            streamSession.remove(deviceId, channelId);

         }

      } catch (SipException | ParseException e) {

         e.printStackTrace();

      }

@@ -783,7 +744,7 @@
         broadcastXml.append("<Notify>\r\n");

         broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");

         broadcastXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         broadcastXml.append("<SourceID>" + sipConfig.getSipId() + "</SourceID>\r\n");

         broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

         broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");

         broadcastXml.append("</Notify>\r\n");

         

@@ -808,7 +769,7 @@
         broadcastXml.append("<Notify>\r\n");

         broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");

         broadcastXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         broadcastXml.append("<SourceID>" + sipConfig.getSipId() + "</SourceID>\r\n");

         broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

         broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");

         broadcastXml.append("</Notify>\r\n");

         

@@ -1201,7 +1162,7 @@
   @Override

   public boolean catalogQuery(Device device, SipSubscribe.Event errorEvent) {

      // 清空通道

      storager.cleanChannelsForDevice(device.getDeviceId());

//      storager.cleanChannelsForDevice(device.getDeviceId());

      try {

         StringBuffer catalogXml = new StringBuffer(200);

         catalogXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

@@ -1234,14 +1195,15 @@
    * @param endTime 结束时间,格式要求：yyyy-MM-dd HH:mm:ss

    */  

   @Override

   public boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime) {

		
   public boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime, int sn, SipSubscribe.Event errorEvent) {





      try {

         StringBuffer recordInfoXml = new StringBuffer(200);

         recordInfoXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         recordInfoXml.append("<Query>\r\n");

         recordInfoXml.append("<CmdType>RecordInfo</CmdType>\r\n");

         recordInfoXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         recordInfoXml.append("<SN>" + sn + "</SN>\r\n");

         recordInfoXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

         recordInfoXml.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(startTime) + "</StartTime>\r\n");

         recordInfoXml.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(endTime) + "</EndTime>\r\n");

@@ -1258,7 +1220,7 @@
         Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(),

               "z9hG4bK-ViaRecordInfo-" + tm, "fromRec" + tm, null, callIdHeader);



         transmitRequest(device, request);

         transmitRequest(device, request, errorEvent);

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

         return false;

@@ -1520,6 +1482,64 @@
      }

   }



   @Override

   public boolean catalogSubscribe(Device device, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         cmdXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>\r\n");

         cmdXml.append("<Query>\r\n");

         cmdXml.append("<CmdType>Catalog</CmdType>\r\n");

         cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         cmdXml.append("</Query>\r\n");



         String tm = Long.toString(System.currentTimeMillis());



         CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

               : udpSipProvider.getNewCallId();



         // 有效时间默认为60秒以上

         Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), "z9hG4bK-viaPos-" + tm,

               "fromTagPos" + tm, null, device.getSubscribeCycleForCatalog() + 60, "Catalog" ,

               callIdHeader);

         transmitRequest(device, request, errorEvent, okEvent);



         return true;



      } catch ( NumberFormatException | ParseException | InvalidArgumentException   | SipException e) {

         e.printStackTrace();

         return false;

      }

   }



   @Override

   public boolean dragZoomCmd(Device device, String channelId, String cmdString) {

      try {

         StringBuffer dragXml = new StringBuffer(200);

         dragXml.append("<?xml version=\"1.0\" ?>\r\n");

         dragXml.append("<Control>\r\n");

         dragXml.append("<CmdType>DeviceControl</CmdType>\r\n");

         dragXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");

         if (StringUtils.isEmpty(channelId)) {

            dragXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         } else {

            dragXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

         }

         dragXml.append(cmdString);

         dragXml.append("</Control>\r\n");

         String tm = Long.toString(System.currentTimeMillis());

         CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

               : udpSipProvider.getNewCallId();

         Request request = headerProvider.createMessageRequest(device, dragXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader);

         logger.debug("拉框信令： " + request.toString());

         transmitRequest(device, request);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      }

      return false;

   }





   private ClientTransaction transmitRequest(Device device, Request request) throws SipException {

      return transmitRequest(device, request, null, null);

@@ -1540,14 +1560,136 @@
      CallIdHeader callIdHeader = (CallIdHeader)request.getHeader(CallIdHeader.NAME);

      // 添加错误订阅

      if (errorEvent != null) {

         sipSubscribe.addErrorSubscribe(callIdHeader.getCallId(), errorEvent);

         sipSubscribe.addErrorSubscribe(callIdHeader.getCallId(), (eventResult -> {

            errorEvent.response(eventResult);

            sipSubscribe.removeErrorSubscribe(eventResult.callId);

         }));

      }

      // 添加订阅

      if (okEvent != null) {

         sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), okEvent);

         sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), eventResult ->{

            okEvent.response(eventResult);

            sipSubscribe.removeOkSubscribe(eventResult.callId);

         });

      }



      clientTransaction.sendRequest();

      return clientTransaction;

   }



   /**

    * 回放暂停

    */

   @Override

   public void playPauseCmd(Device device, StreamInfo streamInfo) {

      try {

         Long cseq = redisCatchStorage.getCSEQ(Request.INFO);

         StringBuffer content = new StringBuffer(200);

         content.append("PAUSE RTSP/1.0\r\n");

         content.append("CSeq: " + cseq + "\r\n");

         content.append("PauseTime: now\r\n");

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);

         if (request == null) {

            return;

         }

         logger.info(request.toString());

         ClientTransaction clientTransaction = null;

         if ("TCP".equals(device.getTransport())) {

            clientTransaction = tcpSipProvider.getNewClientTransaction(request);

         } else if ("UDP".equals(device.getTransport())) {

            clientTransaction = udpSipProvider.getNewClientTransaction(request);

         }

         if (clientTransaction != null) {

            clientTransaction.sendRequest();

         }



      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      }

   }



   /**

    * 回放恢复

    */

   @Override

   public void playResumeCmd(Device device, StreamInfo streamInfo) {

      try {

         Long cseq = redisCatchStorage.getCSEQ(Request.INFO);

         StringBuffer content = new StringBuffer(200);

         content.append("PLAY RTSP/1.0\r\n");

         content.append("CSeq: " + cseq + "\r\n");

         content.append("Range: npt=now-\r\n");

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);

         if (request == null) return;

         logger.info(request.toString());

         ClientTransaction clientTransaction = null;

         if ("TCP".equals(device.getTransport())) {

            clientTransaction = tcpSipProvider.getNewClientTransaction(request);

         } else if ("UDP".equals(device.getTransport())) {

            clientTransaction = udpSipProvider.getNewClientTransaction(request);

         }



         clientTransaction.sendRequest();



      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      }

   }



   /**

    * 回放拖动播放

    */

   @Override

   public void playSeekCmd(Device device, StreamInfo streamInfo, long seekTime) {

      try {

         Long cseq = redisCatchStorage.getCSEQ(Request.INFO);

         StringBuffer content = new StringBuffer(200);

         content.append("PLAY RTSP/1.0\r\n");

         content.append("CSeq: " + cseq + "\r\n");

         content.append("Range: npt=" + Math.abs(seekTime) + "-\r\n");



         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);

         if (request == null) return;

         logger.info(request.toString());

         ClientTransaction clientTransaction = null;

         if ("TCP".equals(device.getTransport())) {

            clientTransaction = tcpSipProvider.getNewClientTransaction(request);

         } else if ("UDP".equals(device.getTransport())) {

            clientTransaction = udpSipProvider.getNewClientTransaction(request);

         }



         clientTransaction.sendRequest();



      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      }

   }



   /**

    * 回放倍速播放

    */

   @Override

   public void playSpeedCmd(Device device, StreamInfo streamInfo, Double speed) {

      try {

         Long cseq = redisCatchStorage.getCSEQ(Request.INFO);

         StringBuffer content = new StringBuffer(200);

         content.append("PLAY RTSP/1.0\r\n");

         content.append("CSeq: " + cseq + "\r\n");

         content.append("Scale: " + String.format("%.1f",speed) + "\r\n");

         Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);

         if (request == null) return;

         logger.info(request.toString());

         ClientTransaction clientTransaction = null;

         if ("TCP".equals(device.getTransport())) {

            clientTransaction = tcpSipProvider.getNewClientTransaction(request);

         } else if ("UDP".equals(device.getTransport())) {

            clientTransaction = udpSipProvider.getNewClientTransaction(request);

         }



         clientTransaction.sendRequest();



      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      }

   }

}