From 92022f8a8b7bccc865c47bd8cfafaffb91c2799c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 十月 2022 22:18:06 +0800
Subject: [PATCH] Merge pull request #640 from duzeng/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
index d5d4c1d..289f162 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
@@ -16,6 +16,7 @@
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import javax.sip.InvalidArgumentException;
@@ -25,6 +26,9 @@
import javax.sip.message.Response;
import java.text.ParseException;
+/**
+ * 鐘舵�佷俊鎭�(蹇冭烦)鎶ラ��
+ */
@Component
public class KeepaliveNotifyMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
@@ -49,39 +53,33 @@
return;
}
try {
+ // 鍒ゆ柇RPort鏄惁鏀瑰彉锛屾敼鍙樺垯璇存槑璺敱nat淇℃伅鍙樺寲锛屼慨鏀硅澶囦俊鎭�
+ // 鑾峰彇鍒伴�氫俊鍦板潃绛変俊鎭�
+ ViaHeader viaHeader = (ViaHeader) evt.getRequest().getHeader(ViaHeader.NAME);
+ String received = viaHeader.getReceived();
+ int rPort = viaHeader.getRPort();
+ // 瑙ｆ瀽鏈湴鍦板潃鏇夸唬
+ if (ObjectUtils.isEmpty(received) || rPort == -1) {
+ received = viaHeader.getHost();
+ rPort = viaHeader.getPort();
+ }
+ if (device.getPort() != rPort) {
+ device.setPort(rPort);
+ device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
+ }
+ device.setKeepaliveTime(DateUtil.getNow());
+ // 鍥炲200 OK
+ responseAck(getServerTransaction(evt), Response.OK);
if (device.getOnline() == 1) {
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
+ deviceService.updateDevice(device);
}else {
// 瀵逛簬宸茬粡绂荤嚎鐨勮澶囧垽鏂粬鐨勬敞鍐屾槸鍚﹀凡缁忚繃鏈�
if (!deviceService.expire(device)){
- device.setKeepaliveTime(DateUtil.getNow());
- // 鍒ゆ柇RPort鏄惁鏀瑰彉锛屾敼鍙樺垯璇存槑璺敱nat淇℃伅鍙樺寲锛屼慨鏀硅澶囦俊鎭�
- // 鑾峰彇鍒伴�氫俊鍦板潃绛変俊鎭�
- ViaHeader viaHeader = (ViaHeader) evt.getRequest().getHeader(ViaHeader.NAME);
- String received = viaHeader.getReceived();
- int rPort = viaHeader.getRPort();
- // 瑙ｆ瀽鏈湴鍦板潃鏇夸唬
- if (StringUtils.isEmpty(received) || rPort == -1) {
- received = viaHeader.getHost();
- rPort = viaHeader.getPort();
- }
- if (device.getPort() != rPort) {
- device.setPort(rPort);
- device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
- }
- device.setKeepaliveTime(DateUtil.getNow());
deviceService.online(device);
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
}
}
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 蹇冭烦鍥炲: {}", e.getMessage());
}
}
--
Gitblit v1.8.0