From 985082d33930868c3cc1723f28fd9aaae9013a8f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 16 八月 2023 09:11:22 +0800
Subject: [PATCH] 添加缺少的内容
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java | 521 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 352 insertions(+), 169 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
old mode 100644
new mode 100755
index 620f0ff..06a08e2
--- 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
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;
import com.alibaba.fastjson2.JSON;
+import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.gb28181.SipLayer;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
@@ -8,13 +9,14 @@
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.media.zlm.ZLMRTPServerFactory;
+import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
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.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.utils.GitUtil;
import gov.nist.javax.sip.message.MessageFactoryImpl;
import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
@@ -27,6 +29,7 @@
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
+import javax.sip.SipFactory;
import javax.sip.header.CallIdHeader;
import javax.sip.header.WWWAuthenticateHeader;
import javax.sip.message.Request;
@@ -53,7 +56,7 @@
private SipSubscribe sipSubscribe;
@Autowired
- private ZLMRTPServerFactory zlmrtpServerFactory;
+ private ZLMServerFactory zlmServerFactory;
@Autowired
private SipLayer sipLayer;
@@ -61,26 +64,52 @@
@Autowired
private SIPSender sipSender;
+ @Autowired
+ private DynamicTask dynamicTask;
+
+ @Autowired
+ private GitUtil gitUtil;
+
@Override
public void register(ParentPlatform parentPlatform, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) throws InvalidArgumentException, ParseException, SipException {
- register(parentPlatform, null, null, errorEvent, okEvent, false, true);
+ register(parentPlatform, null, null, errorEvent, okEvent, true);
}
@Override
- public void unregister(ParentPlatform parentPlatform, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) throws InvalidArgumentException, ParseException, SipException {
- register(parentPlatform, null, null, errorEvent, okEvent, false, false);
+ public void register(ParentPlatform parentPlatform, SipTransactionInfo sipTransactionInfo, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) throws InvalidArgumentException, ParseException, SipException {
+
+ register(parentPlatform, sipTransactionInfo, null, errorEvent, okEvent, true);
}
@Override
- public void register(ParentPlatform parentPlatform, @Nullable String callId, @Nullable WWWAuthenticateHeader www,
- SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent, boolean registerAgain, boolean isRegister) throws SipException, InvalidArgumentException, ParseException {
+ public void unregister(ParentPlatform parentPlatform, SipTransactionInfo sipTransactionInfo, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) throws InvalidArgumentException, ParseException, SipException {
+ register(parentPlatform, sipTransactionInfo, null, errorEvent, okEvent, false);
+ }
+
+ @Override
+ public void register(ParentPlatform parentPlatform, @Nullable SipTransactionInfo sipTransactionInfo, @Nullable WWWAuthenticateHeader www,
+ SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent, boolean isRegister) throws SipException, InvalidArgumentException, ParseException {
Request request;
- if (!registerAgain ) {
- CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
+ CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
+ String fromTag = SipUtils.getNewFromTag();
+ String toTag = null;
+ if (sipTransactionInfo != null ) {
+ if (sipTransactionInfo.getCallId() != null) {
+ callIdHeader.setCallId(sipTransactionInfo.getCallId());
+ }
+ if (sipTransactionInfo.getFromTag() != null) {
+ fromTag = sipTransactionInfo.getFromTag();
+ }
+ if (sipTransactionInfo.getToTag() != null) {
+ toTag = sipTransactionInfo.getToTag();
+ }
+ }
+
+ if (www == null ) {
request = headerProviderPlatformProvider.createRegisterRequest(parentPlatform,
- redisCatchStorage.getCSEQ(), SipUtils.getNewFromTag(),
- SipUtils.getNewViaTag(), callIdHeader, isRegister);
+ redisCatchStorage.getCSEQ(), fromTag,
+ toTag, callIdHeader, isRegister? parentPlatform.getExpires() : 0);
// 灏� callid 鍐欏叆缂撳瓨锛� 绛夋敞鍐屾垚鍔熷彲浠ユ洿鏂扮姸鎬�
String callIdFromHeader = callIdHeader.getCallId();
redisCatchStorage.updatePlatformRegisterInfo(callIdFromHeader, PlatformRegisterInfo.getInstance(parentPlatform.getServerGBId(), isRegister));
@@ -98,8 +127,7 @@
});
}else {
- CallIdHeader callIdHeader = sipSender.getNewCallIdHeader(parentPlatform.getDeviceIp(),parentPlatform.getTransport());
- request = headerProviderPlatformProvider.createRegisterRequest(parentPlatform, SipUtils.getNewFromTag(), null, callId, www, callIdHeader, isRegister);
+ request = headerProviderPlatformProvider.createRegisterRequest(parentPlatform, fromTag, toTag, www, callIdHeader, isRegister? parentPlatform.getExpires() : 0);
}
sipSender.transmitRequest(parentPlatform.getDeviceIp(), request, null, okEvent);
@@ -109,13 +137,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());
@@ -133,7 +162,6 @@
* 鍚戜笂绾у洖澶嶉�氶亾淇℃伅
* @param channel 閫氶亾淇℃伅
* @param parentPlatform 骞冲彴淇℃伅
- * @return
*/
@Override
public void catalogQuery(DeviceChannel channel, ParentPlatform parentPlatform, String sn, String fromTag, int size) throws SipException, InvalidArgumentException, ParseException {
@@ -160,18 +188,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())) {
@@ -181,39 +209,152 @@
// 琛屾斂鍖哄垝鍒嗙粍鍙渶瑕佽繖涓ら」灏卞彲浠�
catalogXml.append("<DeviceID>" + channel.getChannelId() + "</DeviceID>\r\n");
catalogXml.append("<Name>" + channel.getName() + "</Name>\r\n");
- if (channel.getParentId() != null) {
- // 涓氬姟鍒嗙粍鍔犱笂杩欎竴椤瑰嵆鍙紝鎻愰珮鍏煎鎬э紝
- catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n");
-// catalogXml.append("<ParentID>" + parentPlatform.getDeviceGBId() + "/" + channel.getParentId() + "</ParentID>\r\n");
- }
- if (channel.getChannelId().length() == 20 && Integer.parseInt(channel.getChannelId().substring(10, 13)) == 216) {
- // 铏氭嫙缁勭粐澧炲姞BusinessGroupID瀛楁
- catalogXml.append("<BusinessGroupID>" + channel.getParentId() + "</BusinessGroupID>\r\n");
- }
- if (!channel.getChannelId().equals(parentPlatform.getDeviceGBId())) {
- catalogXml.append("<Parental>" + channel.getParental() + "</Parental>\r\n");
- if (channel.getParental() == 0) {
- catalogXml.append("<Status>" + (channel.getStatus() == 0 ? "OFF" : "ON") + "</Status>\r\n");
+ if (channel.getChannelId().length() <= 8) {
+ catalogXml.append("</Item>\r\n");
+ continue;
+ }else {
+ if (channel.getChannelId().length() != 20) {
+ catalogXml.append("</Item>\r\n");
+ logger.warn("[缂栧彿闀垮害寮傚父] {} 闀垮害閿欒锛岃浣跨敤20浣嶉暱搴︾殑鍥芥爣缂栧彿,褰撳墠闀垮害锛歿}", channel.getChannelId(), channel.getChannelId().length());
+ catalogXml.append("</Item>\r\n");
+ continue;
}
- }
- 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");
- String civilCode = channel.getCivilCode() == null?parentPlatform.getAdministrativeDivision() : channel.getCivilCode();
- if (channel.getChannelType() != 2) { // 涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝 涓嶈缃互涓嬪睘鎬�
- catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n");
- catalogXml.append("<Owner>" + parentPlatform.getDeviceGBId()+ "</Owner>\r\n");
- catalogXml.append("<CivilCode>" + civilCode + "</CivilCode>\r\n");
- if (channel.getAddress() == null) {
- catalogXml.append("<Address></Address>\r\n");
- }else {
- catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
- }
+ switch (Integer.parseInt(channel.getChannelId().substring(10, 13))){
+ case 200:
+// catalogXml.append("<Manufacturer>涓夋案鍗庨��</Manufacturer>\r\n");
+// GitUtil gitUtil = SpringBeanFactory.getBean("gitUtil");
+// String model = (gitUtil == null || gitUtil.getBuildVersion() == null)?"1.0": gitUtil.getBuildVersion();
+// catalogXml.append("<Model>" + model + "</Manufacturer>\r\n");
+// catalogXml.append("<Owner>涓夋案鍗庨��</Owner>\r\n");
+ if (channel.getCivilCode() != null) {
+ catalogXml.append("<CivilCode>"+channel.getCivilCode()+"</CivilCode>\r\n");
+ }else {
+ catalogXml.append("<CivilCode></CivilCode>\r\n");
+ }
+
+ catalogXml.append("<RegisterWay>1</RegisterWay>\r\n");
+ catalogXml.append("<Secrecy>0</Secrecy>\r\n");
+ break;
+ case 215:
+ if (!ObjectUtils.isEmpty(channel.getParentId())) {
+ catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n");
+ }
+
+ break;
+ case 216:
+ if (!ObjectUtils.isEmpty(channel.getParentId())) {
+ catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n");
+ }else {
+ catalogXml.append("<ParentID></ParentID>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getBusinessGroupId())) {
+ catalogXml.append("<BusinessGroupID>" + channel.getBusinessGroupId() + "</BusinessGroupID>\r\n");
+ }else {
+ catalogXml.append("<BusinessGroupID></BusinessGroupID>\r\n");
+ }
+ break;
+ default:
+ // 閫氶亾椤�
+ if (channel.getManufacture() != null) {
+ catalogXml.append("<Manufacturer>" + channel.getManufacture() + "</Manufacturer>\r\n");
+ }else {
+ catalogXml.append("<Manufacturer></Manufacturer>\r\n");
+ }
+ if (channel.getSecrecy() != null) {
+ catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
+ }else {
+ catalogXml.append("<Secrecy></Secrecy>\r\n");
+ }
+ catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
+ if (channel.getModel() != null) {
+ catalogXml.append("<Model>" + channel.getModel() + "</Model>\r\n");
+ }else {
+ catalogXml.append("<Model></Model>\r\n");
+ }
+ if (channel.getOwner() != null) {
+ catalogXml.append("<Owner>" + channel.getOwner()+ "</Owner>\r\n");
+ }else {
+ catalogXml.append("<Owner></Owner>\r\n");
+ }
+ if (channel.getCivilCode() != null) {
+ catalogXml.append("<CivilCode>" + channel.getCivilCode() + "</CivilCode>\r\n");
+ }else {
+ catalogXml.append("<CivilCode></CivilCode>\r\n");
+ }
+ if (channel.getAddress() == null) {
+ catalogXml.append("<Address></Address>\r\n");
+ }else {
+ catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getParentId())) {
+ catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n");
+ }else {
+ catalogXml.append("<ParentID></ParentID>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getBlock())) {
+ catalogXml.append("<Block>" + channel.getBlock() + "</Block>\r\n");
+ }else {
+ catalogXml.append("<Block></Block>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getSafetyWay())) {
+ catalogXml.append("<SafetyWay>" + channel.getSafetyWay() + "</SafetyWay>\r\n");
+ }else {
+ catalogXml.append("<SafetyWay></SafetyWay>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getCertNum())) {
+ catalogXml.append("<CertNum>" + channel.getCertNum() + "</CertNum>\r\n");
+ }else {
+ catalogXml.append("<CertNum></CertNum>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getCertifiable())) {
+ catalogXml.append("<Certifiable>" + channel.getCertifiable() + "</Certifiable>\r\n");
+ }else {
+ catalogXml.append("<Certifiable></Certifiable>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getErrCode())) {
+ catalogXml.append("<ErrCode>" + channel.getErrCode() + "</ErrCode>\r\n");
+ }else {
+ catalogXml.append("<ErrCode></ErrCode>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getEndTime())) {
+ catalogXml.append("<EndTime>" + channel.getEndTime() + "</EndTime>\r\n");
+ }else {
+ catalogXml.append("<EndTime></EndTime>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getSecrecy())) {
+ catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
+ }else {
+ catalogXml.append("<Secrecy></Secrecy>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getIpAddress())) {
+ catalogXml.append("<IPAddress>" + channel.getIpAddress() + "</IPAddress>\r\n");
+ }else {
+ catalogXml.append("<IPAddress></IPAddress>\r\n");
+ }
+ catalogXml.append("<Port>" + channel.getPort() + "</Port>\r\n");
+ if (!ObjectUtils.isEmpty(channel.getPassword())) {
+ catalogXml.append("<Password>" + channel.getPassword() + "</Password>\r\n");
+ }else {
+ catalogXml.append("<Password></Password>\r\n");
+ }
+ if (!ObjectUtils.isEmpty(channel.getPTZType())) {
+ catalogXml.append("<PTZType>" + channel.getPTZType() + "</PTZType>\r\n");
+ }else {
+ catalogXml.append("<PTZType></PTZType>\r\n");
+ }
+ catalogXml.append("<Status>" + (channel.isStatus() ?"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");
+ break;
+
}
+ catalogXml.append("</Item>\r\n");
}
- catalogXml.append("</Item>\r\n");
}
}
@@ -222,7 +363,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;
}
@@ -236,15 +377,52 @@
// 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();
+
+ logger.info("[鍛戒护鍙戦�乚 鍥芥爣绾ц仈{} 鐩綍鏌ヨ鍥炲: 鍏眥}鏉★紝宸插彂閫亄}鏉�", parentPlatform.getServerGBId(),
+ channels.size(), Math.min(index + parentPlatform.getCatalogGroup(), channels.size()));
+ logger.debug(catalogXml);
+ 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);
+ }
}
/**
@@ -255,21 +433,26 @@
* @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;
}
+ String deviceId = device == null ? parentPlatform.getDeviceGBId() : device.getDeviceId();
+ String deviceName = device == null ? parentPlatform.getName() : device.getName();
+ String manufacturer = device == null ? "WVP-28181-PRO" : device.getManufacturer();
+ String model = device == null ? "platform" : device.getModel();
+ String firmware = device == null ? gitUtil.getBuildVersion() : device.getFirmware();
String characterSet = parentPlatform.getCharacterSet();
StringBuffer deviceInfoXml = new StringBuffer(600);
deviceInfoXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
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>" + deviceId + "</DeviceID>\r\n");
+ deviceInfoXml.append("<DeviceName>" + deviceName + "</DeviceName>\r\n");
+ deviceInfoXml.append("<Manufacturer>" + manufacturer + "</Manufacturer>\r\n");
+ deviceInfoXml.append("<Model>" + model + "</Model>\r\n");
+ deviceInfoXml.append("<Firmware>" + firmware + "</Firmware>\r\n");
deviceInfoXml.append("<Result>OK</Result>\r\n");
deviceInfoXml.append("</Response>\r\n");
@@ -287,22 +470,22 @@
* @return
*/
@Override
- public void deviceStatusResponse(ParentPlatform parentPlatform,String channelId, String sn, String fromTag,int status) throws SipException, InvalidArgumentException, ParseException {
+ public void deviceStatusResponse(ParentPlatform parentPlatform,String channelId, String sn, String fromTag,boolean status) throws SipException, InvalidArgumentException, ParseException {
if (parentPlatform == null) {
return ;
}
- String statusStr = (status==1)?"ONLINE":"OFFLINE";
+ String statusStr = (status)?"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>" + channelId + "</DeviceID>\r\n");
- deviceStatusXml.append("<Result>OK</Result>\r\n");
- deviceStatusXml.append("<Online>"+statusStr+"</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());
@@ -321,18 +504,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);
@@ -345,25 +528,25 @@
if (parentPlatform == null) {
return;
}
- logger.info("[鍙戦�佹姤璀﹂�氱煡] {}/{}->{},{}: {}", parentPlatform.getServerGBId(), deviceAlarm.getChannelId(),
+ logger.info("[鍙戦�佹姤璀﹂�氱煡]骞冲彴锛� {}/{}->{},{}: {}", parentPlatform.getServerGBId(), deviceAlarm.getChannelId(),
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>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(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());
@@ -408,10 +591,10 @@
private void sendNotify(ParentPlatform parentPlatform, String catalogXmlContent,
SubscribeInfo subscribeInfo, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent )
throws SipException, ParseException, InvalidArgumentException {
- MessageFactoryImpl messageFactory = (MessageFactoryImpl) sipLayer.getSipFactory().createMessageFactory();
+ MessageFactoryImpl messageFactory = (MessageFactoryImpl) SipFactory.getInstance().createMessageFactory();
String characterSet = parentPlatform.getCharacterSet();
- // 璁剧疆缂栫爜锛� 闃叉涓枃涔辩爜
- messageFactory.setDefaultContentEncodingCharset(characterSet);
+ // 璁剧疆缂栫爜锛� 闃叉涓枃涔辩爜
+ messageFactory.setDefaultContentEncodingCharset(characterSet);
SIPRequest notifyRequest = headerProviderPlatformProvider.createNotifyRequest(parentPlatform, catalogXmlContent, subscribeInfo);
@@ -422,13 +605,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())) {
@@ -449,16 +632,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.isStatus() ? "ON" : "OFF") + "</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");
@@ -468,8 +651,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();
}
@@ -515,26 +698,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
@@ -544,12 +727,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.getChannelId() + "</DeviceID>\r\n")
+ .append("<SumNum>" + recordInfo.getSumNum() + "</SumNum>\r\n");
if (recordInfo.getRecordList() == null ) {
recordXml.append("<RecordList Num=\"0\">\r\n");
}else {
@@ -558,12 +741,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");
}
@@ -576,8 +759,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());
@@ -596,13 +779,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);
@@ -637,7 +820,7 @@
MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
if (mediaServerItem != null) {
mediaServerService.releaseSsrc(mediaServerItem.getId(), sendRtpItem.getSsrc());
- zlmrtpServerFactory.closeRtpServer(mediaServerItem, sendRtpItem.getStreamId());
+ zlmServerFactory.closeRtpServer(mediaServerItem, sendRtpItem.getStreamId());
}
SIPRequest byeRequest = headerProviderPlatformProvider.createByeRequest(parentPlatform, sendRtpItem);
if (byeRequest == null) {
--
Gitblit v1.8.0