Merge branch 'refs/heads/2.7.1'

648540858

2024-06-11 2cf7178cb79dc59edede0caeea81b5d262618cca

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

@@ -15,12 +15,10 @@
import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;

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

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

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

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

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

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

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

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.bean.MediaServer;

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

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

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

@@ -76,8 +74,6 @@
    @Autowired

    private IMediaServerService mediaServerService;



    @Autowired

    private ZLMServerFactory zlmServerFactory;





    /**

@@ -1234,6 +1230,8 @@
        subscribePostitionXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

        if (device.getSubscribeCycleForMobilePosition() > 0) {

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

        }else {

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

        }

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