From f6893cf95b15531dfc45950fea7e780e045ba2ae Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 11 五月 2022 18:37:24 +0800
Subject: [PATCH] 优化设备在线状态
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
index f6a3af9..4f5f96a 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
@@ -9,6 +9,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
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.service.IDeviceService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import gov.nist.javax.sip.RequestEventExt;
@@ -60,6 +61,9 @@
@Autowired
private SIPProcessorObserver sipProcessorObserver;
+ @Autowired
+ private IDeviceService deviceService;
+
@Override
public void afterPropertiesSet() throws Exception {
// 娣诲姞娑堟伅澶勭悊鐨勮闃�
@@ -82,7 +86,7 @@
Response response = null;
boolean passwordCorrect = false;
// 娉ㄥ唽鏍囧織 0锛氭湭鎼哄甫鎺堟潈澶存垨鑰呭瘑鐮侀敊璇� 1锛氭敞鍐屾垚鍔� 2锛氭敞閿�鎴愬姛
- int registerFlag = 0;
+ boolean registerFlag = false;
FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME);
AddressImpl address = (AddressImpl) fromHeader.getAddress();
SipUri uri = (SipUri) address.getURI();
@@ -111,12 +115,8 @@
return;
}
- Device deviceInRedis = redisCatchStorage.getDevice(deviceId);
- Device device = storager.queryVideoDevice(deviceId);
- if (deviceInRedis != null && device == null) {
- // redis 瀛樺湪鑴忔暟鎹�
- redisCatchStorage.clearCatchByDeviceId(deviceId);
- }
+ Device device = deviceService.queryDevice(deviceId);
+
// 鎼哄甫鎺堟潈澶村苟涓斿瘑鐮佹纭�
response = getMessageFactory().createResponse(Response.OK, request);
// 娣诲姞date澶�
@@ -130,7 +130,9 @@
response = getMessageFactory().createResponse(Response.BAD_REQUEST, request);
ServerTransaction serverTransaction = getServerTransaction(evt);
serverTransaction.sendResponse(response);
- if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
+ if (serverTransaction.getDialog() != null) {
+ serverTransaction.getDialog().delete();
+ }
return;
}
// 娣诲姞Contact澶�
@@ -152,20 +154,17 @@
device.setStreamMode("UDP");
device.setCharset("GB2312");
device.setDeviceId(deviceId);
- device.setFirsRegister(true);
- } else {
- device.setFirsRegister(device.getOnline() == 0);
}
device.setIp(received);
device.setPort(rPort);
device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
if (expiresHeader.getExpires() == 0) {
// 娉ㄩ攢鎴愬姛
- registerFlag = 2;
+ registerFlag = false;
} else {
// 娉ㄥ唽鎴愬姛
device.setExpires(expiresHeader.getExpires());
- registerFlag = 1;
+ registerFlag = true;
// 鍒ゆ柇TCP杩樻槸UDP
ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
String transport = reqViaHeader.getTransport();
@@ -175,12 +174,12 @@
sendResponse(evt, response);
// 娉ㄥ唽鎴愬姛
// 淇濆瓨鍒皉edis
- if (registerFlag == 1) {
+ if (registerFlag) {
logger.info("[{}] 娉ㄥ唽鎴愬姛! deviceId:" + deviceId, requestAddress);
- publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_REGISTER, expiresHeader.getExpires());
- } else if (registerFlag == 2) {
+ deviceService.online(device);
+ } else {
logger.info("[{}] 娉ㄩ攢鎴愬姛! deviceId:" + deviceId, requestAddress);
- publisher.outlineEventPublish(deviceId, VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);
+ deviceService.offline(deviceId);
}
} catch (SipException | InvalidArgumentException | NoSuchAlgorithmException | ParseException e) {
e.printStackTrace();
@@ -190,8 +189,14 @@
private void sendResponse(RequestEvent evt, Response response) throws InvalidArgumentException, SipException {
ServerTransaction serverTransaction = getServerTransaction(evt);
+ if (serverTransaction == null) {
+ logger.warn("鍥炲澶辫触锛歿}", response);
+ return;
+ }
serverTransaction.sendResponse(response);
- if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
+ if (serverTransaction.getDialog() != null) {
+ serverTransaction.getDialog().delete();
+ }
}
}
--
Gitblit v1.8.0