From c084d6c98af1ef4d36a61adc719df5db76589428 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 07 十月 2023 18:00:08 +0800
Subject: [PATCH] 优化国标级联心跳失败判断逻辑
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java | 292 +++++++++++++++++++++++++++++----------------------------
1 files changed, 149 insertions(+), 143 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
old mode 100644
new mode 100755
index 98a2ec2..c794fdb
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
@@ -1,143 +1,149 @@
-package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.info;
-
-import com.genersoft.iot.vmp.common.StreamInfo;
-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.SIPProcessorObserver;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
-import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import gov.nist.javax.sip.message.SIPRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import javax.sip.InvalidArgumentException;
-import javax.sip.RequestEvent;
-import javax.sip.SipException;
-import javax.sip.header.*;
-import javax.sip.message.Response;
-import java.text.ParseException;
-
-@Component
-public class InfoRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
-
- private final static Logger logger = LoggerFactory.getLogger(InfoRequestProcessor.class);
-
- private final String method = "INFO";
-
- @Autowired
- private SIPProcessorObserver sipProcessorObserver;
-
- @Autowired
- private IVideoManagerStorage storage;
-
- @Autowired
- private SipSubscribe sipSubscribe;
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
-
- @Autowired
- private IVideoManagerStorage storager;
-
- @Autowired
- private SIPCommander cmder;
-
- @Autowired
- private VideoStreamSessionManager sessionManager;
-
- @Override
- public void afterPropertiesSet() throws Exception {
- // 娣诲姞娑堟伅澶勭悊鐨勮闃�
- sipProcessorObserver.addRequestProcessor(method, this);
- }
-
- @Override
- public void process(RequestEvent evt) {
- logger.debug("鎺ユ敹鍒版秷鎭細" + evt.getRequest());
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
- // 鍏堜粠浼氳瘽鍐呮煡鎵�
- SsrcTransaction ssrcTransaction = sessionManager.getSsrcTransaction(null, null, callIdHeader.getCallId(), null);
- if (ssrcTransaction != null) { // 鍏煎娴峰悍 濯掍綋閫氱煡 娑堟伅from瀛楁涓嶆槸璁惧ID鐨勯棶棰�
- deviceId = ssrcTransaction.getDeviceId();
- }
- // 鏌ヨ璁惧鏄惁瀛樺湪
- Device device = redisCatchStorage.getDevice(deviceId);
- // 鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪
- ParentPlatform parentPlatform = storage.queryParentPlatByServerGBId(deviceId);
- try {
- if (device != null && parentPlatform != null) {
- logger.warn("[閲嶅]骞冲彴涓庤澶囩紪鍙烽噸澶嶏細{}", deviceId);
- SIPRequest request = (SIPRequest) evt.getRequest();
- String hostAddress = request.getRemoteAddress().getHostAddress();
- int remotePort = request.getRemotePort();
- if (device.getHostAddress().equals(hostAddress + ":" + remotePort)) {
- parentPlatform = null;
- }else {
- device = null;
- }
- }
- if (device == null && parentPlatform == null) {
- // 涓嶅瓨鍦ㄥ垯鍥炲404
- responseAck(evt, Response.NOT_FOUND, "device "+ deviceId +" not found");
- logger.warn("[璁惧鏈壘鍒� ]锛� {}", deviceId);
- if (sipSubscribe.getErrorSubscribe(callIdHeader.getCallId()) != null){
- SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(new DeviceNotFoundEvent(evt.getDialog()));
- sipSubscribe.getErrorSubscribe(callIdHeader.getCallId()).response(eventResult);
- };
- }else {
- ContentTypeHeader header = (ContentTypeHeader)evt.getRequest().getHeader(ContentTypeHeader.NAME);
- String contentType = header.getContentType();
- String contentSubType = header.getContentSubType();
- if ("Application".equalsIgnoreCase(contentType) && "MANSRTSP".equalsIgnoreCase(contentSubType)) {
- SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(null, null, null, callIdHeader.getCallId());
- String streamId = sendRtpItem.getStreamId();
- StreamInfo streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
- if (null == streamInfo) {
- responseAck(evt, Response.NOT_FOUND, "stream " + streamId + " not found");
- return;
- }
- Device device1 = storager.queryVideoDevice(streamInfo.getDeviceID());
- cmder.playbackControlCmd(device1,streamInfo,new String(evt.getRequest().getRawContent()),eventResult -> {
- // 澶辫触鐨勫洖澶�
- try {
- responseAck(evt, eventResult.statusCode, eventResult.msg);
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
- }
- }, eventResult -> {
- // 鎴愬姛鐨勫洖澶�
- try {
- responseAck(evt, eventResult.statusCode);
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
- }
- });
- }
- }
- } catch (SipException e) {
- logger.warn("SIP 鍥炲閿欒", e);
- } catch (InvalidArgumentException e) {
- logger.warn("鍙傛暟鏃犳晥", e);
- } catch (ParseException e) {
- logger.warn("SIP鍥炲鏃惰В鏋愬紓甯�", e);
- }
- }
-
-
-}
+package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.info;
+
+import com.genersoft.iot.vmp.common.InviteInfo;
+import com.genersoft.iot.vmp.common.InviteSessionType;
+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.SIPProcessorObserver;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
+import com.genersoft.iot.vmp.service.IInviteStreamService;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import gov.nist.javax.sip.message.SIPRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sip.InvalidArgumentException;
+import javax.sip.RequestEvent;
+import javax.sip.SipException;
+import javax.sip.header.CallIdHeader;
+import javax.sip.header.ContentTypeHeader;
+import javax.sip.message.Response;
+import java.text.ParseException;
+
+@Component
+public class InfoRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
+
+ private final static Logger logger = LoggerFactory.getLogger(InfoRequestProcessor.class);
+
+ private final String method = "INFO";
+
+ @Autowired
+ private SIPProcessorObserver sipProcessorObserver;
+
+ @Autowired
+ private IVideoManagerStorage storage;
+
+ @Autowired
+ private SipSubscribe sipSubscribe;
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private IInviteStreamService inviteStreamService;
+
+ @Autowired
+ private IVideoManagerStorage storager;
+
+ @Autowired
+ private SIPCommander cmder;
+
+ @Autowired
+ private VideoStreamSessionManager sessionManager;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ // 娣诲姞娑堟伅澶勭悊鐨勮闃�
+ sipProcessorObserver.addRequestProcessor(method, this);
+ }
+
+ @Override
+ public void process(RequestEvent evt) {
+ logger.debug("鎺ユ敹鍒版秷鎭細" + evt.getRequest());
+ SIPRequest request = (SIPRequest) evt.getRequest();
+ String deviceId = SipUtils.getUserIdFromFromHeader(request);
+ CallIdHeader callIdHeader = request.getCallIdHeader();
+ // 鍏堜粠浼氳瘽鍐呮煡鎵�
+ SsrcTransaction ssrcTransaction = sessionManager.getSsrcTransaction(null, null, callIdHeader.getCallId(), null);
+
+ // 鍏煎娴峰悍 濯掍綋閫氱煡 娑堟伅from瀛楁涓嶆槸璁惧ID鐨勯棶棰�
+ if (ssrcTransaction != null) {
+ deviceId = ssrcTransaction.getDeviceId();
+ }
+ // 鏌ヨ璁惧鏄惁瀛樺湪
+ Device device = redisCatchStorage.getDevice(deviceId);
+ // 鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪
+ ParentPlatform parentPlatform = storage.queryParentPlatByServerGBId(deviceId);
+ try {
+ if (device != null && parentPlatform != null) {
+ logger.warn("[閲嶅]骞冲彴涓庤澶囩紪鍙烽噸澶嶏細{}", deviceId);
+ String hostAddress = request.getRemoteAddress().getHostAddress();
+ int remotePort = request.getRemotePort();
+ if (device.getHostAddress().equals(hostAddress + ":" + remotePort)) {
+ parentPlatform = null;
+ }else {
+ device = null;
+ }
+ }
+ if (device == null && parentPlatform == null) {
+ // 涓嶅瓨鍦ㄥ垯鍥炲404
+ responseAck(request, Response.NOT_FOUND, "device "+ deviceId +" not found");
+ logger.warn("[璁惧鏈壘鍒� ]锛� {}", deviceId);
+ if (sipSubscribe.getErrorSubscribe(callIdHeader.getCallId()) != null){
+ DeviceNotFoundEvent deviceNotFoundEvent = new DeviceNotFoundEvent(evt.getDialog());
+ deviceNotFoundEvent.setCallId(callIdHeader.getCallId());
+ SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(deviceNotFoundEvent);
+ sipSubscribe.getErrorSubscribe(callIdHeader.getCallId()).response(eventResult);
+ };
+ }else {
+ ContentTypeHeader header = (ContentTypeHeader)evt.getRequest().getHeader(ContentTypeHeader.NAME);
+ String contentType = header.getContentType();
+ String contentSubType = header.getContentSubType();
+ if ("Application".equalsIgnoreCase(contentType) && "MANSRTSP".equalsIgnoreCase(contentSubType)) {
+ SendRtpItem sendRtpItem = redisCatchStorage.querySendRTPServer(null, null, null, callIdHeader.getCallId());
+ String streamId = sendRtpItem.getStreamId();
+ InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(InviteSessionType.PLAYBACK, streamId);
+ if (null == inviteInfo) {
+ responseAck(request, Response.NOT_FOUND, "stream " + streamId + " not found");
+ return;
+ }
+ Device device1 = storager.queryVideoDevice(inviteInfo.getDeviceId());
+ if (inviteInfo.getStreamInfo() != null) {
+ cmder.playbackControlCmd(device1,inviteInfo.getStreamInfo(),new String(evt.getRequest().getRawContent()),eventResult -> {
+ // 澶辫触鐨勫洖澶�
+ try {
+ responseAck(request, eventResult.statusCode, eventResult.msg);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 褰曞儚鎺у埗: {}", e.getMessage());
+ }
+ }, eventResult -> {
+ // 鎴愬姛鐨勫洖澶�
+ try {
+ responseAck(request, eventResult.statusCode);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 褰曞儚鎺у埗: {}", e.getMessage());
+ }
+ });
+ }
+
+ }
+ }
+ } catch (SipException e) {
+ logger.warn("SIP 鍥炲閿欒", e);
+ } catch (InvalidArgumentException e) {
+ logger.warn("鍙傛暟鏃犳晥", e);
+ } catch (ParseException e) {
+ logger.warn("SIP鍥炲鏃惰В鏋愬紓甯�", e);
+ }
+ }
+
+
+}
--
Gitblit v1.8.0