From 098dd8a04515c9dbb143ab39678c2a71a03ec427 Mon Sep 17 00:00:00 2001
From: lin <18010473990@163.com>
Date: 星期六, 08 一月 2022 18:00:31 +0800
Subject: [PATCH] 优化推流结束时流类型的获取
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
index 95e0af2..67bb56c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
+import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
@@ -35,9 +36,7 @@
import java.util.Iterator;
/**
- * @description: Notify璇锋眰澶勭悊鍣�
- * @author: lawrencehj
- * @date: 2021骞�1鏈�27鏃�
+ * SIP鍛戒护绫诲瀷锛� NOTIFY璇锋眰
*/
@Component
public class NotifyRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
@@ -52,6 +51,9 @@
private IVideoManagerStorager storager;
@Autowired
+ private SipConfig sipConfig;
+
+ @Autowired
private IRedisCatchStorage redisCatchStorage;
@Autowired
@@ -60,9 +62,7 @@
@Autowired
private DeviceOffLineDetector offLineDetector;
- private static final String NOTIFY_CATALOG = "Catalog";
- private static final String NOTIFY_ALARM = "Alarm";
- private static final String NOTIFY_MOBILE_POSITION = "MobilePosition";
+
private String method = "NOTIFY";
@Autowired
@@ -80,13 +80,13 @@
Element rootElement = getRootElement(evt);
String cmd = XmlUtil.getText(rootElement, "CmdType");
- if (NOTIFY_CATALOG.equals(cmd)) {
+ if (CmdType.CATALOG.equals(cmd)) {
logger.info("鎺ユ敹鍒癈atalog閫氱煡");
processNotifyCatalogList(evt);
- } else if (NOTIFY_ALARM.equals(cmd)) {
+ } else if (CmdType.ALARM.equals(cmd)) {
logger.info("鎺ユ敹鍒癆larm閫氱煡");
processNotifyAlarm(evt);
- } else if (NOTIFY_MOBILE_POSITION.equals(cmd)) {
+ } else if (CmdType.MOBILE_POSITION.equals(cmd)) {
logger.info("鎺ユ敹鍒癕obilePosition閫氱煡");
processNotifyMobilePosition(evt);
} else {
@@ -110,7 +110,7 @@
MobilePosition mobilePosition = new MobilePosition();
Element deviceIdElement = rootElement.element("DeviceID");
String deviceId = deviceIdElement.getTextTrim().toString();
- Device device = storager.queryVideoDevice(deviceId);
+ Device device = redisCatchStorage.getDevice(deviceId);
if (device != null) {
if (!StringUtils.isEmpty(device.getName())) {
mobilePosition.setDeviceName(device.getName());
@@ -158,12 +158,15 @@
* @param evt
*/
private void processNotifyAlarm(RequestEvent evt) {
+ if (!sipConfig.isAlarm()) {
+ return;
+ }
try {
Element rootElement = getRootElement(evt);
Element deviceIdElement = rootElement.element("DeviceID");
String deviceId = deviceIdElement.getText().toString();
- Device device = storager.queryVideoDevice(deviceId);
+ Device device = redisCatchStorage.getDevice(deviceId);
if (device == null) {
return;
}
@@ -230,7 +233,7 @@
String deviceId = SipUtils.getUserIdFromFromHeader(fromHeader);
Element rootElement = getRootElement(evt);
- Device device = storager.queryVideoDevice(deviceId);
+ Device device = redisCatchStorage.getDevice(deviceId);
if (device == null) {
return;
}
--
Gitblit v1.8.0