From 69d9692f6194d1e03ec81cf87ea8f0e7a62f7173 Mon Sep 17 00:00:00 2001
From: wangyimeng <421132955@qq.com>
Date: 星期三, 16 三月 2022 15:27:12 +0800
Subject: [PATCH] 删除重复字段
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java | 196 +++++++++++++++++++++++++++++++++----------------
1 files changed, 132 insertions(+), 64 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 b55b044..6f1d031 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
@@ -13,6 +13,7 @@
import com.genersoft.iot.vmp.utils.SerializeUtils;
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.SIPDialog;
import org.slf4j.Logger;
@@ -27,9 +28,7 @@
import javax.sip.*;
import javax.sip.address.SipURI;
-import javax.sip.header.CallIdHeader;
-import javax.sip.header.ViaHeader;
-import javax.sip.header.WWWAuthenticateHeader;
+import javax.sip.header.*;
import javax.sip.message.Request;
import java.lang.reflect.Field;
import java.text.ParseException;
@@ -68,6 +67,9 @@
@Qualifier(value="udpSipProvider")
private SipProviderImpl udpSipProvider;
+ @Autowired
+ private SipFactory sipFactory;
+
@Override
public boolean register(ParentPlatform parentPlatform, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) {
return register(parentPlatform, null, null, errorEvent, okEvent, false);
@@ -76,11 +78,11 @@
@Override
public boolean unregister(ParentPlatform parentPlatform, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) {
ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId());
+ parentPlatform.setExpires("0");
if (parentPlatformCatch != null) {
parentPlatformCatch.setParentPlatform(parentPlatform);
redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
}
- parentPlatform.setExpires("0");
return register(parentPlatform, null, null, errorEvent, okEvent, false);
}
@@ -88,7 +90,7 @@
public boolean register(ParentPlatform parentPlatform, @Nullable String callId, @Nullable WWWAuthenticateHeader www,
SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent, boolean registerAgain) {
try {
- Request request = null;
+ Request request;
String tm = Long.toString(System.currentTimeMillis());
if (!registerAgain ) {
// //callid
@@ -100,7 +102,9 @@
callIdHeader = udpSipProvider.getNewCallId();
}
- request = headerProviderPlarformProvider.createRegisterRequest(parentPlatform, redisCatchStorage.getCSEQ(Request.REGISTER), "FromRegister" + tm, null, callIdHeader);
+ request = headerProviderPlarformProvider.createRegisterRequest(parentPlatform,
+ redisCatchStorage.getCSEQ(Request.REGISTER), "FromRegister" + tm,
+ "z9hG4bK-" + UUID.randomUUID().toString().replace("-", ""), callIdHeader);
// 灏� callid 鍐欏叆缂撳瓨锛� 绛夋敞鍐屾垚鍔熷彲浠ユ洿鏂扮姸鎬�
String callIdFromHeader = callIdHeader.getCallId();
redisCatchStorage.updatePlatformRegisterInfo(callIdFromHeader, parentPlatform.getServerGBId());
@@ -364,16 +368,18 @@
: udpSipProvider.getNewCallId();
callIdHeader.setCallId(subscribeInfo.getCallId());
- String tm = Long.toString(System.currentTimeMillis());
+//
+ sendNotify(parentPlatform, deviceStatusXml.toString(), subscribeInfo, eventResult -> {
+ logger.error("鍙戦�丯OTIFY閫氱煡娑堟伅澶辫触銆傞敊璇細{} {}", eventResult.statusCode, eventResult.msg);
+ }, null);
- Request request = headerProviderPlarformProvider.createNotifyRequest(parentPlatform,
- deviceStatusXml.toString(),callIdHeader,
- "z9hG4bK-" + UUID.randomUUID().toString().replace("-", ""), subscribeInfo);
- transmitRequest(parentPlatform, request);
-
- } catch (SipException | ParseException | InvalidArgumentException e) {
+ } catch (SipException | ParseException e) {
e.printStackTrace();
return false;
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
}
return true;
}
@@ -386,36 +392,90 @@
if (index == null) {
index = 0;
}
-
+ if (index >= deviceChannels.size()) {
+ return true;
+ }
try {
- if (index > deviceChannels.size() - 1) {
- return true;
- }
- Request request = getCatalogNotifyRequestForCatalogAddOrUpdate(parentPlatform, deviceChannels.get(index), deviceChannels.size(), type, subscribeInfo);
- index += 1;
Integer finalIndex = index;
- transmitRequest(parentPlatform, request, null, (eventResult -> {
- sendNotifyForCatalogAddOrUpdate(type, parentPlatform, deviceChannels, subscribeInfo, finalIndex);
+ String catalogXmlContent = getCatalogXmlContentForCatalogAddOrUpdate(parentPlatform, deviceChannels.get(index ), deviceChannels.size(), type, subscribeInfo);
+ sendNotify(parentPlatform, catalogXmlContent, subscribeInfo, eventResult -> {
+ logger.error("鍙戦�丯OTIFY閫氱煡娑堟伅澶辫触銆傞敊璇細{} {}", eventResult.statusCode, eventResult.msg);
+ }, (eventResult -> {
+ sendNotifyForCatalogAddOrUpdate(type, parentPlatform, deviceChannels, subscribeInfo, finalIndex + 1);
}));
- } catch (SipException | ParseException | InvalidArgumentException e) {
+ } catch (SipException | ParseException e) {
e.printStackTrace();
return false;
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
}
return true;
}
- private Request getCatalogNotifyRequestForCatalogAddOrUpdate(ParentPlatform parentPlatform, DeviceChannel channel, int size, String type,
- SubscribeInfo subscribeInfo) throws ParseException, InvalidArgumentException,
- PeerUnavailableException {
- String catalogXmlContent = getCatalogXmlContentForCatalogAddOrUpdate(parentPlatform, channel, size, type, subscribeInfo);
+ private void sendNotify(ParentPlatform parentPlatform, String catalogXmlContent,
+ SubscribeInfo subscribeInfo, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent )
+ throws NoSuchFieldException, IllegalAccessException, SipException, ParseException {
+ MessageFactoryImpl messageFactory = (MessageFactoryImpl) sipFactory.createMessageFactory();
+ // 璁剧疆缂栫爜锛� 闃叉涓枃涔辩爜
+ messageFactory.setDefaultContentEncodingCharset("gb2312");
+ Dialog dialog = subscribeInfo.getDialog();
+ if (dialog == null) return;
+ SIPRequest notifyRequest = (SIPRequest)dialog.createRequest(Request.NOTIFY);
+ ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
+ notifyRequest.setContent(catalogXmlContent, contentTypeHeader);
- CallIdHeader callIdHeader = parentPlatform.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
- : udpSipProvider.getNewCallId();
- callIdHeader.setCallId(subscribeInfo.getCallId());
- Request request = headerProviderPlarformProvider.createNotifyRequest(parentPlatform, catalogXmlContent,
- callIdHeader, "z9hG4bK-" + UUID.randomUUID().toString().replace("-", ""), subscribeInfo);
- return request;
+ 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();
+ SIPRequest request = (SIPRequest) subscribeInfo.getTransaction().getRequest();
+ sipURI.setHost(request.getRemoteAddress().getHostName());
+ sipURI.setPort(request.getRemotePort());
+ ClientTransaction transaction = null;
+ if ("TCP".equals(parentPlatform.getTransport())) {
+ transaction = tcpSipProvider.getNewClientTransaction(notifyRequest);
+ } else if ("UDP".equals(parentPlatform.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("骞冲彴{}鐨凾ransport閿欒锛歿}",parentPlatform.getServerGBId(), parentPlatform.getTransport());
+ return;
+ }
+ dialog.sendRequest(transaction);
+
}
+
+// private Request getCatalogNotifyRequestForCatalogAddOrUpdate(ParentPlatform parentPlatform, DeviceChannel channel, int size, String type,
+// SubscribeInfo subscribeInfo) throws ParseException, InvalidArgumentException,
+// PeerUnavailableException, NoSuchFieldException, IllegalAccessException {
+// String catalogXmlContent = getCatalogXmlContentForCatalogAddOrUpdate(parentPlatform, channel, size, type, subscribeInfo);
+//
+// CallIdHeader callIdHeader = parentPlatform.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
+// : udpSipProvider.getNewCallId();
+// callIdHeader.setCallId(subscribeInfo.getCallId());
+// String tm = Long.toString(System.currentTimeMillis());
+//
+// Request request = headerProviderPlarformProvider.createNotifyRequest(parentPlatform, catalogXmlContent,
+// callIdHeader, "z9hG4bK-" + UUID.randomUUID().toString().replace("-", ""),"FromRegister" + tm, subscribeInfo);
+// return request;
+// }
private String getCatalogXmlContentForCatalogAddOrUpdate(ParentPlatform parentPlatform, DeviceChannel channel, int sumNum, String type, SubscribeInfo subscribeInfo) {
StringBuffer catalogXml = new StringBuffer(600);
@@ -454,7 +514,8 @@
}
@Override
- public boolean sendNotifyForCatalogOther(String type, ParentPlatform parentPlatform, List<DeviceChannel> deviceChannels, SubscribeInfo subscribeInfo, Integer index) {
+ public boolean sendNotifyForCatalogOther(String type, ParentPlatform parentPlatform, List<DeviceChannel> deviceChannels,
+ SubscribeInfo subscribeInfo, Integer index) {
if (parentPlatform == null
|| deviceChannels == null
|| deviceChannels.size() == 0
@@ -465,34 +526,31 @@
if (index == null) {
index = 0;
}
-
- if (index > deviceChannels.size() - 1) {
+ if (index >= deviceChannels.size()) {
return true;
}
try {
- String catalogXml = getCatalogXmlContentForCatalogOther(deviceChannels.get(index), type, parentPlatform);
- CallIdHeader callIdHeader = parentPlatform.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
- : udpSipProvider.getNewCallId();
- Request request = headerProviderPlarformProvider.createNotifyRequest(parentPlatform, catalogXml,
- callIdHeader,
- "z9hG4bK-" + UUID.randomUUID().toString().replace("-", ""), subscribeInfo);
- index += 1;
Integer finalIndex = index;
- transmitRequest(parentPlatform, request, null, eventResult -> {
- sendNotifyForCatalogOther(type, parentPlatform, deviceChannels, subscribeInfo, finalIndex);
- });
+ String catalogXmlContent = getCatalogXmlContentForCatalogOther(parentPlatform, deviceChannels.get(index), type);
+ sendNotify(parentPlatform, catalogXmlContent, subscribeInfo, eventResult -> {
+ logger.error("鍙戦�丯OTIFY閫氱煡娑堟伅澶辫触銆傞敊璇細{} {}", eventResult.statusCode, eventResult.msg);
+ }, (eventResult -> {
+ sendNotifyForCatalogOther(type, parentPlatform, deviceChannels, subscribeInfo, finalIndex + 1);
+ }));
} catch (SipException e) {
e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
} catch (ParseException e) {
+ e.printStackTrace();
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
e.printStackTrace();
}
return true;
}
- private String getCatalogXmlContentForCatalogOther(DeviceChannel channel, String type, ParentPlatform parentPlatform) {
+ private String getCatalogXmlContentForCatalogOther(ParentPlatform parentPlatform, DeviceChannel channel, String type) {
if (parentPlatform.getServerGBId().equals(channel.getParentId())) {
channel.setParentId(parentPlatform.getDeviceGBId());
}
@@ -525,24 +583,30 @@
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("<RecordList Num=\"" + recordInfo.getRecordList().size()+"\">\r\n");
- 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");
- if (!StringUtils.isEmpty(recordItem.getFileSize())) {
- recordXml.append("<FileSize>" + recordItem.getFileSize() + "</FileSize>\r\n");
- }
- if (!StringUtils.isEmpty(recordItem.getFilePath())) {
- recordXml.append("<FilePath>" + recordItem.getFilePath() + "</FilePath>\r\n");
+ if (recordInfo.getRecordList() == null ) {
+ recordXml.append("<RecordList Num=\"0\">\r\n");
+ }else {
+ recordXml.append("<RecordList Num=\"" + recordInfo.getRecordList().size()+"\">\r\n");
+ if (recordInfo.getRecordList().size() > 0) {
+ 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");
+ if (!StringUtils.isEmpty(recordItem.getFileSize())) {
+ recordXml.append("<FileSize>" + recordItem.getFileSize() + "</FileSize>\r\n");
+ }
+ if (!StringUtils.isEmpty(recordItem.getFilePath())) {
+ recordXml.append("<FilePath>" + recordItem.getFilePath() + "</FilePath>\r\n");
+ }
+ }
+ recordXml.append("</Item>\r\n");
}
}
- recordXml.append("</Item>\r\n");
}
recordXml.append("</RecordList>\r\n");
@@ -563,6 +627,9 @@
@Override
public void streamByeCmd(ParentPlatform platform, String callId) {
+ if (platform == null) {
+ return;
+ }
SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(platform.getServerGBId(), null, null, callId);
if (sendRtpItem != null) {
String mediaServerId = sendRtpItem.getMediaServerId();
@@ -591,6 +658,7 @@
byte[] transactionByteArray = sendRtpItem.getTransaction();
ClientTransaction clientTransaction = (ClientTransaction) SerializeUtils.deSerialize(transactionByteArray);
Request byeRequest = dialog.createRequest(Request.BYE);
+
SipURI byeURI = (SipURI) byeRequest.getRequestURI();
SIPRequest request = (SIPRequest) clientTransaction.getRequest();
byeURI.setHost(request.getRemoteAddress().getHostName());
--
Gitblit v1.8.0