尝试修复catalog获取失败。服务重启后设备未注册仍上报keeplive处理

songww

2020-05-13 ca5139929b8b5853229ca3d63e2bca1ce82fa0ab

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

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



import java.text.ParseException;

import java.util.Random;



import javax.sip.ClientTransaction;

import javax.sip.InvalidArgumentException;

import javax.sip.SipException;

import javax.sip.message.Request;



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

import org.springframework.context.ApplicationEventPublisher;

import org.springframework.stereotype.Component;



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

@@ -17,6 +16,7 @@
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.SsrcUtil;



/**    

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

@@ -27,7 +27,7 @@
public class SIPCommander implements ISIPCommander {

   

   @Autowired

   private SipConfig config;

   private SipConfig sipConfig;

   

   @Autowired

   private SIPRequestHeaderProvider headerProvider;

@@ -46,7 +46,7 @@
    */

   @Override

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

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

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

   }



   /**

@@ -72,7 +72,7 @@
    */  

   @Override

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

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

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

   }



   /**

@@ -135,23 +135,19 @@
   public String playStreamCmd(Device device, String channelId) {

      try {

         

         //生成ssrc标识数据流 10位数字

         String ssrc = "";

         Random random = new Random();

         // ZLMediaServer最大识别7FFFFFFF即2147483647，所以随机数不能超过这个数

         ssrc = String.valueOf(random.nextInt(2147483647));

         String ssrc = SsrcUtil.getPlaySsrc();

         //

         StringBuffer content = new StringBuffer(200);

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

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

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

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

           content.append("c=IN IP4 "+config.getMediaIp()+"\r\n");

           content.append("c=IN IP4 "+sipConfig.getMediaIp()+"\r\n");

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

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

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

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

         }

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

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

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

         }

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

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

@@ -171,6 +167,53 @@
         e.printStackTrace();

         return null;

      } 

   }

	
   /**

    * 请求回放视频流

    * 
    * @param device  视频设备

    * @param channelId  预览通道

    * @param startTime 开始时间,格式要求：yyyy-MM-dd HH:mm:ss

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

    */ 
   @Override

   public String playbackStreamCmd(Device device, String channelId, String startTime, String endTime) {

      try {

			
         String ssrc = SsrcUtil.getPlayBackSsrc();

         //

         StringBuffer content = new StringBuffer(200);

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

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

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

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

           content.append("c=IN IP4 "+sipConfig.getMediaIp()+"\r\n");

           content.append("t="+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime)+" "+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) +"\r\n");

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

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

         }

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

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

         }

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

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

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

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

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

                content.append("a=setup:passive\r\n");

                content.append("a=connection:new\r\n");

           }

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

	        
           Request request = headerProvider.createInviteRequest(device, content.toString(), null, "live", null);

	
           transmitRequest(device, request);

         return ssrc;

      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

         return null;

      }

   }



   /**

@@ -323,22 +366,23 @@
    * @param endTime 结束时间,格式要求：yyyy-MM-dd HH:mm:ss

    */  

   @Override

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

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

      

      try {

         StringBuffer catalogXml = new StringBuffer(200);

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

         catalogXml.append("<Query>");

         catalogXml.append("<CmdType>RecordInfo</CmdType>");

         catalogXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>");

         catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>");

         catalogXml.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(startTime) + "</StartTime>");

         catalogXml.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(endTime) + "</EndTime>");

         StringBuffer recordInfoXml = new StringBuffer(200);

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

         recordInfoXml.append("<Query>");

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

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

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

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

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

         recordInfoXml.append("<Secrecy>0</Secrecy>");

         // 大华NVR要求必须增加一个值为all的文本元素节点Type

         catalogXml.append("<Type>all</Type>");

         catalogXml.append("</Query>");

         recordInfoXml.append("<Type>all</Type>");

         recordInfoXml.append("</Query>");

         

         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "ViaRecordInfoBranch", "FromRecordInfoTag", "ToRecordInfoTag");

         Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(), "ViaRecordInfoBranch", "FromRecordInfoTag", "ToRecordInfoTag");

         transmitRequest(device, request);

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

@@ -392,10 +436,15 @@
   }

   

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

      ClientTransaction clientTransaction = null;

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

         sipLayer.getTcpSipProvider().sendRequest(request);

         clientTransaction = sipLayer.getTcpSipProvider().getNewClientTransaction(request);

         //sipLayer.getTcpSipProvider().sendRequest(request);

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

         sipLayer.getUdpSipProvider().sendRequest(request);

         clientTransaction = sipLayer.getUdpSipProvider().getNewClientTransaction(request);

         //sipLayer.getUdpSipProvider().sendRequest(request);

      }

      clientTransaction.sendRequest();

   }



}