From 8da6906e40c8a96a94624b468833bebc2c3a3d5c Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期三, 20 一月 2021 20:43:40 +0800
Subject: [PATCH] 修改功能说明
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
index be076bd..18b5de1 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
@@ -16,6 +16,8 @@
import javax.sip.message.Request;
import javax.sip.message.Response;
+import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate;
+import gov.nist.javax.sip.header.SIPDateHeader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
@@ -25,7 +27,6 @@
import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;
import com.genersoft.iot.vmp.gb28181.auth.RegisterLogicHandler;
import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.Host;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
@@ -88,7 +89,12 @@
else if (passwordCorrect) {
response = getMessageFactory().createResponse(Response.OK, request);
// 娣诲姞date澶�
- response.addHeader(getHeaderFactory().createDateHeader(Calendar.getInstance(Locale.ENGLISH)));
+ SIPDateHeader dateHeader = new SIPDateHeader();
+ // 浣跨敤鑷繁淇敼鐨�
+ WvpSipDate wvpSipDate = new WvpSipDate(Calendar.getInstance(Locale.ENGLISH).getTimeInMillis());
+ dateHeader.setDate(wvpSipDate);
+ response.addHeader(dateHeader);
+
ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);
// 娣诲姞Contact澶�
response.addHeader(request.getHeader(ContactHeader.NAME));
@@ -107,17 +113,15 @@
rPort = viaHeader.getPort();
}
//
- Host host = new Host();
- host.setIp(received);
- host.setPort(rPort);
- host.setAddress(received.concat(":").concat(String.valueOf(rPort)));
AddressImpl address = (AddressImpl) fromHeader.getAddress();
SipUri uri = (SipUri) address.getURI();
String deviceId = uri.getUser();
device = new Device();
device.setStreamMode("UDP");
device.setDeviceId(deviceId);
- device.setHost(host);
+ device.setIp(received);
+ device.setPort(rPort);
+ device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
// 娉ㄩ攢鎴愬姛
if (expiresHeader != null && expiresHeader.getExpires() == 0) {
registerFlag = 2;
@@ -141,9 +145,15 @@
// 涓嬪彂catelog鏌ヨ鐩綍
if (registerFlag == 1 && device != null) {
logger.info("娉ㄥ唽鎴愬姛! deviceId:" + device.getDeviceId());
+ boolean exists = storager.exists(device.getDeviceId());
+ device.setRegisterTimeMillis(System.currentTimeMillis());
storager.updateDevice(device);
publisher.onlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_ONLINE_REGISTER);
- handler.onRegister(device);
+
+ // 閲嶆柊娉ㄥ唽鏇存柊璁惧鍜岄�氶亾锛屼互鍏嶈澶囨浛鎹㈡垨鏇存柊鍚庝俊鎭棤娉曟洿鏂�
+ //if (!exists) {
+ handler.onRegister(device);
+ //}
} else if (registerFlag == 2) {
logger.info("娉ㄩ攢鎴愬姛! deviceId:" + device.getDeviceId());
publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);
--
Gitblit v1.8.0