From da2662ab27e5655636bfa6338d8d1f083a99f36f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 六月 2024 18:10:01 +0800
Subject: [PATCH] 国标28181-支持自动识别网卡监听，可以不再配置SIP.IP
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 034e24f..bfc42f5 100755
--- 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
@@ -62,7 +62,10 @@
}
SIPRequest request = (SIPRequest) evt.getRequest();
logger.info("[鏀跺埌蹇冭烦] device: {}, callId: {}", device.getDeviceId(), request.getCallIdHeader().getCallId());
-
+ if (userSetting.getGbDeviceOnline() == 0 && !device.isOnLine()) {
+ logger.warn("[鏀跺埌蹇冭烦] 璁惧绂荤嚎锛屽績璺充笉杩涜鍥炲锛� device: {}, callId: {}", device.getDeviceId(), request.getCallIdHeader().getCallId());
+ return;
+ }
// 鍥炲200 OK
try {
responseAck(request, Response.OK);
@@ -101,9 +104,10 @@
if (device.isOnLine()) {
deviceService.updateDevice(device);
}else {
- // 瀵逛簬宸茬粡绂荤嚎鐨勮澶囧垽鏂粬鐨勬敞鍐屾槸鍚﹀凡缁忚繃鏈�
- if (!deviceService.expire(device)){
- device.setOnLine(false);
+ if (userSetting.getGbDeviceOnline() == 1) {
+ // 瀵逛簬宸茬粡绂荤嚎鐨勮澶囧垽鏂粬鐨勬敞鍐屾槸鍚﹀凡缁忚繃鏈�
+ device.setOnLine(true);
+ device.setRegisterTime(DateUtil.getNow());
deviceService.online(device, null);
}
}
--
Gitblit v1.8.0