From d6262acf6ab2a5083e62ea98299b378f61cd5421 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 20 四月 2023 16:42:44 +0800
Subject: [PATCH] 更新readme
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java | 80 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
index ffac1d0..ff1ccc6 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
@@ -2,20 +2,27 @@
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
+import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
+import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.event.response.SIPResponseProcessorAbstract;
+import com.genersoft.iot.vmp.service.IPlatformService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
+import gov.nist.javax.sip.message.SIPResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.sip.InvalidArgumentException;
import javax.sip.ResponseEvent;
-import javax.sip.header.CallIdHeader;
+import javax.sip.SipException;
import javax.sip.header.WWWAuthenticateHeader;
import javax.sip.message.Response;
+import java.text.ParseException;
/**
* @description:Register鍝嶅簲澶勭悊鍣�
@@ -25,20 +32,26 @@
@Component
public class RegisterResponseProcessor extends SIPResponseProcessorAbstract {
- private Logger logger = LoggerFactory.getLogger(RegisterResponseProcessor.class);
- private String method = "REGISTER";
+ private final Logger logger = LoggerFactory.getLogger(RegisterResponseProcessor.class);
+ private final String method = "REGISTER";
@Autowired
private ISIPCommanderForPlatform sipCommanderForPlatform;
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@Autowired
private SIPProcessorObserver sipProcessorObserver;
+
+ @Autowired
+ private SubscribeHolder subscribeHolder;
+
+ @Autowired
+ private IPlatformService platformService;
@Override
public void afterPropertiesSet() throws Exception {
@@ -53,50 +66,47 @@
*/
@Override
public void process(ResponseEvent evt) {
- Response response = evt.getResponse();
- CallIdHeader callIdHeader = (CallIdHeader) response.getHeader(CallIdHeader.NAME);
- String callId = callIdHeader.getCallId();
-
- String platformGBId = redisCatchStorage.queryPlatformRegisterInfo(callId);
- if (platformGBId == null) {
- logger.info(String.format("鏈壘鍒癱allId锛� %s 鐨勬敞鍐�/娉ㄩ攢骞冲彴id", callId ));
+ SIPResponse response = (SIPResponse)evt.getResponse();
+ String callId = response.getCallIdHeader().getCallId();
+ PlatformRegisterInfo platformRegisterInfo = redisCatchStorage.queryPlatformRegisterInfo(callId);
+ if (platformRegisterInfo == null) {
+ logger.info(String.format("[鍥芥爣绾ц仈]鏈壘鍒癱allId锛� %s 鐨勬敞鍐�/娉ㄩ攢骞冲彴id", callId ));
return;
}
- ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(platformGBId);
+ ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(platformRegisterInfo.getPlatformId());
if (parentPlatformCatch == null) {
- logger.warn(String.format("鏀跺埌 %s 鐨勬敞鍐�/娉ㄩ攢%S璇锋眰, 浣嗘槸骞冲彴缂撳瓨淇℃伅鏈煡璇㈠埌!!!", platformGBId, response.getStatusCode()));
+ logger.warn(String.format("[鍥芥爣绾ц仈]鏀跺埌娉ㄥ唽/娉ㄩ攢%S璇锋眰锛屽钩鍙帮細%s锛屼絾鏄钩鍙扮紦瀛樹俊鎭湭鏌ヨ鍒�!!!", response.getStatusCode(),platformRegisterInfo.getPlatformId()));
return;
}
- String action = parentPlatformCatch.getParentPlatform().getExpires().equals("0") ? "娉ㄩ攢" : "娉ㄥ唽";
- logger.info(String.format("鏀跺埌 %s %s鐨�%S鍝嶅簲", platformGBId, action, response.getStatusCode() ));
+
+ String action = platformRegisterInfo.isRegister() ? "娉ㄥ唽" : "娉ㄩ攢";
+ logger.info(String.format("[鍥芥爣绾ц仈]%s %S鍝嶅簲,%s ", action, response.getStatusCode(), platformRegisterInfo.getPlatformId() ));
ParentPlatform parentPlatform = parentPlatformCatch.getParentPlatform();
if (parentPlatform == null) {
- logger.warn(String.format("鏀跺埌 %s %s鐨�%S璇锋眰, 浣嗘槸骞冲彴淇℃伅鏈煡璇㈠埌!!!", platformGBId, action, response.getStatusCode()));
+ logger.warn(String.format("[鍥芥爣绾ц仈]鏀跺埌 %s %s鐨�%S璇锋眰, 浣嗘槸骞冲彴淇℃伅鏈煡璇㈠埌!!!", platformRegisterInfo.getPlatformId(), action, response.getStatusCode()));
return;
}
- if (response.getStatusCode() == 401) {
+ if (response.getStatusCode() == Response.UNAUTHORIZED) {
WWWAuthenticateHeader www = (WWWAuthenticateHeader)response.getHeader(WWWAuthenticateHeader.NAME);
- sipCommanderForPlatform.register(parentPlatform, callId, www, null, null, true);
- }else if (response.getStatusCode() == 200){
- // 娉ㄥ唽/娉ㄩ攢鎴愬姛
- logger.info(String.format("%s %s鎴愬姛", platformGBId, action));
- redisCatchStorage.delPlatformRegisterInfo(callId);
- parentPlatform.setStatus("娉ㄥ唽".equals(action));
- // 鍙栧洖Expires璁剧疆锛岄伩鍏嶆敞閿�杩囩▼涓缃负0
- if (!parentPlatformCatch.getParentPlatform().getExpires().equals("0")) {
- ParentPlatform parentPlatformTmp = storager.queryParentPlatByServerGBId(platformGBId);
- String expires = parentPlatformTmp.getExpires();
- parentPlatform.setExpires(expires);
- parentPlatform.setId(parentPlatformTmp.getId());
- redisCatchStorage.updatePlatformRegister(parentPlatform);
- redisCatchStorage.updatePlatformKeepalive(parentPlatform);
- parentPlatformCatch.setParentPlatform(parentPlatform);
- redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
+ SipTransactionInfo sipTransactionInfo = new SipTransactionInfo(response);
+ try {
+ sipCommanderForPlatform.register(parentPlatform, sipTransactionInfo, www, null, null, platformRegisterInfo.isRegister());
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍐嶆娉ㄥ唽: {}", e.getMessage());
}
- storager.updateParentPlatformStatus(platformGBId, "娉ㄥ唽".equals(action));
+ }else if (response.getStatusCode() == Response.OK){
+ if (platformRegisterInfo.isRegister()) {
+ SipTransactionInfo sipTransactionInfo = new SipTransactionInfo(response);
+ platformService.online(parentPlatform, sipTransactionInfo);
+ }else {
+ platformService.offline(parentPlatform, false);
+ }
+
+ // 娉ㄥ唽/娉ㄩ攢鎴愬姛绉婚櫎缂撳瓨鐨勪俊鎭�
+ redisCatchStorage.delPlatformRegisterInfo(callId);
}
}
--
Gitblit v1.8.0