Merge branch 'wvp-28181-2.0'

648540858

2022-09-24 d7a1b94f905c5f28c9c8f2d48c3f9e28ebcf9cc4

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

@@ -10,7 +10,7 @@
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.HeaderUtils;

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

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

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

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

@@ -21,10 +21,12 @@
import com.genersoft.iot.vmp.service.bean.SSRCInfo;

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

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

import com.genersoft.iot.vmp.utils.GitUtil;

import gov.nist.javax.sip.SipProviderImpl;

import gov.nist.javax.sip.SipStackImpl;

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

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

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

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

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

@@ -41,7 +43,9 @@
import javax.sip.message.Request;

import java.lang.reflect.Field;

import java.text.ParseException;

import java.util.ArrayList;

import java.util.HashSet;

import java.util.List;



/**    

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

@@ -59,6 +63,9 @@


   @Autowired

   private SipFactory sipFactory;



   @Autowired

   private GitUtil gitUtil;



   @Autowired

   @Qualifier(value="tcpSipProvider")

@@ -244,13 +251,11 @@
         ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");

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

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

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



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

               : udpSipProvider.getNewCallId();



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

         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

         

         transmitRequest(device, request);

         return true;

@@ -287,13 +292,12 @@
         ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");

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

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

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





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

               : udpSipProvider.getNewCallId();



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

         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -323,13 +327,12 @@
         ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");

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

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

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





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

               : udpSipProvider.getNewCallId();



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

         Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request, errorEvent, okEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -356,7 +359,7 @@
//         String streamMode = device.getStreamMode().toUpperCase();



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

         HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", stream, true, "rtmp", mediaServerItem.getId());

         HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", stream, true, "rtsp", mediaServerItem.getId());

         subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject json)->{

            if (event != null) {

               event.response(mediaServerItemInUse, json);

@@ -421,12 +424,10 @@
         // f字段:f= v/编码格式/分辨率/帧率/码率类型/码率大小a/编码格式/码率大小/采样率

//         content.append("f=v/2/5/25/1/4000a/1/8/1" + "\r\n"); // 未发现支持此特性的设备



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



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

               : udpSipProvider.getNewCallId();



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

         Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null, ssrcInfo.getSsrc(), callIdHeader);



         transmitRequest(device, request, (e -> {

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

@@ -435,7 +436,14 @@
         }), e ->{

            // 这里为例避免一个通道的点播只有一个callID这个参数使用一个固定值

            streamSession.put(device.getDeviceId(), channelId ,"play", stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), ((ResponseEvent)e.event).getClientTransaction(), VideoStreamSessionManager.SessionType.play);

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

            Dialog sipDialog = null;

            if (e.dialog == null) {

               SIPClientTransaction clientTransaction = (SIPClientTransaction)((ResponseEvent)e.event).getClientTransaction();

               sipDialog = new SIPDialog(clientTransaction, clientTransaction.getLastResponse());

            }else {

               sipDialog = e.dialog;

            }

            streamSession.put(device.getDeviceId(), channelId ,"play", sipDialog);

            okEvent.response(e);

         });



@@ -456,7 +464,7 @@
   @Override

   public void playbackStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,

                          String startTime, String endTime, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,

                          SipSubscribe.Event errorEvent) {

                          SipSubscribe.Event okEvent,SipSubscribe.Event errorEvent) {

      try {



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

@@ -519,12 +527,10 @@
         }



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

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



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

               : udpSipProvider.getNewCallId();

         HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, "rtmp", mediaServerItem.getId());

         HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, "rtsp", mediaServerItem.getId());

         // 添加订阅

         subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject json)->{

                  if (hookEvent != null) {

@@ -533,12 +539,13 @@
                  }

                  subscribe.removeSubscribe(hookSubscribe);

               });

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

           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader, ssrcInfo.getSsrc());



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

            ResponseEvent responseEvent = (ResponseEvent) okEvent.event;

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

            ResponseEvent responseEvent = (ResponseEvent) event.event;

              streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), responseEvent.getClientTransaction(), VideoStreamSessionManager.SessionType.playback);

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

            streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), event.dialog);

            okEvent.response(event);

         });

         if (inviteStreamCallback != null) {

            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));

@@ -624,8 +631,6 @@
         content.append("a=downloadspeed:" + downloadSpeed + "\r\n");



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

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



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

               : udpSipProvider.getNewCallId();

@@ -648,7 +653,7 @@
                        });

               });



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

           Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader, ssrcInfo.getSsrc());

         if (inviteStreamCallback != null) {

            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));

         }

@@ -670,6 +675,38 @@
   @Override

   public void streamByeCmd(String deviceId, String channelId, String stream, String callId) {

      streamByeCmd(deviceId, channelId, stream, callId, null);

   }



   @Override

   public void streamByeCmd(SIPDialog dialog, String channelId, SIPRequest request, SipSubscribe.Event okEvent) throws SipException, ParseException, InvalidArgumentException {

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

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

      byeURI.setHost(request.getRemoteAddress().getHostAddress());

      byeURI.setPort(request.getRemotePort());

      byeURI.setUser(channelId);

      ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME);

      String protocol = viaHeader.getTransport().toUpperCase();

      viaHeader.setRPort();

      // 增加Contact header

      Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort()));

      byeRequest.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));

      UserAgentHeader userAgentHeader = HeaderUtils.createUserAgentHeader(sipFactory);

      byeRequest.addHeader(userAgentHeader);

      ClientTransaction clientTransaction = null;

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

         clientTransaction = tcpSipProvider.getNewClientTransaction(byeRequest);

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

         clientTransaction = udpSipProvider.getNewClientTransaction(byeRequest);

      }



      CallIdHeader callIdHeader = (CallIdHeader) byeRequest.getHeader(CallIdHeader.NAME);

      if (okEvent != null) {

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

      }

      CSeqHeader cSeqHeader = (CSeqHeader)byeRequest.getHeader(CSeqHeader.NAME);

      cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());

      dialog.sendRequest(clientTransaction);



   }



   /**

@@ -699,7 +736,7 @@
            dialog = streamSession.getDialogByStream(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());

         }

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

         mediaServerService.closeRTPServer(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());

         mediaServerService.closeRTPServer(ssrcTransaction.getMediaServerId(), ssrcTransaction.getStream());

         streamSession.remove(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());



         if (dialog == null) {

@@ -736,7 +773,7 @@
         // 增加Contact header

         Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort()));

         byeRequest.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));

         UserAgentHeader userAgentHeader = HeaderUtils.createUserAgentHeader(sipFactory);

         UserAgentHeader userAgentHeader = SipUtils.createUserAgentHeader(sipFactory, gitUtil);

         byeRequest.addHeader(userAgentHeader);

         ClientTransaction clientTransaction = null;

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

@@ -764,21 +801,9 @@
    * 语音广播

    * 

    * @param device  视频设备

    * @param channelId  预览通道

    */

   @Override

   public boolean audioBroadcastCmd(Device device, String channelId) {

      // 改为新的实现

      return false;

   }



   /**

    * 语音广播

    * 
    * @param device  视频设备

    */

   @Override

   public boolean audioBroadcastCmd(Device device) {

   public boolean audioBroadcastCmd(Device device,String channelId, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer broadcastXml = new StringBuffer(200);

         String charset = device.getCharset();

@@ -787,15 +812,13 @@
         broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");

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

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

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

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

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

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

			


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

               : udpSipProvider.getNewCallId();

                        

         Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), "z9hG4bK-ViaBcst-" + tm, "FromBcst" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -815,20 +838,18 @@
         broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

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

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

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



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

               : udpSipProvider.getNewCallId();

								
         Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), "z9hG4bK-ViaBcst-" + tm, "FromBcst" + tm, null, callIdHeader);



         Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request, errorEvent);

      } catch (SipException | ParseException | InvalidArgumentException e) {

         e.printStackTrace();

      } 
   } 
	
	
      }

   }





   /**

    * 音视频录像控制

    * 

@@ -852,13 +873,11 @@
         }

         cmdXml.append("<RecordCmd>" + recordCmdStr + "</RecordCmd>\r\n");

         cmdXml.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, cmdXml.toString(), null, "FromRecord" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -884,13 +903,11 @@
         cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

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

         cmdXml.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, cmdXml.toString(), null, "FromBoot" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -917,13 +934,11 @@
         cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         cmdXml.append("<GuardCmd>" + guardCmdStr + "</GuardCmd>\r\n");

         cmdXml.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, cmdXml.toString(), null, "FromGuard" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -961,13 +976,11 @@
            cmdXml.append("</Info>\r\n");

         }

         cmdXml.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, cmdXml.toString(), null, "FromAlarm" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -998,13 +1011,11 @@
         }

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

         cmdXml.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, cmdXml.toString(), null, "FromBoot" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1053,13 +1064,11 @@
         }

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

         cmdXml.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, cmdXml.toString(), null, "FromGuard" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1125,13 +1134,11 @@
         }

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

         cmdXml.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, cmdXml.toString(), null, "FromConfig" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1156,13 +1163,11 @@
         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");

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



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), null, "FromStatus" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);



         transmitRequest(device, request, errorEvent);

         return true;

@@ -1189,13 +1194,11 @@
         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");

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



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "z9hG4bK-ViaDeviceInfo-" + tm, "FromDev" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);



         transmitRequest(device, request);

         

@@ -1218,17 +1221,15 @@
         String charset = device.getCharset();

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

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

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

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

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

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

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

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

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

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



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "z9hG4bK-ViaCatalog-" + tm, "FromCat" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), SipUtils.getNewViaTag(),  SipUtils.getNewFromTag(), null, callIdHeader);



         transmitRequest(device, request, errorEvent);

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1275,14 +1276,12 @@
            recordInfoXml.append("<Type>" + type+"</Type>\r\n");

         }

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

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



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(),

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

               SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);



         transmitRequest(device, request, errorEvent, okEvent);

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1334,13 +1333,11 @@
            cmdXml.append("<EndAlarmTime>" + endTime + "</EndAlarmTime>\r\n");

         }

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

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



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromAlarm" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1372,13 +1369,11 @@
         }

         cmdXml.append("<ConfigType>" + configType + "</ConfigType>\r\n");

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

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



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromConfig" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1407,13 +1402,11 @@
            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

         }

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

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



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, "FromConfig" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request, errorEvent);

         return true;

      } catch (SipException | ParseException | InvalidArgumentException e) {

@@ -1439,13 +1432,11 @@
         mobilePostitionXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

         mobilePostitionXml.append("<Interval>60</Interval>\r\n");

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

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



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createMessageRequest(device, mobilePostitionXml.toString(), "z9hG4bK-viaPos-" + tm, "fromTagPos" + tm, null, callIdHeader);

         Request request = headerProvider.createMessageRequest(device, mobilePostitionXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);



         transmitRequest(device, request, errorEvent);

         

@@ -1463,7 +1454,7 @@
    * @return         true = 命令发送成功

    */

   @Override

   public boolean mobilePositionSubscribe(Device device, Dialog dialog, SipSubscribe.Event okEvent ,SipSubscribe.Event errorEvent) {

   public SIPRequest mobilePositionSubscribe(Device device, SIPRequest requestOld, SipSubscribe.Event okEvent ,SipSubscribe.Event errorEvent) {

      try {

         StringBuffer subscribePostitionXml = new StringBuffer(200);

         String charset = device.getCharset();

@@ -1473,39 +1464,27 @@
         subscribePostitionXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

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

         if (device.getSubscribeCycleForMobilePosition() > 0) {

            subscribePostitionXml.append("<Interval>" + String.valueOf(device.getMobilePositionSubmissionInterval()) + "</Interval>\r\n");

            subscribePostitionXml.append("<Interval>" + device.getMobilePositionSubmissionInterval() + "</Interval>\r\n");

         }

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



         Request request;

         if (dialog != null) {

            SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());

            request = dialog.createRequest(Request.SUBSCRIBE);

            ExpiresHeader expiresHeader = sipFactory.createHeaderFactory().createExpiresHeader(device.getSubscribeCycleForCatalog());

            request.setExpires(expiresHeader);

         CallIdHeader callIdHeader;



            request.setRequestURI(requestURI);



            ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");

            request.setContent(subscribePostitionXml.toString(), contentTypeHeader);



            CSeqHeader cSeqHeader = (CSeqHeader)request.getHeader(CSeqHeader.NAME);

            cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());

            request.removeHeader(CSeqHeader.NAME);

            request.addHeader(cSeqHeader);

         if (requestOld != null) {

            callIdHeader = sipFactory.createHeaderFactory().createCallIdHeader(requestOld.getCallIdHeader().getCallId());

         }else {

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

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

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

                  : udpSipProvider.getNewCallId();

            request = headerProvider.createSubscribeRequest(device, subscribePostitionXml.toString(), "z9hG4bK-viaPos-" + tm, "fromTagPos" + tm, null, device.getSubscribeCycleForMobilePosition(), "presence" ,callIdHeader); //Position;id=" + tm.substring(tm.length() - 4));

         }

         SIPRequest request = (SIPRequest)headerProvider.createSubscribeRequest(device, subscribePostitionXml.toString(), requestOld, device.getSubscribeCycleForMobilePosition(), "presence" ,callIdHeader); //Position;id=" + tm.substring(tm.length() - 4));



         transmitRequest(device, request, errorEvent, okEvent);



         return true;

         return request;



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

         e.printStackTrace();

         return false;

         return null;

      }

   }



@@ -1552,12 +1531,10 @@
         }

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



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



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

               : udpSipProvider.getNewCallId();



         Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), "z9hG4bK-viaPos-" + tm, "fromTagPos" + tm, null, expires, "presence" , callIdHeader);

         Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), null, expires, "presence" , callIdHeader);

         transmitRequest(device, request);



         return true;

@@ -1569,7 +1546,7 @@
   }



   @Override

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

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

      try {

         StringBuffer cmdXml = new StringBuffer(200);

         String charset = device.getCharset();

@@ -1580,42 +1557,24 @@
         cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

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



         CallIdHeader callIdHeader ;



         Request request;

         if (dialog != null) {

            SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());

            request = dialog.createRequest(Request.SUBSCRIBE);

            ExpiresHeader expiresHeader = sipFactory.createHeaderFactory().createExpiresHeader(device.getSubscribeCycleForCatalog());

            request.setExpires(expiresHeader);



            request.setRequestURI(requestURI);



            ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");

            request.setContent(cmdXml.toString(), contentTypeHeader);



            CSeqHeader cSeqHeader = (CSeqHeader)request.getHeader(CSeqHeader.NAME);

            cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());

            request.removeHeader(CSeqHeader.NAME);

            request.addHeader(cSeqHeader);



         if (requestOld != null) {

            callIdHeader = sipFactory.createHeaderFactory().createCallIdHeader(requestOld.getCallIdHeader().getCallId());

         }else {

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



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

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

                  : udpSipProvider.getNewCallId();



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

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

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

                  callIdHeader);



         }



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

         SIPRequest request = (SIPRequest)headerProvider.createSubscribeRequest(device, cmdXml.toString(), requestOld,  device.getSubscribeCycleForCatalog(), "Catalog" ,

               callIdHeader);

         transmitRequest(device, request, errorEvent, okEvent);

         return true;

         return request;



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

         e.printStackTrace();

         return false;

         return null;

      }

   }



@@ -1635,10 +1594,9 @@
         }

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

         Request request = headerProvider.createMessageRequest(device, dragXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

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

         transmitRequest(device, request);

         return true;

@@ -1665,13 +1623,11 @@
         clientTransaction = udpSipProvider.getNewClientTransaction(request);

      }

      if (request.getHeader(UserAgentHeader.NAME) == null) {

         UserAgentHeader userAgentHeader = null;

         try {

            userAgentHeader = HeaderUtils.createUserAgentHeader(sipFactory);

            request.addHeader(SipUtils.createUserAgentHeader(sipFactory, gitUtil));

         } catch (ParseException e) {

            logger.error("添加UserAgentHeader失败", e);

         }

         request.addHeader(userAgentHeader);

      }

      CallIdHeader callIdHeader = (CallIdHeader)request.getHeader(CallIdHeader.NAME);

      // 添加错误订阅

@@ -1817,7 +1773,7 @@
   private int getInfoCseq() {

      return (int) ((Math.random() * 9 + 1) * Math.pow(10, 8));

   }

	


   @Override

   public void playbackControlCmd(Device device, StreamInfo streamInfo, String content,SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) {

      try {

@@ -1882,8 +1838,7 @@


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

               : udpSipProvider.getNewCallId();

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

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

         Request request = headerProvider.createMessageRequest(device, deviceStatusXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);

         transmitRequest(device, request);





@@ -1894,62 +1849,5 @@
         throw new RuntimeException(e);

      }

      return true;

   }



   private void sendNotify(Device device, String catalogXmlContent,

                     SubscribeInfo subscribeInfo, SipSubscribe.Event errorEvent,  SipSubscribe.Event okEvent )

         throws NoSuchFieldException, IllegalAccessException, SipException, ParseException {

      MessageFactoryImpl messageFactory = (MessageFactoryImpl) sipFactory.createMessageFactory();

      String characterSet = device.getCharset();

      // 设置编码， 防止中文乱码

      messageFactory.setDefaultContentEncodingCharset(characterSet);

      Dialog dialog  = subscribeInfo.getDialog();

      if (dialog == null || !dialog.getState().equals(DialogState.CONFIRMED)) {

         return;

      }

      SIPRequest notifyRequest = (SIPRequest)dialog.createRequest(Request.NOTIFY);

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");

      notifyRequest.setContent(catalogXmlContent, contentTypeHeader);



      SubscriptionStateHeader subscriptionState = sipFactory.createHeaderFactory()

            .createSubscriptionStateHeader(SubscriptionStateHeader.ACTIVE);

      notifyRequest.addHeader(subscriptionState);



      EventHeader event = sipFactory.createHeaderFactory().createEventHeader(subscribeInfo.getEventType());

      if (subscribeInfo.getEventId() != null) {

         event.setEventId(subscribeInfo.getEventId());

      }

      notifyRequest.addHeader(event);



      SipURI sipURI = (SipURI) notifyRequest.getRequestURI();

      if (subscribeInfo.getTransaction() != null) {

         SIPRequest request = (SIPRequest) subscribeInfo.getTransaction().getRequest();

         sipURI.setHost(request.getRemoteAddress().getHostAddress());

         sipURI.setPort(request.getRemotePort());

      }else {

         sipURI.setHost(device.getIp());

         sipURI.setPort(device.getPort());

      }



      ClientTransaction transaction = null;

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

         transaction = tcpSipProvider.getNewClientTransaction(notifyRequest);

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

         transaction = udpSipProvider.getNewClientTransaction(notifyRequest);

      }

      // 添加错误订阅

      if (errorEvent != null) {

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

      }

      // 添加订阅

      if (okEvent != null) {

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

      }

      if (transaction == null) {

         logger.error("平台{}的Transport错误：{}",device.getDeviceId(), device.getTransport());

         return;

      }

      dialog.sendRequest(transaction);



   }

}