From 82adc0cb23f3ee47322e78889cdaba57e9309000 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 21 三月 2023 15:55:24 +0800
Subject: [PATCH] 完善语音对讲级联
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java | 444 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 313 insertions(+), 131 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
index 0f234f5..1bc03c7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
@@ -2,22 +2,31 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.conf.DynamicTask;
+import com.genersoft.iot.vmp.conf.UserSetting;
+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.event.SipSubscribe;
+import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.transmit.SIPSender;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderPlarformProvider;
import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
-import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
-import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
+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.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
+import com.genersoft.iot.vmp.utils.DateUtil;
import gov.nist.javax.sip.message.MessageFactoryImpl;
import gov.nist.javax.sip.message.SIPRequest;
+import gov.nist.javax.sip.message.SIPResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +35,11 @@
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
-import javax.sip.*;
-import javax.sip.header.*;
+import javax.sip.InvalidArgumentException;
+import javax.sip.ResponseEvent;
+import javax.sip.SipException;
+import javax.sip.header.CallIdHeader;
+import javax.sip.header.WWWAuthenticateHeader;
import javax.sip.message.Request;
import java.text.ParseException;
import java.util.ArrayList;
@@ -59,6 +71,19 @@
@Autowired
private SIPSender sipSender;
+
+ @Autowired
+ private ZlmHttpHookSubscribe subscribe;
+
+ @Autowired
+ private UserSetting userSetting;
+
+
+ @Autowired
+ private VideoStreamSessionManager streamSession;
+
+ @Autowired
+ private DynamicTask dynamicTask;
@Override
public void register(ParentPlatform parentPlatform, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) throws InvalidArgumentException, ParseException, SipException {
@@ -108,13 +133,14 @@
public String keepalive(ParentPlatform parentPlatform,SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) throws SipException, InvalidArgumentException, ParseException {
String characterSet = parentPlatform.getCharacterSet();
StringBuffer keepaliveXml = new StringBuffer(200);
- keepaliveXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
- keepaliveXml.append("<Notify>\r\n");
- keepaliveXml.append("<CmdType>Keepalive</CmdType>\r\n");
- keepaliveXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
- keepaliveXml.append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n");
- keepaliveXml.append("<Status>OK</Status>\r\n");
- keepaliveXml.append("</Notify>\r\n");
+ keepaliveXml.append("<?xml version=\"1.0\" encoding=\"")
+ .append(characterSet).append("\"?>\r\n")
+ .append("<Notify>\r\n")
+ .append("<CmdType>Keepalive</CmdType>\r\n")
+ .append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n")
+ .append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n")
+ .append("<Status>OK</Status>\r\n")
+ .append("</Notify>\r\n");
CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
@@ -132,7 +158,6 @@
* 鍚戜笂绾у洖澶嶉�氶亾淇℃伅
* @param channel 閫氶亾淇℃伅
* @param parentPlatform 骞冲彴淇℃伅
- * @return
*/
@Override
public void catalogQuery(DeviceChannel channel, ParentPlatform parentPlatform, String sn, String fromTag, int size) throws SipException, InvalidArgumentException, ParseException {
@@ -159,18 +184,18 @@
if ( parentPlatform ==null) {
return ;
}
- sendCatalogResponse(channels, parentPlatform, sn, fromTag, 0);
+ sendCatalogResponse(channels, parentPlatform, sn, fromTag, 0, true);
}
private String getCatalogXml(List<DeviceChannel> channels, String sn, ParentPlatform parentPlatform, int size) {
String characterSet = parentPlatform.getCharacterSet();
StringBuffer catalogXml = new StringBuffer(600);
- catalogXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet +"\"?>\r\n");
- catalogXml.append("<Response>\r\n");
- catalogXml.append("<CmdType>Catalog</CmdType>\r\n");
- catalogXml.append("<SN>" +sn + "</SN>\r\n");
- catalogXml.append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n");
- catalogXml.append("<SumNum>" + size + "</SumNum>\r\n");
- catalogXml.append("<DeviceList Num=\"" + channels.size() +"\">\r\n");
+ catalogXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet +"\"?>\r\n")
+ .append("<Response>\r\n")
+ .append("<CmdType>Catalog</CmdType>\r\n")
+ .append("<SN>" +sn + "</SN>\r\n")
+ .append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n")
+ .append("<SumNum>" + size + "</SumNum>\r\n")
+ .append("<DeviceList Num=\"" + channels.size() +"\">\r\n");
if (channels.size() > 0) {
for (DeviceChannel channel : channels) {
if (parentPlatform.getServerGBId().equals(channel.getParentId())) {
@@ -210,6 +235,25 @@
}else {
catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
}
+ catalogXml.append("<Block>" + channel.getBlock() + "</Block>\r\n");
+ catalogXml.append("<SafetyWay>" + channel.getSafetyWay() + "</SafetyWay>\r\n");
+ catalogXml.append("<CertNum>" + channel.getCertNum() + "</CertNum>\r\n");
+ catalogXml.append("<Certifiable>" + channel.getCertifiable() + "</Certifiable>\r\n");
+ catalogXml.append("<ErrCode>" + channel.getErrCode() + "</ErrCode>\r\n");
+ catalogXml.append("<EndTime>" + channel.getEndTime() + "</EndTime>\r\n");
+ catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
+ catalogXml.append("<IPAddress>" + channel.getIpAddress() + "</IPAddress>\r\n");
+ catalogXml.append("<Port>" + channel.getPort() + "</Port>\r\n");
+ catalogXml.append("<Password>" + channel.getPort() + "</Password>\r\n");
+ catalogXml.append("<Status>" + (channel.getStatus() == 1?"ON":"OFF") + "</Status>\r\n");
+ catalogXml.append("<Longitude>" +
+ (channel.getLongitudeWgs84() != 0? channel.getLongitudeWgs84():channel.getLongitude())
+ + "</Longitude>\r\n");
+ catalogXml.append("<Latitude>" +
+ (channel.getLatitudeWgs84() != 0? channel.getLatitudeWgs84():channel.getLatitude())
+ + "</Latitude>\r\n");
+
+
}
}
catalogXml.append("</Item>\r\n");
@@ -221,7 +265,7 @@
return catalogXml.toString();
}
- private void sendCatalogResponse(List<DeviceChannel> channels, ParentPlatform parentPlatform, String sn, String fromTag, int index) throws SipException, InvalidArgumentException, ParseException {
+ private void sendCatalogResponse(List<DeviceChannel> channels, ParentPlatform parentPlatform, String sn, String fromTag, int index, boolean sendAfterResponse) throws SipException, InvalidArgumentException, ParseException {
if (index >= channels.size()) {
return;
}
@@ -235,15 +279,49 @@
// callid
CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
- Request request = headerProviderPlatformProvider.createMessageRequest(parentPlatform, catalogXml, fromTag, SipUtils.getNewViaTag(), callIdHeader);
- sipSender.transmitRequest(parentPlatform.getDeviceIp(), request, null, eventResult -> {
- int indexNext = index + parentPlatform.getCatalogGroup();
- try {
- sendCatalogResponse(channels, parentPlatform, sn, fromTag, indexNext);
- } catch (SipException | InvalidArgumentException | ParseException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鐩綍鏌ヨ鍥炲: {}", e.getMessage());
- }
- });
+ SIPRequest request = (SIPRequest)headerProviderPlatformProvider.createMessageRequest(parentPlatform, catalogXml, fromTag, SipUtils.getNewViaTag(), callIdHeader);
+
+ String timeoutTaskKey = "catalog_task_" + parentPlatform.getServerGBId() + sn;
+
+ String callId = request.getCallIdHeader().getCallId();
+
+ if (sendAfterResponse) {
+ // 榛樿鎸夌収鏀跺埌200鍥炲鍚庡彂閫佷笅涓�鏉★紝 濡傛灉瓒呮椂鏀朵笉鍒板洖澶嶏紝灏变互30姣鐨勯棿闅旂洿鎺ュ彂閫併��
+ dynamicTask.startDelay(timeoutTaskKey, ()->{
+ sipSubscribe.removeOkSubscribe(callId);
+ int indexNext = index + parentPlatform.getCatalogGroup();
+ try {
+ sendCatalogResponse(channels, parentPlatform, sn, fromTag, indexNext, false);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鐩綍鏌ヨ鍥炲: {}", e.getMessage());
+ }
+ }, 3000);
+ sipSender.transmitRequest(parentPlatform.getDeviceIp(), request, eventResult -> {
+ logger.error("[鐩綍鎺ㄩ�佸け璐 鍥芥爣绾ц仈 platform : {}, code: {}, msg: {}, 鍋滄鍙戦��", parentPlatform.getServerGBId(), eventResult.statusCode, eventResult.msg);
+ dynamicTask.stop(timeoutTaskKey);
+ }, eventResult -> {
+ dynamicTask.stop(timeoutTaskKey);
+ int indexNext = index + parentPlatform.getCatalogGroup();
+ try {
+ sendCatalogResponse(channels, parentPlatform, sn, fromTag, indexNext, true);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鐩綍鏌ヨ鍥炲: {}", e.getMessage());
+ }
+ });
+ }else {
+ sipSender.transmitRequest(parentPlatform.getDeviceIp(), request, eventResult -> {
+ logger.error("[鐩綍鎺ㄩ�佸け璐 鍥芥爣绾ц仈 platform : {}, code: {}, msg: {}, 鍋滄鍙戦��", parentPlatform.getServerGBId(), eventResult.statusCode, eventResult.msg);
+ dynamicTask.stop(timeoutTaskKey);
+ }, null);
+ dynamicTask.startDelay(timeoutTaskKey, ()->{
+ int indexNext = index + parentPlatform.getCatalogGroup();
+ try {
+ sendCatalogResponse(channels, parentPlatform, sn, fromTag, indexNext, false);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鐩綍鏌ヨ鍥炲: {}", e.getMessage());
+ }
+ }, 30);
+ }
}
/**
@@ -254,7 +332,7 @@
* @return
*/
@Override
- public void deviceInfoResponse(ParentPlatform parentPlatform, String sn, String fromTag) throws SipException, InvalidArgumentException, ParseException {
+ public void deviceInfoResponse(ParentPlatform parentPlatform,Device device, String sn, String fromTag) throws SipException, InvalidArgumentException, ParseException {
if (parentPlatform == null) {
return;
}
@@ -264,11 +342,11 @@
deviceInfoXml.append("<Response>\r\n");
deviceInfoXml.append("<CmdType>DeviceInfo</CmdType>\r\n");
deviceInfoXml.append("<SN>" +sn + "</SN>\r\n");
- deviceInfoXml.append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n");
- deviceInfoXml.append("<DeviceName>" + parentPlatform.getName() + "</DeviceName>\r\n");
- deviceInfoXml.append("<Manufacturer>wvp</Manufacturer>\r\n");
- deviceInfoXml.append("<Model>wvp-28181-2.0</Model>\r\n");
- deviceInfoXml.append("<Firmware>2.0.202107</Firmware>\r\n");
+ deviceInfoXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+ deviceInfoXml.append("<DeviceName>" + device.getName() + "</DeviceName>\r\n");
+ deviceInfoXml.append("<Manufacturer>" + device.getManufacturer() + "</Manufacturer>\r\n");
+ deviceInfoXml.append("<Model>" + device.getModel() + "</Model>\r\n");
+ deviceInfoXml.append("<Firmware>" + device.getFirmware() + "</Firmware>\r\n");
deviceInfoXml.append("<Result>OK</Result>\r\n");
deviceInfoXml.append("</Response>\r\n");
@@ -278,6 +356,7 @@
sipSender.transmitRequest(parentPlatform.getDeviceIp(), request);
}
+
/**
* 鍚戜笂绾у洖澶岲eviceStatus鏌ヨ淇℃伅
* @param parentPlatform 骞冲彴淇℃伅
@@ -286,27 +365,27 @@
* @return
*/
@Override
- public void deviceStatusResponse(ParentPlatform parentPlatform, String sn, String fromTag) throws SipException, InvalidArgumentException, ParseException {
+ public void deviceStatusResponse(ParentPlatform parentPlatform,String channelId, String sn, String fromTag,int status) throws SipException, InvalidArgumentException, ParseException {
if (parentPlatform == null) {
return ;
}
+ String statusStr = (status==1)?"ONLINE":"OFFLINE";
String characterSet = parentPlatform.getCharacterSet();
StringBuffer deviceStatusXml = new StringBuffer(600);
- deviceStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
- deviceStatusXml.append("<Response>\r\n");
- deviceStatusXml.append("<CmdType>DeviceStatus</CmdType>\r\n");
- deviceStatusXml.append("<SN>" +sn + "</SN>\r\n");
- deviceStatusXml.append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n");
- deviceStatusXml.append("<Result>OK</Result>\r\n");
- deviceStatusXml.append("<Online>ONLINE</Online>\r\n");
- deviceStatusXml.append("<Status>OK</Status>\r\n");
- deviceStatusXml.append("</Response>\r\n");
+ deviceStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n")
+ .append("<Response>\r\n")
+ .append("<CmdType>DeviceStatus</CmdType>\r\n")
+ .append("<SN>" +sn + "</SN>\r\n")
+ .append("<DeviceID>" + channelId + "</DeviceID>\r\n")
+ .append("<Result>OK</Result>\r\n")
+ .append("<Online>"+statusStr+"</Online>\r\n")
+ .append("<Status>OK</Status>\r\n")
+ .append("</Response>\r\n");
CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
Request request = headerProviderPlatformProvider.createMessageRequest(parentPlatform, deviceStatusXml.toString(), fromTag, SipUtils.getNewViaTag(), callIdHeader);
sipSender.transmitRequest(parentPlatform.getDeviceIp(), request);
-
}
@Override
@@ -320,18 +399,18 @@
String characterSet = parentPlatform.getCharacterSet();
StringBuffer deviceStatusXml = new StringBuffer(600);
- deviceStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
- deviceStatusXml.append("<Notify>\r\n");
- deviceStatusXml.append("<CmdType>MobilePosition</CmdType>\r\n");
- deviceStatusXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
- deviceStatusXml.append("<DeviceID>" + gpsMsgInfo.getId() + "</DeviceID>\r\n");
- deviceStatusXml.append("<Time>" + gpsMsgInfo.getTime() + "</Time>\r\n");
- deviceStatusXml.append("<Longitude>" + gpsMsgInfo.getLng() + "</Longitude>\r\n");
- deviceStatusXml.append("<Latitude>" + gpsMsgInfo.getLat() + "</Latitude>\r\n");
- deviceStatusXml.append("<Speed>" + gpsMsgInfo.getSpeed() + "</Speed>\r\n");
- deviceStatusXml.append("<Direction>" + gpsMsgInfo.getDirection() + "</Direction>\r\n");
- deviceStatusXml.append("<Altitude>" + gpsMsgInfo.getAltitude() + "</Altitude>\r\n");
- deviceStatusXml.append("</Notify>\r\n");
+ deviceStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n")
+ .append("<Notify>\r\n")
+ .append("<CmdType>MobilePosition</CmdType>\r\n")
+ .append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n")
+ .append("<DeviceID>" + gpsMsgInfo.getId() + "</DeviceID>\r\n")
+ .append("<Time>" + gpsMsgInfo.getTime() + "</Time>\r\n")
+ .append("<Longitude>" + gpsMsgInfo.getLng() + "</Longitude>\r\n")
+ .append("<Latitude>" + gpsMsgInfo.getLat() + "</Latitude>\r\n")
+ .append("<Speed>" + gpsMsgInfo.getSpeed() + "</Speed>\r\n")
+ .append("<Direction>" + gpsMsgInfo.getDirection() + "</Direction>\r\n")
+ .append("<Altitude>" + gpsMsgInfo.getAltitude() + "</Altitude>\r\n")
+ .append("</Notify>\r\n");
sendNotify(parentPlatform, deviceStatusXml.toString(), subscribeInfo, eventResult -> {
logger.error("鍙戦�丯OTIFY閫氱煡娑堟伅澶辫触銆傞敊璇細{} {}", eventResult.statusCode, eventResult.msg);
@@ -348,21 +427,21 @@
deviceAlarm.getLongitude(), deviceAlarm.getLatitude(), JSON.toJSONString(deviceAlarm));
String characterSet = parentPlatform.getCharacterSet();
StringBuffer deviceStatusXml = new StringBuffer(600);
- deviceStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
- deviceStatusXml.append("<Notify>\r\n");
- deviceStatusXml.append("<CmdType>Alarm</CmdType>\r\n");
- deviceStatusXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
- deviceStatusXml.append("<DeviceID>" + deviceAlarm.getChannelId() + "</DeviceID>\r\n");
- deviceStatusXml.append("<AlarmPriority>" + deviceAlarm.getAlarmPriority() + "</AlarmPriority>\r\n");
- deviceStatusXml.append("<AlarmMethod>" + deviceAlarm.getAlarmMethod() + "</AlarmMethod>\r\n");
- deviceStatusXml.append("<AlarmTime>" + deviceAlarm.getAlarmTime() + "</AlarmTime>\r\n");
- deviceStatusXml.append("<AlarmDescription>" + deviceAlarm.getAlarmDescription() + "</AlarmDescription>\r\n");
- deviceStatusXml.append("<Longitude>" + deviceAlarm.getLongitude() + "</Longitude>\r\n");
- deviceStatusXml.append("<Latitude>" + deviceAlarm.getLatitude() + "</Latitude>\r\n");
- deviceStatusXml.append("<info>\r\n");
- deviceStatusXml.append("<AlarmType>" + deviceAlarm.getAlarmType() + "</AlarmType>\r\n");
- deviceStatusXml.append("</info>\r\n");
- deviceStatusXml.append("</Notify>\r\n");
+ deviceStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n")
+ .append("<Notify>\r\n")
+ .append("<CmdType>Alarm</CmdType>\r\n")
+ .append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n")
+ .append("<DeviceID>" + deviceAlarm.getChannelId() + "</DeviceID>\r\n")
+ .append("<AlarmPriority>" + deviceAlarm.getAlarmPriority() + "</AlarmPriority>\r\n")
+ .append("<AlarmMethod>" + deviceAlarm.getAlarmMethod() + "</AlarmMethod>\r\n")
+ .append("<AlarmTime>" + deviceAlarm.getAlarmTime() + "</AlarmTime>\r\n")
+ .append("<AlarmDescription>" + deviceAlarm.getAlarmDescription() + "</AlarmDescription>\r\n")
+ .append("<Longitude>" + deviceAlarm.getLongitude() + "</Longitude>\r\n")
+ .append("<Latitude>" + deviceAlarm.getLatitude() + "</Latitude>\r\n")
+ .append("<info>\r\n")
+ .append("<AlarmType>" + deviceAlarm.getAlarmType() + "</AlarmType>\r\n")
+ .append("</info>\r\n")
+ .append("</Notify>\r\n");
CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
@@ -421,13 +500,13 @@
StringBuffer catalogXml = new StringBuffer(600);
String characterSet = parentPlatform.getCharacterSet();
- catalogXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
- catalogXml.append("<Notify>\r\n");
- catalogXml.append("<CmdType>Catalog</CmdType>\r\n");
- catalogXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
- catalogXml.append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n");
- catalogXml.append("<SumNum>1</SumNum>\r\n");
- catalogXml.append("<DeviceList Num=\"" + channels.size() + "\">\r\n");
+ catalogXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n")
+ .append("<Notify>\r\n")
+ .append("<CmdType>Catalog</CmdType>\r\n")
+ .append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n")
+ .append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n")
+ .append("<SumNum>1</SumNum>\r\n")
+ .append("<DeviceList Num=\"" + channels.size() + "\">\r\n");
if (channels.size() > 0) {
for (DeviceChannel channel : channels) {
if (parentPlatform.getServerGBId().equals(channel.getParentId())) {
@@ -448,16 +527,16 @@
catalogXml.append("<Parental>" + channel.getParental() + "</Parental>\r\n");
if (channel.getParental() == 0) {
// 閫氶亾椤�
- catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n");
- catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
- catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
- catalogXml.append("<Status>" + (channel.getStatus() == 0 ? "OFF" : "ON") + "</Status>\r\n");
+ catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n")
+ .append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n")
+ .append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n")
+ .append("<Status>" + (channel.getStatus() == 0 ? "OFF" : "ON") + "</Status>\r\n");
if (channel.getChannelType() != 2) { // 涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝 涓嶈缃互涓嬪睘鎬�
- catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n");
- catalogXml.append("<Owner> " + channel.getOwner()+ "</Owner>\r\n");
- catalogXml.append("<CivilCode>" + channel.getCivilCode() + "</CivilCode>\r\n");
- catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
+ catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n")
+ .append("<Owner> " + channel.getOwner()+ "</Owner>\r\n")
+ .append("<CivilCode>" + channel.getCivilCode() + "</CivilCode>\r\n")
+ .append("<Address>" + channel.getAddress() + "</Address>\r\n");
}
if (!"presence".equals(subscribeInfo.getEventType())) {
catalogXml.append("<Event>" + type + "</Event>\r\n");
@@ -467,8 +546,8 @@
catalogXml.append("</Item>\r\n");
}
}
- catalogXml.append("</DeviceList>\r\n");
- catalogXml.append("</Notify>\r\n");
+ catalogXml.append("</DeviceList>\r\n")
+ .append("</Notify>\r\n");
return catalogXml.toString();
}
@@ -514,26 +593,26 @@
String characterSet = parentPlatform.getCharacterSet();
StringBuffer catalogXml = new StringBuffer(600);
- catalogXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
- catalogXml.append("<Notify>\r\n");
- catalogXml.append("<CmdType>Catalog</CmdType>\r\n");
- catalogXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
- catalogXml.append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n");
- catalogXml.append("<SumNum>1</SumNum>\r\n");
- catalogXml.append("<DeviceList Num=\" " + channels.size() + " \">\r\n");
+ catalogXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n")
+ .append("<Notify>\r\n")
+ .append("<CmdType>Catalog</CmdType>\r\n")
+ .append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n")
+ .append("<DeviceID>" + parentPlatform.getDeviceGBId() + "</DeviceID>\r\n")
+ .append("<SumNum>1</SumNum>\r\n")
+ .append("<DeviceList Num=\" " + channels.size() + " \">\r\n");
if (channels.size() > 0) {
for (DeviceChannel channel : channels) {
if (parentPlatform.getServerGBId().equals(channel.getParentId())) {
channel.setParentId(parentPlatform.getDeviceGBId());
}
- catalogXml.append("<Item>\r\n");
- catalogXml.append("<DeviceID>" + channel.getChannelId() + "</DeviceID>\r\n");
- catalogXml.append("<Event>" + type + "</Event>\r\n");
- catalogXml.append("</Item>\r\n");
+ catalogXml.append("<Item>\r\n")
+ .append("<DeviceID>" + channel.getChannelId() + "</DeviceID>\r\n")
+ .append("<Event>" + type + "</Event>\r\n")
+ .append("</Item>\r\n");
}
}
- catalogXml.append("</DeviceList>\r\n");
- catalogXml.append("</Notify>\r\n");
+ catalogXml.append("</DeviceList>\r\n")
+ .append("</Notify>\r\n");
return catalogXml.toString();
}
@Override
@@ -543,12 +622,12 @@
}
String characterSet = parentPlatform.getCharacterSet();
StringBuffer recordXml = new StringBuffer(600);
- recordXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
- recordXml.append("<Response>\r\n");
- recordXml.append("<CmdType>RecordInfo</CmdType>\r\n");
- recordXml.append("<SN>" +recordInfo.getSn() + "</SN>\r\n");
- recordXml.append("<DeviceID>" + recordInfo.getDeviceId() + "</DeviceID>\r\n");
- recordXml.append("<SumNum>" + recordInfo.getSumNum() + "</SumNum>\r\n");
+ recordXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n")
+ .append("<Response>\r\n")
+ .append("<CmdType>RecordInfo</CmdType>\r\n")
+ .append("<SN>" +recordInfo.getSn() + "</SN>\r\n")
+ .append("<DeviceID>" + recordInfo.getDeviceId() + "</DeviceID>\r\n")
+ .append("<SumNum>" + recordInfo.getSumNum() + "</SumNum>\r\n");
if (recordInfo.getRecordList() == null ) {
recordXml.append("<RecordList Num=\"0\">\r\n");
}else {
@@ -557,12 +636,12 @@
for (RecordItem recordItem : recordInfo.getRecordList()) {
recordXml.append("<Item>\r\n");
if (deviceChannel != null) {
- recordXml.append("<DeviceID>" + recordItem.getDeviceId() + "</DeviceID>\r\n");
- recordXml.append("<Name>" + recordItem.getName() + "</Name>\r\n");
- recordXml.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(recordItem.getStartTime()) + "</StartTime>\r\n");
- recordXml.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(recordItem.getEndTime()) + "</EndTime>\r\n");
- recordXml.append("<Secrecy>" + recordItem.getSecrecy() + "</Secrecy>\r\n");
- recordXml.append("<Type>" + recordItem.getType() + "</Type>\r\n");
+ recordXml.append("<DeviceID>" + recordItem.getDeviceId() + "</DeviceID>\r\n")
+ .append("<Name>" + recordItem.getName() + "</Name>\r\n")
+ .append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(recordItem.getStartTime()) + "</StartTime>\r\n")
+ .append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(recordItem.getEndTime()) + "</EndTime>\r\n")
+ .append("<Secrecy>" + recordItem.getSecrecy() + "</Secrecy>\r\n")
+ .append("<Type>" + recordItem.getType() + "</Type>\r\n");
if (!ObjectUtils.isEmpty(recordItem.getFileSize())) {
recordXml.append("<FileSize>" + recordItem.getFileSize() + "</FileSize>\r\n");
}
@@ -575,8 +654,8 @@
}
}
- recordXml.append("</RecordList>\r\n");
- recordXml.append("</Response>\r\n");
+ recordXml.append("</RecordList>\r\n")
+ .append("</Response>\r\n");
// callid
CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
@@ -595,13 +674,13 @@
String characterSet = parentPlatform.getCharacterSet();
StringBuffer mediaStatusXml = new StringBuffer(200);
- mediaStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
- mediaStatusXml.append("<Notify>\r\n");
- mediaStatusXml.append("<CmdType>MediaStatus</CmdType>\r\n");
- mediaStatusXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
- mediaStatusXml.append("<DeviceID>" + sendRtpItem.getChannelId() + "</DeviceID>\r\n");
- mediaStatusXml.append("<NotifyType>121</NotifyType>\r\n");
- mediaStatusXml.append("</Notify>\r\n");
+ mediaStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n")
+ .append("<Notify>\r\n")
+ .append("<CmdType>MediaStatus</CmdType>\r\n")
+ .append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n")
+ .append("<DeviceID>" + sendRtpItem.getChannelId() + "</DeviceID>\r\n")
+ .append("<NotifyType>121</NotifyType>\r\n")
+ .append("</Notify>\r\n");
SIPRequest messageRequest = (SIPRequest)headerProviderPlatformProvider.createMessageRequest(parentPlatform, mediaStatusXml.toString(),
sendRtpItem);
@@ -622,26 +701,129 @@
}
@Override
- public void streamByeCmd(ParentPlatform parentPlatform, SendRtpItem sendRtpItem) throws SipException, InvalidArgumentException, ParseException {
+ public synchronized void streamByeCmd(ParentPlatform platform, SendRtpItem sendRtpItem) throws SipException, InvalidArgumentException, ParseException {
if (sendRtpItem == null ) {
logger.info("[鍚戜笂绾у彂閫丅YE]锛� sendRtpItem 涓篘ULL");
return;
}
- if (parentPlatform == null) {
+ if (platform == null) {
logger.info("[鍚戜笂绾у彂閫丅YE]锛� platform 涓篘ULL");
return;
}
- logger.info("[鍚戜笂绾у彂閫丅YE]锛� {}/{}", parentPlatform.getServerGBId(), sendRtpItem.getChannelId());
+ logger.info("[鍚戜笂绾у彂閫丅YE]锛� {}/{}", platform.getServerGBId(), sendRtpItem.getChannelId());
String mediaServerId = sendRtpItem.getMediaServerId();
MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
if (mediaServerItem != null) {
mediaServerService.releaseSsrc(mediaServerItem.getId(), sendRtpItem.getSsrc());
- zlmrtpServerFactory.closeRtpServer(mediaServerItem, sendRtpItem.getStreamId());
+ zlmrtpServerFactory.closeRtpServer(mediaServerItem, sendRtpItem.getStream());
}
- SIPRequest byeRequest = headerProviderPlatformProvider.createByeRequest(parentPlatform, sendRtpItem);
+ SIPRequest byeRequest = headerProviderPlatformProvider.createByeRequest(platform, sendRtpItem);
if (byeRequest == null) {
logger.warn("[鍚戜笂绾у彂閫乥ye]锛氭棤娉曞垱寤� byeRequest");
}
- sipSender.transmitRequest(parentPlatform.getDeviceIp(),byeRequest);
+ sipSender.transmitRequest(platform.getDeviceIp(),byeRequest);
+ }
+
+ @Override
+ public void streamByeCmd(ParentPlatform platform, String channelId, String stream, String callId, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException, SsrcTransactionNotFoundException {
+ SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(platform.getServerGBId(), channelId, callId, stream);
+ if (ssrcTransaction == null) {
+ throw new SsrcTransactionNotFoundException(platform.getServerGBId(), channelId, callId, stream);
+ }
+
+ mediaServerService.releaseSsrc(ssrcTransaction.getMediaServerId(), ssrcTransaction.getSsrc());
+ mediaServerService.closeRTPServer(ssrcTransaction.getMediaServerId(), ssrcTransaction.getStream());
+ streamSession.remove(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
+
+ Request byteRequest = headerProviderPlatformProvider.createByteRequest(platform, channelId, ssrcTransaction.getSipTransactionInfo());
+ sipSender.transmitRequest(sipLayer.getLocalIp(platform.getDeviceIp()), byteRequest, null, okEvent);
+ }
+
+ @Override
+ public void broadcastResultCmd(ParentPlatform platform, DeviceChannel deviceChannel, String sn, boolean result, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {
+ if (platform == null || deviceChannel == null) {
+ return;
+ }
+ String characterSet = platform.getCharacterSet();
+ StringBuffer mediaStatusXml = new StringBuffer(200);
+ mediaStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
+ mediaStatusXml.append("<Response>\r\n");
+ mediaStatusXml.append("<CmdType>Broadcast</CmdType>\r\n");
+ mediaStatusXml.append("<SN>" + sn + "</SN>\r\n");
+ mediaStatusXml.append("<DeviceID>" + deviceChannel.getChannelId() + "</DeviceID>\r\n");
+ mediaStatusXml.append("<Result>" + (result?"OK":"ERROR") + "</Result>\r\n");
+ mediaStatusXml.append("</Response>\r\n");
+
+ CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(platform.getDeviceIp(), platform.getTransport());
+
+ SIPRequest messageRequest = (SIPRequest)headerProviderPlatformProvider.createMessageRequest(platform, mediaStatusXml.toString(),
+ SipUtils.getNewFromTag(), SipUtils.getNewViaTag(), callIdHeader);
+
+ sipSender.transmitRequest(platform.getDeviceIp(),messageRequest, errorEvent, okEvent);
+ }
+
+ @Override
+ public void broadcastInviteCmd(ParentPlatform platform, String channelId, MediaServerItem mediaServerItem,
+ SSRCInfo ssrcInfo, ZlmHttpHookSubscribe.Event event, SipSubscribe.Event okEvent,
+ SipSubscribe.Event errorEvent) throws ParseException, SipException, InvalidArgumentException {
+ String stream = ssrcInfo.getStream();
+
+ if (platform == null) {
+ return;
+ }
+
+ logger.info("{} 鍒嗛厤鐨刏LM涓�: {} [{}:{}]", stream, mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());
+ 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);
+ subscribe.removeSubscribe(hookSubscribe);
+ }
+ });
+ String sdpIp = mediaServerItem.getSdpIp();
+
+ StringBuffer content = new StringBuffer(200);
+ content.append("v=0\r\n");
+ content.append("o=" + channelId + " 0 0 IN IP4 " + sdpIp + "\r\n");
+ content.append("s=Play\r\n");
+ content.append("c=IN IP4 " + sdpIp + "\r\n");
+ content.append("t=0 0\r\n");
+
+ if ("TCP-PASSIVE".equalsIgnoreCase(userSetting.getBroadcastForPlatform())) {
+ content.append("m=audio " + ssrcInfo.getPort() + " TCP/RTP/AVP 8 96\r\n");
+ } else if ("TCP-ACTIVE".equalsIgnoreCase(userSetting.getBroadcastForPlatform())) {
+ content.append("m=audio " + ssrcInfo.getPort() + " TCP/RTP/AVP 8 96\r\n");
+ } else if ("UDP".equalsIgnoreCase(userSetting.getBroadcastForPlatform())) {
+ content.append("m=audio " + ssrcInfo.getPort() + " RTP/AVP 8 96\r\n");
+ }
+
+ content.append("a=recvonly\r\n");
+ content.append("a=rtpmap:8 PCMA/8000\r\n");
+ content.append("a=rtpmap:96 PS/90000\r\n");
+ if ("TCP-PASSIVE".equalsIgnoreCase(userSetting.getBroadcastForPlatform())) {
+ content.append("a=setup:passive\r\n");
+ content.append("a=connection:new\r\n");
+ }else if ("TCP-ACTIVE".equalsIgnoreCase(userSetting.getBroadcastForPlatform())) {
+ content.append("a=setup:active\r\n");
+ content.append("a=connection:new\r\n");
+ }
+
+ content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc
+ CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(sipLayer.getLocalIp(platform.getDeviceIp()), platform.getTransport());
+
+ Request request = headerProviderPlatformProvider.createInviteRequest(platform, channelId,
+ content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), ssrcInfo.getSsrc(),
+ callIdHeader);
+ sipSender.transmitRequest(sipLayer.getLocalIp(platform.getDeviceIp()), request, (e -> {
+ streamSession.remove(platform.getServerGBId(), channelId, ssrcInfo.getStream());
+ mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+ subscribe.removeSubscribe(hookSubscribe);
+ errorEvent.response(e);
+ }), e -> {
+ ResponseEvent responseEvent = (ResponseEvent) e.event;
+ SIPResponse response = (SIPResponse) responseEvent.getResponse();
+ streamSession.put(platform.getServerGBId(), channelId, callIdHeader.getCallId(), stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.broadcast);
+ okEvent.response(e);
+ });
}
}
--
Gitblit v1.8.0