From e48fa711a3664bece9b3e58840a75fe7c05bc47c Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期六, 08 五月 2021 17:14:05 +0800
Subject: [PATCH] 添加截图（快照）功能
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java | 63 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 24 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 276127f..aa501d9 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,12 @@
import javax.sip.message.Request;
import javax.sip.message.Response;
+import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate;
+import gov.nist.javax.sip.RequestEventExt;
+import gov.nist.javax.sip.header.SIPDateHeader;
+import gov.nist.javax.sip.message.SIPRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
@@ -23,7 +29,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;
@@ -39,6 +44,8 @@
*/
public class RegisterRequestProcessor extends SIPRequestAbstractProcessor {
+ private Logger logger = LoggerFactory.getLogger(RegisterRequestProcessor.class);
+
private SipConfig sipConfig;
private RegisterLogicHandler handler;
@@ -46,17 +53,17 @@
private IVideoManagerStorager storager;
private EventPublisher publisher;
-
- /***
+
+ /**
* 鏀跺埌娉ㄥ唽璇锋眰 澶勭悊
- *
- * @param request
- * 璇锋眰娑堟伅
- */
+ * @param evt
+ */
@Override
public void process(RequestEvent evt) {
try {
- System.out.println("鏀跺埌娉ㄥ唽璇锋眰锛屽紑濮嬪鐞�");
+ RequestEventExt evtExt = (RequestEventExt)evt;
+ String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();
+ logger.info("[{}] 鏀跺埌娉ㄥ唽璇锋眰锛屽紑濮嬪鐞�", requestAddress);
Request request = evt.getRequest();
Response response = null;
@@ -75,9 +82,9 @@
if (authorhead == null || !passwordCorrect) {
if (authorhead == null) {
- System.out.println("鏈惡甯︽巿鏉冨ご 鍥炲401");
+ logger.info("[{}] 鏈惡甯︽巿鏉冨ご 鍥炲401", requestAddress);
} else if (!passwordCorrect) {
- System.out.println("瀵嗙爜閿欒 鍥炲401");
+ logger.info("[{}] 瀵嗙爜閿欒 鍥炲401", requestAddress);
}
response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getSipDomain());
@@ -86,36 +93,41 @@
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));
// 娣诲姞Expires澶�
response.addHeader(request.getExpires());
- // 1.鑾峰彇鍒伴�氫俊鍦板潃绛変俊鎭紝淇濆瓨鍒癛edis
+ // 鑾峰彇鍒伴�氫俊鍦板潃绛変俊鎭�
FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME);
ViaHeader viaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
String received = viaHeader.getReceived();
int rPort = viaHeader.getRPort();
- // 鏈湴妯℃嫙璁惧 received 涓虹┖ rPort 涓� -1
// 瑙ｆ瀽鏈湴鍦板潃鏇夸唬
if (StringUtils.isEmpty(received) || rPort == -1) {
received = viaHeader.getHost();
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 = storager.queryVideoDevice(deviceId);
+ if (device == null) {
+ device = new Device();
+ device.setStreamMode("UDP");
+ device.setDeviceId(deviceId);
+ }
+ device.setIp(received);
+ device.setPort(rPort);
+ device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
// 娉ㄩ攢鎴愬姛
if (expiresHeader != null && expiresHeader.getExpires() == 0) {
registerFlag = 2;
@@ -137,13 +149,16 @@
// 娉ㄥ唽鎴愬姛
// 淇濆瓨鍒皉edis
// 涓嬪彂catelog鏌ヨ鐩綍
- if (registerFlag == 1 && device != null) {
- System.out.println("娉ㄥ唽鎴愬姛! deviceId:" + device.getDeviceId());
+ if (registerFlag == 1 ) {
+ logger.info("[{}] 娉ㄥ唽鎴愬姛! deviceId:" + device.getDeviceId(), requestAddress);
+ device.setRegisterTimeMillis(System.currentTimeMillis());
storager.updateDevice(device);
publisher.onlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_ONLINE_REGISTER);
+
+ // 閲嶆柊娉ㄥ唽鏇存柊璁惧鍜岄�氶亾锛屼互鍏嶈澶囨浛鎹㈡垨鏇存柊鍚庝俊鎭棤娉曟洿鏂�
handler.onRegister(device);
} else if (registerFlag == 2) {
- System.out.println("娉ㄩ攢鎴愬姛! deviceId:" + device.getDeviceId());
+ logger.info("[{}] 娉ㄩ攢鎴愬姛! deviceId:" + device.getDeviceId(), requestAddress);
publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);
}
} catch (SipException | InvalidArgumentException | NoSuchAlgorithmException | ParseException e) {
--
Gitblit v1.8.0