Merge branch 'master' into dev/abl支持

648540858

2024-03-29 03248551906304a182d489ad90654d72a491791c

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

@@ -7,10 +7,6 @@
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;

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

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

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

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

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

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.SIPSender;

@@ -18,14 +14,14 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;

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

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

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

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

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

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

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

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

import com.genersoft.iot.vmp.media.event.hook.HookSubscribe;

import com.genersoft.iot.vmp.media.event.hook.HookSubscribeFactory;

import com.genersoft.iot.vmp.media.event.hook.HookSubscribeForStreamChange;

import com.genersoft.iot.vmp.media.event.hook.HookSubscribeForStreamPush;

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

import com.genersoft.iot.vmp.media.zlm.dto.hook.HookParam;

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

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

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

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

@@ -76,7 +72,7 @@
    private UserSetting userSetting;



    @Autowired

    private ZlmHttpHookSubscribe subscribe;

    private HookSubscribe subscribe;



    @Autowired

    private IMediaServerService mediaServerService;

@@ -275,7 +271,7 @@
     */

    @Override

    public void playStreamCmd(MediaServer mediaServerItem, SSRCInfo ssrcInfo, Device device, DeviceChannel channel,

                              ZlmHttpHookSubscribe.Event event, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {

                              HookSubscribe.Event event, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {

        String stream = ssrcInfo.getStream();



        if (device == null) {

@@ -384,7 +380,7 @@
     */

    @Override

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

                                  String startTime, String endTime, ZlmHttpHookSubscribe.Event hookEvent,

                                  String startTime, String endTime, HookSubscribe.Event hookEvent,

                                  SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {





@@ -487,7 +483,7 @@
    @Override

    public void downloadStreamCmd(MediaServer mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,

                                  String startTime, String endTime, int downloadSpeed,

                                  ZlmHttpHookSubscribe.Event hookEvent,

                                  HookSubscribe.Event hookEvent,

                                  SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {



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

@@ -594,7 +590,7 @@
    }



    @Override

    public void talkStreamCmd(MediaServer mediaServerItem, SendRtpItem sendRtpItem, Device device, String channelId, String callId, ZlmHttpHookSubscribe.Event event, ZlmHttpHookSubscribe.Event eventForPush, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {

    public void talkStreamCmd(MediaServer mediaServerItem, SendRtpItem sendRtpItem, Device device, String channelId, String callId, HookSubscribe.Event event, HookSubscribe.Event eventForPush, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {



        String stream = sendRtpItem.getStream();



@@ -879,7 +875,7 @@
     * @param presetIndex 调用预置位编号，开启看守位时使用，取值范围0~255

     */

    @Override

    public void homePositionCmd(Device device, String channelId, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent,SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {

    public void homePositionCmd(Device device, String channelId, Boolean enabled, Integer resetTime, Integer presetIndex, SipSubscribe.Event errorEvent,SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {



        StringBuffer cmdXml = new StringBuffer(200);

        String charset = device.getCharset();

@@ -893,18 +889,10 @@
            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");

        }

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

        if (NumericUtil.isInteger(enabled) && (!enabled.equals("0"))) {

        if (enabled) {

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

            if (NumericUtil.isInteger(resetTime)) {

                cmdXml.append("<ResetTime>" + resetTime + "</ResetTime>\r\n");

            } else {

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

            }

            if (NumericUtil.isInteger(presetIndex)) {

                cmdXml.append("<PresetIndex>" + presetIndex + "</PresetIndex>\r\n");

            } else {

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

            }

            cmdXml.append("<ResetTime>" + resetTime + "</ResetTime>\r\n");

            cmdXml.append("<PresetIndex>" + presetIndex + "</PresetIndex>\r\n");

        } else {

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

        }