From 2e98b20bea4463e4465e3c19059d0744a09aec06 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 14:34:41 +0800
Subject: [PATCH] gb28181版本升级-补充
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java | 78 ++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 38 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..2846903 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
@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;
-import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
@@ -9,15 +8,17 @@
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 com.genersoft.iot.vmp.utils.DateUtil;
+import gov.nist.javax.sip.message.SIPRequest;
import org.dom4j.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 springfox.documentation.service.Header;
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
@@ -26,23 +27,20 @@
import javax.sip.message.Response;
import java.text.ParseException;
+/**
+ * 状态信息(心跳)报送
+ */
@Component
public class KeepaliveNotifyMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
private Logger logger = LoggerFactory.getLogger(KeepaliveNotifyMessageHandler.class);
- private final String cmdType = "Keepalive";
+ private final static String cmdType = "Keepalive";
@Autowired
private NotifyMessageHandler notifyMessageHandler;
@Autowired
- private EventPublisher publisher;
-
- @Autowired
- private IVideoManagerStorager videoManagerStorager;
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
+ private IDeviceService deviceService;
@Override
public void afterPropertiesSet() throws Exception {
@@ -51,35 +49,39 @@
@Override
public void handForDevice(RequestEvent evt, Device device, Element element) {
- // 检查设备是否存在并在线， 不在线则设置为在线
+ if (device == null) {
+ // 未注册的设备不做处理
+ return;
+ }
+ // 回复200 OK
try {
- if (device != null ) {
- // 回复200 OK
- responseAck(evt, Response.OK);
- // 判断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)));
- videoManagerStorager.updateDevice(device);
- redisCatchStorage.updateDevice(device);
- }
- publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+ responseAck((SIPRequest) evt.getRequest(), Response.OK);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[命令发送失败] 国标级联 心跳回复: {}", e.getMessage());
+ }
+ // 判断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());
+
+ if (device.getOnline() == 1) {
+ deviceService.updateDevice(device);
+ }else {
+ // 对于已经离线的设备判断他的注册是否已经过期
+ if (!deviceService.expire(device)){
+ deviceService.online(device);
}
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
}
}
--
Gitblit v1.9.3