增加强制不查询编码信息配置

648540858

2020-11-13 33b51c40ddd9750a19b2c6a6618fb22386f87cd7

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

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



import java.text.ParseException;

import java.util.regex.Matcher;

import java.util.regex.Pattern;



import javax.sip.ClientTransaction;

import javax.sip.Dialog;

import javax.sip.InvalidArgumentException;

import javax.sip.SipException;

import javax.sip.SipFactory;

import javax.sip.SipProvider;

import javax.sip.TransactionDoesNotExistException;

import javax.sip.address.Address;

import javax.sip.address.SipURI;

import javax.sip.header.ViaHeader;

import javax.sip.message.Request;



import com.alibaba.fastjson.JSONObject;

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

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

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

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

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

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

import org.springframework.boot.autoconfigure.security.SecurityProperties.Headers;

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

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

import org.springframework.stereotype.Component;



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

import com.genersoft.iot.vmp.gb28181.SipLayer;

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 java.util.regex.Pattern;

import java.util.regex.Matcher;



/**    

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

 * @author: songww

 * @author: swwheihei

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

 */

@Component

@@ -42,11 +48,27 @@
   private SIPRequestHeaderProvider headerProvider;

   

   @Autowired

   private SipLayer sipLayer;

   private VideoStreamSessionManager streamSession;



   @Autowired

   private IVideoManagerStorager storager;

   

   @Autowired

   private VideoStreamSessionManager streamSession;

   @Qualifier(value="tcpSipProvider")

   private SipProvider tcpSipProvider;

   

   @Autowired

   @Qualifier(value="udpSipProvider")

   private SipProvider udpSipProvider;



   @Autowired

   private ZLMUtils zlmUtils;



   @Value("${media.rtp.enable}")

   private boolean rtpEnable;







   /**

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

    * 

@@ -54,7 +76,6 @@
    * @param channelId  预览通道

    * @param leftRight  镜头左移右移 0:停止 1:左移 2:右移

     * @param upDown     镜头上移下移 0:停止 1:上移 2:下移

     * @param moveSpeed  镜头移动速度

    */

   @Override

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

@@ -142,6 +163,32 @@
      return builder.toString();

}



   /**

   * 云台指令码计算 
   *

    * @param leftRight  镜头左移右移 0:停止 1:左移 2:右移

    * @param upDown     镜头上移下移 0:停止 1:上移 2:下移

    * @param inOut      镜头放大缩小 0:停止 1:缩小 2:放大

    * @param moveSpeed  镜头移动速度 默认 0XFF (0-255)

    * @param zoomSpeed  镜头缩放速度 默认 0X1 (0-255)

    */

    public static String frontEndCmdString(int cmdCode, int parameter1, int parameter2, int combineCode2) {

      StringBuilder builder = new StringBuilder("A50F01");

      String strTmp;

      strTmp = String.format("%02X", cmdCode);

      builder.append(strTmp, 0, 2);

      strTmp = String.format("%02X", parameter1);

      builder.append(strTmp, 0, 2);

      strTmp = String.format("%02X", parameter2);

      builder.append(strTmp, 0, 2);

      strTmp = String.format("%X", combineCode2);

      builder.append(strTmp, 0, 1).append("0");

      //计算校验码

      int checkCode = (0XA5 + 0X0F + 0X01 + cmdCode + parameter1 + parameter2 + (combineCode2 & 0XF0)) % 0X100;

      strTmp = String.format("%02X", checkCode);

      builder.append(strTmp, 0, 2);

      return builder.toString();

   }



   /**

    * 云台控制，支持方向与缩放控制

@@ -160,15 +207,15 @@
      try {

         String cmdStr= cmdString(leftRight, upDown, inOut, moveSpeed, zoomSpeed);

         StringBuffer ptzXml = new StringBuffer(200);

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

         ptzXml.append("<Control>");

         ptzXml.append("<CmdType>DeviceControl</CmdType>");

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

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

         ptzXml.append("<PTZCmd>" + cmdStr + "</PTZCmd>");

         ptzXml.append("<Info>");

         ptzXml.append("</Info>");

         ptzXml.append("</Control>");

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

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

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

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

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

         ptzXml.append("<PTZCmd>" + cmdStr + "</PTZCmd>\r\n");

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

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

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

         

         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "ViaPtzBranch", "FromPtzTag", "ToPtzTag");

         

@@ -181,45 +228,103 @@
   }



   /**

    * 前端控制，包括PTZ指令、FI指令、预置位指令、巡航指令、扫描指令和辅助开关指令

    * 
    * @param device        控制设备

    * @param channelId      预览通道

    * @param cmdCode      指令码

     * @param parameter1   数据1

     * @param parameter2   数据2

     * @param combineCode2   组合码2

    */

   @Override

   public boolean frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2) {

      try {

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

         System.out.println("控制字符串：" + cmdStr);

         StringBuffer ptzXml = new StringBuffer(200);

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

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

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

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

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

         ptzXml.append("<PTZCmd>" + cmdStr + "</PTZCmd>\r\n");

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

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

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

			
         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "ViaPtzBranch", "FromPtzTag", "ToPtzTag");

			
         transmitRequest(device, request);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      } 
      return false;

   }

   /**

    * 请求预览视频流

    * 

    * @param device  视频设备

    * @param channelId  预览通道

    */  

   @Override

   public String playStreamCmd(Device device, String channelId) {

   public StreamInfo playStreamCmd(Device device, String channelId) {

      try {

			


         String ssrc = streamSession.createPlaySsrc();

         String transport = device.getTransport();

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

         MediaServerConfig mediaInfo = storager.getMediaInfo();

         String mediaPort = null;

         // 使用动态udp端口

         if (rtpEnable) {

            mediaPort = zlmUtils.getNewRTPPort(ssrc) + "";

         }else {

            mediaPort = mediaInfo.getRtpProxyPort();

         }

         //

         StringBuffer content = new StringBuffer(200);

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

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

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

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

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

           content.append("c=IN IP4 "+mediaInfo.getWanIp()+"\r\n");

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

           if("TCP".equals(transport)) {

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

         }

           if("UDP".equals(transport)) {

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

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

              content.append("m=video "+ mediaPort +" 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");

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

              content.append("m=video "+ mediaPort +" 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("TCP".equals(transport)){

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

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

           }

           if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式

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

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

           }else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式

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

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

         }

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

           

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

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

   

           ClientTransaction transaction = transmitRequest(device, request);

           streamSession.put(ssrc, transaction);

         return ssrc;

         DeviceChannel deviceChannel = storager.queryChannel(device.getDeviceId(), channelId);

         if (deviceChannel != null) {

            deviceChannel.setSsrc(ssrc);

            storager.updateChannel(device.getDeviceId(), deviceChannel);

         }



         StreamInfo streamInfo = new StreamInfo();

         streamInfo.setSsrc(ssrc);

         streamInfo.setCahnnelId(channelId);

         streamInfo.setDeviceID(device.getDeviceId());

         storager.startPlay(streamInfo);

         return streamInfo;

      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

         return null;

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

    */ 

   @Override

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

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

      try {

			
         MediaServerConfig mediaInfo = storager.getMediaInfo();

         String ssrc = streamSession.createPlayBackSsrc();

         //

         StringBuffer content = new StringBuffer(200);

@@ -245,29 +350,49 @@
           content.append("o="+sipConfig.getSipId()+" 0 0 IN IP4 "+sipConfig.getSipIp()+"\r\n");

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

           content.append("u="+channelId+":0\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");

           content.append("c=IN IP4 "+mediaInfo.getWanIp()+"\r\n");

           content.append("t="+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime)+" "

               +DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) +"\r\n");

         String mediaPort = null;

         // 使用动态udp端口

         if (rtpEnable) {

            mediaPort = zlmUtils.getNewRTPPort(ssrc) + "";

         }else {

            mediaPort = mediaInfo.getRtpProxyPort();

         }

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

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

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

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

            content.append("m=video "+ mediaPort +" 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");

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

            content.append("m=video "+ mediaPort +" 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");

           }

         if("TCP-PASSIVE".equals(streamMode)){ // tcp被动模式

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

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

         }else if ("TCP-ACTIVE".equals(streamMode)) { // tcp主动模式

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

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

         }

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

           

           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "playback", null);

   

           ClientTransaction transaction = transmitRequest(device, request);

           streamSession.put(ssrc, transaction);

         return ssrc;



         StreamInfo streamInfo = new StreamInfo();

         streamInfo.setSsrc(ssrc);

         streamInfo.setCahnnelId(channelId);

         streamInfo.setDeviceID(device.getDeviceId());

         boolean b = storager.startPlayback(streamInfo);

         return streamInfo;



      } catch ( SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

         return null;

@@ -277,8 +402,6 @@
   /**

    * 视频流停止

    * 

    * @param device  视频设备

    * @param channelId  预览通道

    */

   @Override

   public void streamByeCmd(String ssrc) {

@@ -305,9 +428,9 @@
         String protocol = viaHeader.getTransport().toUpperCase();

         ClientTransaction clientTransaction = null;

         if("TCP".equals(protocol)) {

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

            clientTransaction = tcpSipProvider.getNewClientTransaction(byeRequest);

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

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

            clientTransaction = udpSipProvider.getNewClientTransaction(byeRequest);

         }

         dialog.sendRequest(clientTransaction);

      } catch (TransactionDoesNotExistException e) {

@@ -419,12 +542,12 @@
   public boolean deviceInfoQuery(Device device) {

      try {

         StringBuffer catalogXml = new StringBuffer(200);

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

         catalogXml.append("<Query>");

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

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

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

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

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

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

         catalogXml.append("<CmdType>DeviceInfo</CmdType>\r\n");

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

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

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

         

         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "ViaDeviceInfoBranch", "FromDeviceInfoTag", "ToDeviceInfoTag");

         transmitRequest(device, request);

@@ -443,14 +566,16 @@
    */ 

   @Override

   public boolean catalogQuery(Device device) {

      // 清空通道

      storager.cleanChannelsForDevice(device.getDeviceId());

      try {

         StringBuffer catalogXml = new StringBuffer(200);

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

         catalogXml.append("<Query>");

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

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

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

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

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

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

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

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

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

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

         

         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "ViaCatalogBranch", "FromCatalogTag", "ToCatalogTag");

         transmitRequest(device, request);

@@ -473,17 +598,17 @@
      

      try {

         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>");

         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("<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");

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

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

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

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

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

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

         

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

         transmitRequest(device, request);

@@ -541,12 +666,13 @@
   private ClientTransaction transmitRequest(Device device, Request request) throws SipException {

      ClientTransaction clientTransaction = null;

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

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

         clientTransaction = tcpSipProvider.getNewClientTransaction(request);

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

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

         clientTransaction = udpSipProvider.getNewClientTransaction(request);

      }

      clientTransaction.sendRequest();

      return clientTransaction;

   }





}