From 04f938ef623eb1f69a0b08ba8910bb5639372316 Mon Sep 17 00:00:00 2001
From: wangyimeng <421132955@qq.com>
Date: 星期五, 06 五月 2022 12:19:44 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 edd9fe8..08a7751 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
@@ -7,9 +7,8 @@
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.NotifyMessageHandler;
-import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.dom4j.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -17,7 +16,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
-import springfox.documentation.service.Header;
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
@@ -39,7 +37,7 @@
private EventPublisher publisher;
@Autowired
- private IVideoManagerStorager videoManagerStorager;
+ private IVideoManagerStorage videoManagerStorager;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -72,7 +70,9 @@
videoManagerStorager.updateDevice(device);
redisCatchStorage.updateDevice(device);
}
- publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+ if (!redisCatchStorage.deviceIsOnline(device.getDeviceId())) {
+ publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+ }
}
} catch (SipException e) {
e.printStackTrace();
--
Gitblit v1.8.0