From 241804f5f832c76d8855011ceea713eee4cbf15a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 03 十二月 2021 16:13:46 +0800
Subject: [PATCH] 优化redis存储，alarm默认关闭处理
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java | 7
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 10
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java | 7
src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEventLister.java | 12
src/main/resources/all-application.yml | 4
pom.xml | 5
src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java | 17
src/main/java/com/genersoft/iot/vmp/gb28181/event/DeviceOffLineDetector.java | 6
src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepliveTimeoutListener.java | 11
/dev/null | 1104 ------------------------------------------------
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java | 14
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 80 +-
src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/OfflineEventListener.java | 6
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 2
src/main/java/com/genersoft/iot/vmp/conf/WVPTimerTask.java | 5
src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java | 19
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 43
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java | 7
18 files changed, 160 insertions(+), 1,199 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7a04892..3336bb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,6 +204,11 @@
<version>1.12</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.session</groupId>
+ <artifactId>spring-session-core</artifactId>
+ </dependency>
+
<!-- <!– 妫�娴嬫枃浠剁紪鐮� –>-->
<!-- <!– https://mvnrepository.com/artifact/cpdetector/cpdetector –>-->
<!-- <dependency>-->
diff --git a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
index 386eb1c..da58e10 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
@@ -14,7 +14,7 @@
public static final String MEDIA_SERVER_PREFIX = "VMP_MEDIA_SERVER_";
- public static final String MEDIA_SERVERS_ONLINE_PREFIX = "VMP_MEDIA_ONLINE_SERVERS";
+ public static final String MEDIA_SERVERS_ONLINE_PREFIX = "VMP_MEDIA_ONLINE_SERVERS_";
public static final String MEDIA_STREAM_PREFIX = "VMP_MEDIA_STREAM";
@@ -22,14 +22,15 @@
public static final String CACHEKEY_PREFIX = "VMP_CHANNEL_";
- public static final String KEEPLIVEKEY_PREFIX = "VMP_keeplive_";
+ public static final String KEEPLIVEKEY_PREFIX = "VMP_KEEPALIVE_";
+ // 姝ゅ澶氫簡涓�涓猒锛屾殏涓嶄慨鏀�
public static final String PLAYER_PREFIX = "VMP_PLAYER_";
-
public static final String PLAY_BLACK_PREFIX = "VMP_PLAYBACK_";
+
public static final String DOWNLOAD_PREFIX = "VMP_DOWNLOAD_";
- public static final String PLATFORM_KEEPLIVEKEY_PREFIX = "VMP_PLATFORM_KEEPLIVE_";
+ public static final String PLATFORM_KEEPALIVE_PREFIX = "VMP_PLATFORM_KEEPALIVE_";
public static final String PLATFORM_CATCH_PREFIX = "VMP_PLATFORM_CATCH_";
@@ -38,8 +39,6 @@
public static final String PLATFORM_REGISTER_INFO_PREFIX = "VMP_PLATFORM_REGISTER_INFO_";
public static final String PLATFORM_SEND_RTP_INFO_PREFIX = "VMP_PLATFORM_SEND_RTP_INFO_";
-
- public static final String Pattern_Topic = "VMP_KEEPLIVE_PLATFORM_";
public static final String EVENT_ONLINE_REGISTER = "1";
@@ -51,10 +50,10 @@
public static final String EVENT_OUTLINE_TIMEOUT = "2";
- public static final String MEDIA_SSRC_USED_PREFIX = "VMP_media_used_ssrc_";
+ public static final String MEDIA_SSRC_USED_PREFIX = "VMP_MEDIA_USED_SSRC_";
- public static final String MEDIA_TRANSACTION_USED_PREFIX = "VMP_media_transaction_";
+ public static final String MEDIA_TRANSACTION_USED_PREFIX = "VMP_MEDIA_TRANSACTION_";
//************************** redis 娑堟伅*********************************
- public static final String WVP_MSG_STREAM_PUSH_CHANGE_PREFIX = "WVP_MSG_STREAM_CHANGE_";
+ public static final String WVP_MSG_STREAM_CHANGE__PREFIX = "WVP_MSG_STREAM_CHANGE_";
}
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
index 2d30792..4c24d14 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -29,6 +29,8 @@
Integer registerTimeInterval = 60;
+ private boolean alarm = false;
+
public void setIp(String ip) {
this.ip = ip;
}
@@ -104,4 +106,12 @@
public Integer getRegisterTimeInterval() {
return registerTimeInterval;
}
+
+ public boolean isAlarm() {
+ return alarm;
+ }
+
+ public void setAlarm(boolean alarm) {
+ this.alarm = alarm;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/WVPTimerTask.java b/src/main/java/com/genersoft/iot/vmp/conf/WVPTimerTask.java
index 3e72e29..93e2b87 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/WVPTimerTask.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/WVPTimerTask.java
@@ -17,9 +17,6 @@
@Autowired
private IMediaServerService mediaServerService;
- @Autowired
- private UserSetup userSetup;
-
@Value("${server.port}")
private int serverPort;
@@ -31,6 +28,6 @@
JSONObject jsonObject = new JSONObject();
jsonObject.put("ip", sipConfig.getIp());
jsonObject.put("port", serverPort);
- redisCatchStorage.updateWVPInfo(userSetup.getServerId(), jsonObject, 3);
+ redisCatchStorage.updateWVPInfo(jsonObject, 3);
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/DeviceOffLineDetector.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/DeviceOffLineDetector.java
index e5b57c8..ea2fa6c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/DeviceOffLineDetector.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/DeviceOffLineDetector.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.gb28181.event;
+import com.genersoft.iot.vmp.conf.UserSetup;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -16,9 +17,12 @@
@Autowired
private RedisUtil redis;
+
+ @Autowired
+ private UserSetup userSetup;
public boolean isOnline(String deviceId) {
- String key = VideoManagerConstants.KEEPLIVEKEY_PREFIX + deviceId;
+ String key = VideoManagerConstants.KEEPLIVEKEY_PREFIX + userSetup.getServerId() + "_" + deviceId;
return redis.hasKey(key);
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java
index 8363e58..d0850a8 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.gb28181.event.offline;
+import com.genersoft.iot.vmp.conf.UserSetup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,9 @@
@Autowired
private EventPublisher publisher;
+ @Autowired
+ private UserSetup userSetup;
+
public KeepaliveTimeoutListenerForPlatform(RedisMessageListenerContainer listenerContainer) {
super(listenerContainer);
}
@@ -40,17 +44,20 @@
String expiredKey = message.toString();
logger.debug(expiredKey);
// 骞冲彴蹇冭烦鍒版湡,闇�瑕侀噸鍙�, 鍒ゆ柇鏄惁宸茬粡澶氭鏈敹鍒板績璺冲洖澶�, 澶氭鏈敹鍒�,鍒欓噸鏂板彂璧锋敞鍐�, 娉ㄥ唽灏濊瘯澶氭鏈緱鍒板洖澶�,鍒欒涓哄钩鍙扮绾�
- if (expiredKey.startsWith(VideoManagerConstants.PLATFORM_KEEPLIVEKEY_PREFIX)) {
- String platformGBId = expiredKey.substring(VideoManagerConstants.PLATFORM_KEEPLIVEKEY_PREFIX.length(),expiredKey.length());
+ String PLATFORM_KEEPLIVEKEY_PREFIX = VideoManagerConstants.PLATFORM_KEEPALIVE_PREFIX + userSetup.getServerId() + "_";
+ String PLATFORM_REGISTER_PREFIX = VideoManagerConstants.PLATFORM_REGISTER_PREFIX + userSetup.getServerId() + "_";
+ String KEEPLIVEKEY_PREFIX = VideoManagerConstants.KEEPLIVEKEY_PREFIX + userSetup.getServerId() + "_";
+ if (expiredKey.startsWith(PLATFORM_KEEPLIVEKEY_PREFIX)) {
+ String platformGBId = expiredKey.substring(PLATFORM_KEEPLIVEKEY_PREFIX.length(),expiredKey.length());
publisher.platformKeepaliveExpireEventPublish(platformGBId);
- }else if (expiredKey.startsWith(VideoManagerConstants.PLATFORM_REGISTER_PREFIX)) {
- String platformGBId = expiredKey.substring(VideoManagerConstants.PLATFORM_REGISTER_PREFIX.length(),expiredKey.length());
+ }else if (expiredKey.startsWith(PLATFORM_REGISTER_PREFIX)) {
+ String platformGBId = expiredKey.substring(PLATFORM_REGISTER_PREFIX.length(),expiredKey.length());
publisher.platformNotRegisterEventPublish(platformGBId);
}else{
- String deviceId = expiredKey.substring(VideoManagerConstants.KEEPLIVEKEY_PREFIX.length(),expiredKey.length());
- publisher.outlineEventPublish(deviceId, VideoManagerConstants.EVENT_OUTLINE_TIMEOUT);
+ String deviceId = expiredKey.substring(KEEPLIVEKEY_PREFIX.length(),expiredKey.length());
+ publisher.outlineEventPublish(deviceId, KEEPLIVEKEY_PREFIX);
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepliveTimeoutListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepliveTimeoutListener.java
index db694cc..de2b829 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepliveTimeoutListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepliveTimeoutListener.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.gb28181.event.offline;
+import com.genersoft.iot.vmp.conf.UserSetup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,9 @@
@Autowired
private EventPublisher publisher;
+ @Autowired
+ private UserSetup userSetup;
+
public KeepliveTimeoutListener(RedisMessageListenerContainer listenerContainer) {
super(listenerContainer);
}
@@ -37,12 +41,13 @@
public void onMessage(Message message, byte[] pattern) {
// 鑾峰彇澶辨晥鐨刱ey
String expiredKey = message.toString();
- if(!expiredKey.startsWith(VideoManagerConstants.KEEPLIVEKEY_PREFIX)){
- logger.debug("鏀跺埌redis杩囨湡鐩戝惉锛屼絾寮�澶翠笉鏄�"+VideoManagerConstants.KEEPLIVEKEY_PREFIX+"锛屽拷鐣�");
+ String KEEPLIVEKEY_PREFIX = VideoManagerConstants.KEEPLIVEKEY_PREFIX + userSetup.getServerId() + "_";
+ if(!expiredKey.startsWith(KEEPLIVEKEY_PREFIX)){
+ logger.debug("鏀跺埌redis杩囨湡鐩戝惉锛屼絾寮�澶翠笉鏄�"+KEEPLIVEKEY_PREFIX+"锛屽拷鐣�");
return;
}
- String deviceId = expiredKey.substring(VideoManagerConstants.KEEPLIVEKEY_PREFIX.length(),expiredKey.length());
+ String deviceId = expiredKey.substring(KEEPLIVEKEY_PREFIX.length(),expiredKey.length());
publisher.outlineEventPublish(deviceId, VideoManagerConstants.EVENT_OUTLINE_TIMEOUT);
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/OfflineEventListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/OfflineEventListener.java
index 4b401c7..0f5604c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/OfflineEventListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/OfflineEventListener.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.gb28181.event.offline;
+import com.genersoft.iot.vmp.conf.UserSetup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,9 @@
@Autowired
private RedisUtil redis;
+ @Autowired
+ private UserSetup userSetup;
+
@Override
public void onApplicationEvent(OfflineEvent event) {
@@ -35,7 +39,7 @@
logger.debug("璁惧绂荤嚎浜嬩欢瑙﹀彂锛宒eviceId锛�" + event.getDeviceId() + ",from:" + event.getFrom());
}
- String key = VideoManagerConstants.KEEPLIVEKEY_PREFIX + event.getDeviceId();
+ String key = VideoManagerConstants.KEEPLIVEKEY_PREFIX + userSetup.getServerId() + "_" + event.getDeviceId();
switch (event.getFrom()) {
// 蹇冭烦瓒呮椂瑙﹀彂鐨勭绾夸簨浠讹紝璇存槑redis涓凡鍒犻櫎锛屾棤闇�澶勭悊
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java
index b347891..a62c76d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java
@@ -1,7 +1,9 @@
package com.genersoft.iot.vmp.gb28181.event.online;
import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.storager.dao.dto.User;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +37,9 @@
@Autowired
private SipConfig sipConfig;
+ @Autowired
+ private UserSetup userSetup;
+
private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Override
@@ -44,7 +49,7 @@
logger.debug("璁惧涓婄嚎浜嬩欢瑙﹀彂锛宒eviceId锛�" + event.getDevice().getDeviceId() + ",from:" + event.getFrom());
}
Device device = event.getDevice();
- String key = VideoManagerConstants.KEEPLIVEKEY_PREFIX + event.getDevice().getDeviceId();
+ String key = VideoManagerConstants.KEEPLIVEKEY_PREFIX + userSetup.getServerId() + "_" + event.getDevice().getDeviceId();
switch (event.getFrom()) {
// 娉ㄥ唽鏃惰Е鍙戠殑鍦ㄧ嚎浜嬩欢锛屽厛鍦╮edis涓鍔犺秴鏃惰秴鏃剁洃鍚�
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEventLister.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEventLister.java
index 20950ca..2ab2b23 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEventLister.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEventLister.java
@@ -52,18 +52,18 @@
@Override
public void onApplicationEvent(PlatformNotRegisterEvent event) {
- logger.info("骞冲彴鏈敞鍐屼簨浠惰Е鍙戯紝骞冲彴鍥芥爣ID锛�" + event.getPlatformGbID());
+ logger.info("[ 骞冲彴鏈敞鍐屼簨浠� ]骞冲彴鍥芥爣ID锛�" + event.getPlatformGbID());
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(event.getPlatformGbID());
if (parentPlatform == null) {
- logger.info("骞冲彴鏈敞鍐屼簨浠惰Е鍙戯紝浣嗗钩鍙板凡缁忓垹闄�!!! 骞冲彴鍥芥爣ID锛�" + event.getPlatformGbID());
+ logger.info("[ 骞冲彴鏈敞鍐屼簨浠� ] 骞冲彴宸茬粡鍒犻櫎!!! 骞冲彴鍥芥爣ID锛�" + event.getPlatformGbID());
return;
}
// 鏌ヨ鏄惁鏈夋帹娴侊紝 濡傛灉鏈夊垯閮藉仠姝�
List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServer(event.getPlatformGbID());
- logger.info("鍋滄[ {} ]鐨勬墍鏈夋帹娴乻ize", sendRtpItems.size());
+ logger.info("[ 骞冲彴鏈敞鍐屼簨浠� ] 鍋滄[ {} ]鐨勬墍鏈夋帹娴乻ize", sendRtpItems.size());
if (sendRtpItems != null && sendRtpItems.size() > 0) {
- logger.info("鍋滄[ {} ]鐨勬墍鏈夋帹娴�", event.getPlatformGbID());
+ logger.info("[ 骞冲彴鏈敞鍐屼簨浠� ] 鍋滄[ {} ]鐨勬墍鏈夋帹娴�", event.getPlatformGbID());
StringBuilder app = new StringBuilder();
StringBuilder stream = new StringBuilder();
for (SendRtpItem sendRtpItem : sendRtpItems) {
@@ -91,13 +91,13 @@
SipSubscribe.Event okEvent = (responseEvent)->{
timer.cancel();
};
- logger.info("鍚戝钩鍙版敞鍐岋紝骞冲彴鍥芥爣ID锛�" + event.getPlatformGbID());
+ logger.info("[骞冲彴娉ㄥ唽]骞冲彴鍥芥爣ID锛�" + event.getPlatformGbID());
sipCommanderFroPlatform.register(parentPlatform, null, okEvent);
// 璁剧疆娉ㄥ唽澶辫触鍒欐瘡闅�15绉掑彂璧蜂竴娆℃敞鍐�
timer.schedule(new TimerTask() {
@Override
public void run() {
- logger.info("鍐嶆鍚戝钩鍙版敞鍐岋紝骞冲彴鍥芥爣ID锛�" + event.getPlatformGbID());
+ logger.info("[骞冲彴娉ㄥ唽]鍐嶆鍚戝钩鍙版敞鍐岋紝骞冲彴鍥芥爣ID锛�" + event.getPlatformGbID());
sipCommanderFroPlatform.register(parentPlatform, null, okEvent);
}
}, config.getRegisterTimeInterval()* 1000, config.getRegisterTimeInterval()* 1000);//鍗佷簲绉掑悗鍐嶆鍙戣捣娉ㄥ唽
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
index ea9aa36..d41b04d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
@@ -7,6 +7,7 @@
import javax.sip.Dialog;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
+import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
import com.genersoft.iot.vmp.utils.SerializeUtils;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
@@ -25,6 +26,9 @@
@Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private UserSetup userSetup;
+
public void put(String deviceId, String channelId ,String ssrc, String streamId, String mediaServerId, ClientTransaction transaction){
SsrcTransaction ssrcTransaction = new SsrcTransaction();
ssrcTransaction.setDeviceId(deviceId);
@@ -35,7 +39,7 @@
ssrcTransaction.setSsrc(ssrc);
ssrcTransaction.setMediaServerId(mediaServerId);
- redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + deviceId + "_" + channelId, ssrcTransaction);
+ redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_" + deviceId + "_" + channelId, ssrcTransaction);
}
public void put(String deviceId, String channelId , Dialog dialog){
@@ -44,7 +48,7 @@
byte[] dialogByteArray = SerializeUtils.serialize(dialog);
ssrcTransaction.setDialog(dialogByteArray);
}
- redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + deviceId + "_" + channelId, ssrcTransaction);
+ redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_" + deviceId + "_" + channelId, ssrcTransaction);
}
@@ -66,7 +70,7 @@
}
public SsrcTransaction getSsrcTransaction(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = (SsrcTransaction)redisUtil.get(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + deviceId + "_" + channelId);
+ SsrcTransaction ssrcTransaction = (SsrcTransaction)redisUtil.get(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_" + deviceId + "_" + channelId);
return ssrcTransaction;
}
@@ -90,11 +94,11 @@
public void remove(String deviceId, String channelId) {
SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
if (ssrcTransaction == null) return;
- redisUtil.del(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + deviceId + "_" + channelId);
+ redisUtil.del(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_" + deviceId + "_" + channelId);
}
public List<SsrcTransaction> getAllSsrc() {
- List<Object> ssrcTransactionKeys = redisUtil.scan(String.format("%s_*_*", VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX));
+ List<Object> ssrcTransactionKeys = redisUtil.scan(String.format("%s_*_*", VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX+ userSetup.getServerId() + "_" ));
List<SsrcTransaction> result= new ArrayList<>();
for (int i = 0; i < ssrcTransactionKeys.size(); i++) {
String key = (String)ssrcTransactionKeys.get(i);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/MessageRequestProcessor1.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/MessageRequestProcessor1.java
deleted file mode 100644
index 2a90841..0000000
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/MessageRequestProcessor1.java
+++ /dev/null
@@ -1,1104 +0,0 @@
-package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.VManageBootstrap;
-import com.genersoft.iot.vmp.common.StreamInfo;
-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;
-import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
-import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
-import com.genersoft.iot.vmp.gb28181.transmit.callback.CheckForAllRecordsThread;
-import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
-import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
-import com.genersoft.iot.vmp.gb28181.utils.DateUtil;
-import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
-import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
-import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
-import com.genersoft.iot.vmp.service.IDeviceAlarmService;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.utils.GpsUtil;
-import com.genersoft.iot.vmp.utils.SpringBeanFactory;
-import com.genersoft.iot.vmp.utils.redis.RedisUtil;
-import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
-import gov.nist.javax.sip.SipStackImpl;
-import gov.nist.javax.sip.address.SipUri;
-import org.dom4j.DocumentException;
-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.StringUtils;
-
-import javax.sip.*;
-import javax.sip.address.SipURI;
-import javax.sip.header.FromHeader;
-import javax.sip.header.HeaderAddress;
-import javax.sip.header.ToHeader;
-import javax.sip.message.Response;
-import java.text.ParseException;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
-
-/**
- * @description: MESSAGE璇锋眰鍒嗗彂澶勭悊鍣紝
- * @author: panlinlin
- * @date: 2021骞�11鏈�8鏃� 10锛�28
- */
-@SuppressWarnings(value={"unchecked", "rawtypes"})
-@Component
-public class MessageRequestProcessor1 extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
-
- public static volatile List<String> threadNameList = new ArrayList();
- private final static Logger logger = LoggerFactory.getLogger(MessageRequestProcessor1.class);
- private static Map<String, ISIPRequestProcessor> messageHandlerMap = new ConcurrentHashMap<>();
-
-
- private final static String CACHE_RECORDINFO_KEY = "CACHE_RECORDINFO_";
- private static final String MESSAGE_KEEP_ALIVE = "Keepalive";
- private static final String MESSAGE_CONFIG_DOWNLOAD = "ConfigDownload";
- private static final String MESSAGE_CATALOG = "Catalog";
- private static final String MESSAGE_DEVICE_INFO = "DeviceInfo";
- private static final String MESSAGE_ALARM = "Alarm";
- private static final String MESSAGE_RECORD_INFO = "RecordInfo";
- private static final String MESSAGE_MEDIA_STATUS = "MediaStatus";
- private static final String MESSAGE_BROADCAST = "Broadcast";
- private static final String MESSAGE_DEVICE_STATUS = "DeviceStatus";
- private static final String MESSAGE_DEVICE_CONTROL = "DeviceControl";
- private static final String MESSAGE_DEVICE_CONFIG = "DeviceConfig";
- private static final String MESSAGE_MOBILE_POSITION = "MobilePosition";
- private static final String MESSAGE_PRESET_QUERY = "PresetQuery";
- private String method = "MESSAGE1111";
-
- @Autowired
- private UserSetup userSetup;
-
- @Autowired
- private SIPCommander cmder;
-
- @Autowired
- private SipConfig config;
-
- @Autowired
- private SIPCommanderFroPlatform cmderFroPlatform;
-
- @Autowired
- private IVideoManagerStorager storager;
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
-
- @Autowired
- private EventPublisher publisher;
-
- @Autowired
- private RedisUtil redis;
-
- @Autowired
- private DeferredResultHolder deferredResultHolder;
-
- @Autowired
- private DeviceOffLineDetector offLineDetector;
-
- @Autowired
- private IDeviceAlarmService deviceAlarmService;
-
- @Autowired
- private SIPProcessorObserver sipProcessorObserver;
-
- @Override
- public void afterPropertiesSet() throws Exception {
- // 娣诲姞娑堟伅澶勭悊鐨勮闃�
- sipProcessorObserver.addRequestProcessor(method, this);
- }
-
- /**
- * 澶勭悊MESSAGE璇锋眰
- *
- * @param evt
- */
- @Override
- public void process(RequestEvent evt) {
-
- try {
- Element rootElement = getRootElement(evt);
- String cmd = getText(rootElement, "CmdType");
-
- if (MESSAGE_KEEP_ALIVE.equals(cmd)) {
- logger.debug("鎺ユ敹鍒癒eepAlive娑堟伅");
- processMessageKeepAlive(evt);
- } else if (MESSAGE_CONFIG_DOWNLOAD.equals(cmd)) {
- logger.debug("鎺ユ敹鍒癈onfigDownload娑堟伅");
- processMessageConfigDownload(evt);
- } else if (MESSAGE_CATALOG.equals(cmd)) {
- logger.debug("鎺ユ敹鍒癈atalog娑堟伅");
- processMessageCatalogList(evt);
- } else if (MESSAGE_DEVICE_INFO.equals(cmd)) {
- // DeviceInfo娑堟伅澶勭悊
- processMessageDeviceInfo(evt);
- } else if (MESSAGE_DEVICE_STATUS.equals(cmd)) {
- // DeviceStatus娑堟伅澶勭悊
- processMessageDeviceStatus(evt);
- } else if (MESSAGE_DEVICE_CONTROL.equals(cmd)) {
- logger.debug("鎺ユ敹鍒癉eviceControl娑堟伅");
- processMessageDeviceControl(evt);
- } else if (MESSAGE_DEVICE_CONFIG.equals(cmd)) {
- logger.info("鎺ユ敹鍒癉eviceConfig娑堟伅");
- processMessageDeviceConfig(evt);
- } else if (MESSAGE_ALARM.equals(cmd)) {
- logger.debug("鎺ユ敹鍒癆larm娑堟伅");
- processMessageAlarm(evt);
- } else if (MESSAGE_RECORD_INFO.equals(cmd)) {
- logger.debug("鎺ユ敹鍒癛ecordInfo娑堟伅");
- processMessageRecordInfo(evt);
- }else if (MESSAGE_MEDIA_STATUS.equals(cmd)) {
- logger.debug("鎺ユ敹鍒癕ediaStatus娑堟伅");
- processMessageMediaStatus(evt);
- } else if (MESSAGE_MOBILE_POSITION.equals(cmd)) {
- logger.debug("鎺ユ敹鍒癕obilePosition娑堟伅");
- processMessageMobilePosition(evt);
- } else if (MESSAGE_PRESET_QUERY.equals(cmd)) {
- logger.debug("鎺ユ敹鍒癙resetQuery娑堟伅");
- processMessagePresetQuery(evt);
- } else if (MESSAGE_BROADCAST.equals(cmd)) {
- // Broadcast娑堟伅澶勭悊
- processMessageBroadcast(evt);
- } else {
- logger.debug("鎺ユ敹鍒版秷鎭細" + cmd);
- responseAck(evt, Response.OK);
- }
- } catch (DocumentException | SipException |InvalidArgumentException | ParseException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 澶勭悊MobilePosition绉诲姩浣嶇疆娑堟伅
- *
- * @param evt
- */
- private void processMessageMobilePosition(RequestEvent evt) {
- try {
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- Device device = storager.queryVideoDevice(deviceId);
- if (device == null) {
- logger.warn("澶勭悊MobilePosition绉诲姩浣嶇疆娑堟伅鏃舵湭鎵惧埌璁惧淇℃伅");
- responseAck(evt, Response.NOT_FOUND);
- return;
- }
- Element rootElement = getRootElement(evt, device.getCharset());
-
- MobilePosition mobilePosition = new MobilePosition();
- if (!StringUtils.isEmpty(device.getName())) {
- mobilePosition.setDeviceName(device.getName());
- }
- mobilePosition.setDeviceId(deviceId);
- mobilePosition.setChannelId(getText(rootElement, "DeviceID"));
- mobilePosition.setTime(getText(rootElement, "Time"));
- mobilePosition.setLongitude(Double.parseDouble(getText(rootElement, "Longitude")));
- mobilePosition.setLatitude(Double.parseDouble(getText(rootElement, "Latitude")));
- if (NumericUtil.isDouble(getText(rootElement, "Speed"))) {
- mobilePosition.setSpeed(Double.parseDouble(getText(rootElement, "Speed")));
- } else {
- mobilePosition.setSpeed(0.0);
- }
- if (NumericUtil.isDouble(getText(rootElement, "Direction"))) {
- mobilePosition.setDirection(Double.parseDouble(getText(rootElement, "Direction")));
- } else {
- mobilePosition.setDirection(0.0);
- }
- if (NumericUtil.isDouble(getText(rootElement, "Altitude"))) {
- mobilePosition.setAltitude(Double.parseDouble(getText(rootElement, "Altitude")));
- } else {
- mobilePosition.setAltitude(0.0);
- }
- mobilePosition.setReportSource("Mobile Position");
- BaiduPoint bp = new BaiduPoint();
- bp = GpsUtil.Wgs84ToBd09(String.valueOf(mobilePosition.getLongitude()), String.valueOf(mobilePosition.getLatitude()));
- logger.info("鐧惧害鍧愭爣锛�" + bp.getBdLng() + ", " + bp.getBdLat());
- mobilePosition.setGeodeticSystem("BD-09");
- mobilePosition.setCnLng(bp.getBdLng());
- mobilePosition.setCnLat(bp.getBdLat());
- if (!userSetup.getSavePositionHistory()) {
- storager.clearMobilePositionsByDeviceId(deviceId);
- }
- storager.insertMobilePosition(mobilePosition);
- //鍥炲 200 OK
- responseAck(evt, Response.OK);
- } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 澶勭悊DeviceStatus璁惧鐘舵�丮essage
- *
- * @param evt
- */
- private void processMessageDeviceStatus(RequestEvent evt) {
- try {
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- Device device = storager.queryVideoDevice(deviceId);
- if (device == null) {
- logger.warn("澶勭悊DeviceStatus璁惧鐘舵�丮essage鏃舵湭鎵惧埌璁惧淇℃伅");
- responseAck(evt, Response.NOT_FOUND);
- return;
- }
- Element rootElement = getRootElement(evt);
- String name = rootElement.getName();
- Element deviceIdElement = rootElement.element("DeviceID");
- String channelId = deviceIdElement.getText();
- if (name.equalsIgnoreCase("Query")) { // 鍖哄垎鏄疪esponse鈥斺�旀煡璇㈠搷搴旓紝杩樻槸Query鈥斺�旀煡璇㈣姹�
- logger.info("鎺ユ敹鍒癉eviceStatus鏌ヨ娑堟伅");
- FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
- String platformId = ((SipUri) fromHeader.getAddress().getURI()).getUser();
- if (platformId == null) {
- responseAck(evt, Response.NOT_FOUND);
- return;
- } else {
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- String sn = rootElement.element("SN").getText();
- ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
- cmderFroPlatform.deviceStatusResponse(parentPlatform, sn, fromHeader.getTag());
- }
- } else {
- logger.info("鎺ユ敹鍒癉eviceStatus搴旂瓟娑堟伅");
- // 妫�鏌ヨ澶囨槸鍚﹀瓨鍦紝 涓嶅瓨鍦ㄥ垯涓嶅洖澶�
- if (storager.exists(deviceId)) {
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- JSONObject json = new JSONObject();
- XmlUtil.node2Json(rootElement, json);
- if (logger.isDebugEnabled()) {
- logger.debug(json.toJSONString());
- }
- RequestMessage msg = new RequestMessage();
- msg.setKey(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + deviceId + channelId);
- msg.setData(json);
- deferredResultHolder.invokeAllResult(msg);
-
- if (offLineDetector.isOnline(deviceId)) {
- publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
- } else {
- }
- }
- }
-
- } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 澶勭悊DeviceControl璁惧鐘舵�丮essage
- *
- * @param evt
- */
- private void processMessageDeviceControl(RequestEvent evt) {
- try {
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- Device device = storager.queryVideoDevice(deviceId);
- if (device == null) {
- logger.warn("澶勭悊DeviceControl璁惧鐘舵�丮essage鏈壘鍒拌澶囦俊鎭�");
- responseAck(evt, Response.NOT_FOUND);
- return;
- }
- Element rootElement = getRootElement(evt);
- String channelId = getText(rootElement, "DeviceID");
- //String result = getText(rootElement, "Result");
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- if (rootElement.getName().equals("Response")) {//} !StringUtils.isEmpty(result)) {
- // 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛�
- JSONObject json = new JSONObject();
- XmlUtil.node2Json(rootElement, json);
- if (logger.isDebugEnabled()) {
- logger.debug(json.toJSONString());
- }
- RequestMessage msg = new RequestMessage();
- String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId + channelId;
- msg.setKey(key);
- msg.setData(json);
- deferredResultHolder.invokeAllResult(msg);
- } else {
- // 姝ゅ鏄笂绾у彂鍑虹殑DeviceControl鎸囦护
- String platformId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();
- String targetGBId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
- // 杩滅▼鍚姩鍔熻兘
- if (!StringUtils.isEmpty(getText(rootElement, "TeleBoot"))) {
- if (deviceId.equals(targetGBId)) {
- // 杩滅▼鍚姩鏈钩鍙帮細闇�瑕佸湪閲嶆柊鍚姩绋嬪簭鍚庡厛瀵筍ipStack瑙ｇ粦
- logger.info("鎵ц杩滅▼鍚姩鏈钩鍙板懡浠�");
- ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
- cmderFroPlatform.unregister(parentPlatform, null, null);
-
- Thread restartThread = new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- Thread.sleep(3000);
- SipProvider up = (SipProvider) SpringBeanFactory.getBean("udpSipProvider");
- SipStackImpl stack = (SipStackImpl)up.getSipStack();
- stack.stop();
- Iterator listener = stack.getListeningPoints();
- while (listener.hasNext()) {
- stack.deleteListeningPoint((ListeningPoint) listener.next());
- }
- Iterator providers = stack.getSipProviders();
- while (providers.hasNext()) {
- stack.deleteSipProvider((SipProvider) providers.next());
- }
- VManageBootstrap.restart();
- } catch (InterruptedException ignored) {
- } catch (ObjectInUseException e) {
- e.printStackTrace();
- }
- }
- });
-
- restartThread.setDaemon(false);
- restartThread.start();
- } else {
- // 杩滅▼鍚姩鎸囧畾璁惧
- }
- }
- // 浜戝彴/鍓嶇鎺у埗鍛戒护
- if (!StringUtils.isEmpty(getText(rootElement,"PTZCmd")) && !deviceId.equals(targetGBId)) {
- String cmdString = getText(rootElement,"PTZCmd");
- Device deviceForPlatform = storager.queryVideoDeviceByPlatformIdAndChannelId(platformId, deviceId);
- cmder.fronEndCmd(deviceForPlatform, deviceId, cmdString);
- }
- }
- } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 澶勭悊DeviceConfig璁惧鐘舵�丮essage
- *
- * @param evt
- */
- private void processMessageDeviceConfig(RequestEvent evt) {
- try {
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- // 鏌ヨ璁惧鏄惁瀛樺湪
- Device device = storager.queryVideoDevice(deviceId);
- if (device == null) {
- logger.warn("澶勭悊DeviceConfig璁惧鐘舵�丮essage娑堟伅鏃舵湭鎵惧埌璁惧淇℃伅");
- responseAck(evt, Response.NOT_FOUND);
- return;
- }
- Element rootElement = getRootElement(evt);
- String channelId = getText(rootElement, "DeviceID");
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- if (rootElement.getName().equals("Response")) {
- // 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛�
- JSONObject json = new JSONObject();
- XmlUtil.node2Json(rootElement, json);
- if (logger.isDebugEnabled()) {
- logger.debug(json.toJSONString());
- }
- String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONFIG + deviceId + channelId;
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setData(json);
- deferredResultHolder.invokeAllResult(msg);
- } else {
- // 姝ゅ鏄笂绾у彂鍑虹殑DeviceConfig鎸囦护
- }
- } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 澶勭悊ConfigDownload璁惧鐘舵�丮essage
- *
- * @param evt
- */
- private void processMessageConfigDownload(RequestEvent evt) {
- try {
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- // 鏌ヨ璁惧鏄惁瀛樺湪
- Device device = storager.queryVideoDevice(deviceId);
- if (device == null) {
- logger.warn("澶勭悊ConfigDownload璁惧鐘舵�丮essage鏃舵湭鎵惧埌璁惧淇℃伅");
- responseAck(evt, Response.NOT_FOUND);
- return;
- }
- Element rootElement = getRootElement(evt);
- String channelId = getText(rootElement, "DeviceID");
- String key = DeferredResultHolder.CALLBACK_CMD_CONFIGDOWNLOAD + deviceId + channelId;
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- if (rootElement.getName().equals("Response")) {
- // 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛�
- JSONObject json = new JSONObject();
- XmlUtil.node2Json(rootElement, json);
- if (logger.isDebugEnabled()) {
- logger.debug(json.toJSONString());
- }
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setData(json);
- deferredResultHolder.invokeAllResult(msg);
- } else {
- // 姝ゅ鏄笂绾у彂鍑虹殑DeviceConfig鎸囦护
- }
- } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 澶勭悊PresetQuery棰勭疆浣嶅垪琛∕essage
- *
- * @param evt
- */
- private void processMessagePresetQuery(RequestEvent evt) {
- try {
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- // 鏌ヨ璁惧鏄惁瀛樺湪
- Device device = storager.queryVideoDevice(deviceId);
- if (device == null) {
- logger.warn("澶勭悊PresetQuery棰勭疆浣嶅垪琛∕essage鏃舵湭鎵惧埌璁惧淇℃伅");
- responseAck(evt, Response.NOT_FOUND);
- return;
- }
- Element rootElement = getRootElement(evt);
- String channelId = getText(rootElement, "DeviceID");
- String key = DeferredResultHolder.CALLBACK_CMD_PRESETQUERY + deviceId + channelId;
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- if (rootElement.getName().equals("Response")) {// !StringUtils.isEmpty(result)) {
- // 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛�
- JSONObject json = new JSONObject();
- XmlUtil.node2Json(rootElement, json);
- if (logger.isDebugEnabled()) {
- logger.debug(json.toJSONString());
- }
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setData(json);
- deferredResultHolder.invokeAllResult(msg);
- } else {
- // 姝ゅ鏄笂绾у彂鍑虹殑DeviceControl鎸囦护
- }
- } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 澶勭悊DeviceInfo璁惧淇℃伅Message
- *
- * @param evt
- */
- private void processMessageDeviceInfo(RequestEvent evt) {
- try {
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- // 鏌ヨ璁惧鏄惁瀛樺湪
- Device device = storager.queryVideoDevice(deviceId);
- ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(deviceId);
-
- Element rootElement = getRootElement(evt);
- String requestName = rootElement.getName();
- Element deviceIdElement = rootElement.element("DeviceID");
- String channelId = deviceIdElement.getTextTrim();
- String key = DeferredResultHolder.CALLBACK_CMD_DEVICEINFO + deviceId + channelId;
- if (device != null ) {
- rootElement = getRootElement(evt, device.getCharset());
- }
- if (requestName.equals("Query")) {
- logger.info("鎺ユ敹鍒癉eviceInfo鏌ヨ娑堟伅");
- FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
- if (parentPlatform == null) {
- responseAck(evt, Response.NOT_FOUND);
- return;
- } else {
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- String sn = rootElement.element("SN").getText();
- cmderFroPlatform.deviceInfoResponse(parentPlatform, sn, fromHeader.getTag());
- }
- } else {
- logger.debug("鎺ユ敹鍒癉eviceInfo搴旂瓟娑堟伅");
- if (device == null) {
- logger.warn("澶勭悊DeviceInfo璁惧淇℃伅Message鏃舵湭鎵惧埌璁惧淇℃伅");
- responseAck(evt, Response.NOT_FOUND);
- return;
- }
-
- device.setName(getText(rootElement, "DeviceName"));
-
- device.setManufacturer(getText(rootElement, "Manufacturer"));
- device.setModel(getText(rootElement, "Model"));
- device.setFirmware(getText(rootElement, "Firmware"));
- if (StringUtils.isEmpty(device.getStreamMode())) {
- device.setStreamMode("UDP");
- }
- storager.updateDevice(device);
-
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setData(device);
- deferredResultHolder.invokeAllResult(msg);
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- if (offLineDetector.isOnline(deviceId)) {
- publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
- }
- }
- } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
- e.printStackTrace();
- }
- }
-
- /***
- * 鏀跺埌catalog璁惧鐩綍鍒楄〃璇锋眰 澶勭悊
- *
- * @param evt
- */
- private void processMessageCatalogList(RequestEvent evt) {
- try {
-
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- // 鏌ヨ璁惧鏄惁瀛樺湪
- Device device = storager.queryVideoDevice(deviceId);
- ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(deviceId);
-
-
- Element rootElement = getRootElement(evt);
- String name = rootElement.getName();
- Element deviceIdElement = rootElement.element("DeviceID");
- String channelId = deviceIdElement.getText();
- Element deviceListElement = rootElement.element("DeviceList");
- String key = DeferredResultHolder.CALLBACK_CMD_CATALOG + deviceId;
- FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
- if (name.equalsIgnoreCase("Query")) { // 鍖哄垎鏄疪esponse鈥斺�旀煡璇㈠搷搴旓紝杩樻槸Query鈥斺�旀煡璇㈣姹�
- // TODO 鍚庣画灏嗕唬鐮佹媶鍒�
- if (parentPlatform == null) {
- responseAck(evt, Response.NOT_FOUND);
- return;
- } else {
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
-
- Element snElement = rootElement.element("SN");
- String sn = snElement.getText();
- // 鍑嗗鍥炲閫氶亾淇℃伅
- List<ChannelReduce> channelReduces = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId());
- // 鏌ヨ鍏宠仈鐨勭洿鎾�氶亾
- List<GbStream> gbStreams = storager.queryGbStreamListInPlatform(parentPlatform.getServerGBId());
- int size = channelReduces.size() + gbStreams.size();
- // 鍥炲绾ц仈鐨勯�氶亾
- if (channelReduces.size() > 0) {
- for (ChannelReduce channelReduce : channelReduces) {
- DeviceChannel deviceChannel = storager.queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());
- cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
- }
- }
- // 鍥炲鐩存挱鐨勯�氶亾
- if (gbStreams.size() > 0) {
- for (GbStream gbStream : gbStreams) {
- DeviceChannel deviceChannel = new DeviceChannel();
- deviceChannel.setChannelId(gbStream.getGbId());
- deviceChannel.setName(gbStream.getName());
- deviceChannel.setLongitude(gbStream.getLongitude());
- deviceChannel.setLatitude(gbStream.getLatitude());
- deviceChannel.setDeviceId(parentPlatform.getDeviceGBId());
- deviceChannel.setManufacture("wvp-pro");
- deviceChannel.setStatus(gbStream.isStatus()?1:0);
-// deviceChannel.setParentId(parentPlatform.getDeviceGBId());
- deviceChannel.setRegisterWay(1);
- deviceChannel.setCivilCode(config.getDomain());
- deviceChannel.setModel("live");
- deviceChannel.setOwner("wvp-pro");
-// deviceChannel.setAddress("test");
- deviceChannel.setParental(0);
- deviceChannel.setSecrecy("0");
- deviceChannel.setSecrecy("0");
-
- cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
- }
- }
- if (size == 0) {
- // 鍥炲鏃犻�氶亾
- cmderFroPlatform.catalogQuery(null, parentPlatform, sn, fromHeader.getTag(), size);
- }
- }
-
-
- } else {
- if (device == null) {
- logger.warn("鏀跺埌catalog璁惧鐩綍鍒楄〃璇锋眰鏃舵湭鎵惧埌璁惧淇℃伅");
- responseAck(evt, Response.NOT_FOUND);
- return;
- }
- deviceListElement = getRootElement(evt, device.getCharset()).element("DeviceList");
- Iterator<Element> deviceListIterator = deviceListElement.elementIterator();
- if (deviceListIterator != null) {
-
- // 閬嶅巻DeviceList
- while (deviceListIterator.hasNext()) {
- Element itemDevice = deviceListIterator.next();
- Element channelDeviceElement = itemDevice.element("DeviceID");
- if (channelDeviceElement == null) {
- continue;
- }
- String channelDeviceId = channelDeviceElement.getText();
- Element channdelNameElement = itemDevice.element("Name");
- String channelName = channdelNameElement != null ? channdelNameElement.getTextTrim().toString() : "";
- Element statusElement = itemDevice.element("Status");
- String status = statusElement != null ? statusElement.getText().toString() : "ON";
- DeviceChannel deviceChannel = new DeviceChannel();
- deviceChannel.setName(channelName);
- deviceChannel.setChannelId(channelDeviceId);
- // ONLINE OFFLINE HIKVISION DS-7716N-E4 NVR鐨勫吋瀹规�у鐞�
- if (status.equals("ON") || status.equals("On") || status.equals("ONLINE")) {
- deviceChannel.setStatus(1);
- }
- if (status.equals("OFF") || status.equals("Off") || status.equals("OFFLINE")) {
- deviceChannel.setStatus(0);
- }
-
- deviceChannel.setManufacture(getText(itemDevice, "Manufacturer"));
- deviceChannel.setModel(getText(itemDevice, "Model"));
- deviceChannel.setOwner(getText(itemDevice, "Owner"));
- deviceChannel.setCivilCode(getText(itemDevice, "CivilCode"));
- deviceChannel.setBlock(getText(itemDevice, "Block"));
- deviceChannel.setAddress(getText(itemDevice, "Address"));
- if (getText(itemDevice, "Parental") == null || getText(itemDevice, "Parental") == "") {
- deviceChannel.setParental(0);
- } else {
- deviceChannel.setParental(Integer.parseInt(getText(itemDevice, "Parental")));
- }
- deviceChannel.setParentId(getText(itemDevice, "ParentID"));
- if (getText(itemDevice, "SafetyWay") == null || getText(itemDevice, "SafetyWay") == "") {
- deviceChannel.setSafetyWay(0);
- } else {
- deviceChannel.setSafetyWay(Integer.parseInt(getText(itemDevice, "SafetyWay")));
- }
- if (getText(itemDevice, "RegisterWay") == null || getText(itemDevice, "RegisterWay") == "") {
- deviceChannel.setRegisterWay(1);
- } else {
- deviceChannel.setRegisterWay(Integer.parseInt(getText(itemDevice, "RegisterWay")));
- }
- deviceChannel.setCertNum(getText(itemDevice, "CertNum"));
- if (getText(itemDevice, "Certifiable") == null || getText(itemDevice, "Certifiable") == "") {
- deviceChannel.setCertifiable(0);
- } else {
- deviceChannel.setCertifiable(Integer.parseInt(getText(itemDevice, "Certifiable")));
- }
- if (getText(itemDevice, "ErrCode") == null || getText(itemDevice, "ErrCode") == "") {
- deviceChannel.setErrCode(0);
- } else {
- deviceChannel.setErrCode(Integer.parseInt(getText(itemDevice, "ErrCode")));
- }
- deviceChannel.setEndTime(getText(itemDevice, "EndTime"));
- deviceChannel.setSecrecy(getText(itemDevice, "Secrecy"));
- deviceChannel.setIpAddress(getText(itemDevice, "IPAddress"));
- if (getText(itemDevice, "Port") == null || getText(itemDevice, "Port") == "") {
- deviceChannel.setPort(0);
- } else {
- deviceChannel.setPort(Integer.parseInt(getText(itemDevice, "Port")));
- }
- deviceChannel.setPassword(getText(itemDevice, "Password"));
- if (NumericUtil.isDouble(getText(itemDevice, "Longitude"))) {
- deviceChannel.setLongitude(Double.parseDouble(getText(itemDevice, "Longitude")));
- } else {
- deviceChannel.setLongitude(0.00);
- }
- if (NumericUtil.isDouble(getText(itemDevice, "Latitude"))) {
- deviceChannel.setLatitude(Double.parseDouble(getText(itemDevice, "Latitude")));
- } else {
- deviceChannel.setLatitude(0.00);
- }
- if (getText(itemDevice, "PTZType") == null || getText(itemDevice, "PTZType") == "") {
- deviceChannel.setPTZType(0);
- } else {
- deviceChannel.setPTZType(Integer.parseInt(getText(itemDevice, "PTZType")));
- }
- deviceChannel.setHasAudio(true); // 榛樿鍚湁闊抽锛屾挱鏀炬椂鍐嶆鏌ユ槸鍚︽湁闊抽鍙婃槸鍚AC
- storager.updateChannel(device.getDeviceId(), deviceChannel);
- }
-
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setData(device);
- deferredResultHolder.invokeAllResult(msg);
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- if (offLineDetector.isOnline(deviceId)) {
- publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
- }
- }
- }
- } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
- e.printStackTrace();
- }
- }
-
- /***
- * 鏀跺埌alarm璁惧鎶ヨ淇℃伅 澶勭悊
- *
- * @param evt
- */
- private void processMessageAlarm(RequestEvent evt) {
- try {
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- Device device = storager.queryVideoDevice(deviceId);
- if (device == null) {
- logger.warn("澶勭悊alarm璁惧鎶ヨ淇℃伅鏈壘鍒拌澶囦俊鎭�");
- responseAck(evt, Response.NOT_FOUND);
- return;
- }
- Element rootElement = getRootElement(evt, device.getCharset());
- Element deviceIdElement = rootElement.element("DeviceID");
- String channelId = deviceIdElement.getText().toString();
- String key = DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId + channelId;
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
-
- if (device.getCharset() != null) {
- rootElement = getRootElement(evt, device.getCharset());
- }
-
- if (rootElement.getName().equals("Notify")) { // 澶勭悊鎶ヨ閫氱煡
- DeviceAlarm deviceAlarm = new DeviceAlarm();
- deviceAlarm.setDeviceId(deviceId);
- deviceAlarm.setChannelId(channelId);
- deviceAlarm.setAlarmPriority(getText(rootElement, "AlarmPriority"));
- deviceAlarm.setAlarmMethod(getText(rootElement, "AlarmMethod"));
- deviceAlarm.setAlarmTime(getText(rootElement, "AlarmTime"));
- if (getText(rootElement, "AlarmDescription") == null) {
- deviceAlarm.setAlarmDescription("");
- } else {
- deviceAlarm.setAlarmDescription(getText(rootElement, "AlarmDescription"));
- }
- if (NumericUtil.isDouble(getText(rootElement, "Longitude"))) {
- deviceAlarm.setLongitude(Double.parseDouble(getText(rootElement, "Longitude")));
- } else {
- deviceAlarm.setLongitude(0.00);
- }
- if (NumericUtil.isDouble(getText(rootElement, "Latitude"))) {
- deviceAlarm.setLatitude(Double.parseDouble(getText(rootElement, "Latitude")));
- } else {
- deviceAlarm.setLatitude(0.00);
- }
-
- if (!StringUtils.isEmpty(deviceAlarm.getAlarmMethod())) {
- if ( deviceAlarm.getAlarmMethod().equals("4")) {
- MobilePosition mobilePosition = new MobilePosition();
- mobilePosition.setDeviceId(deviceAlarm.getDeviceId());
- mobilePosition.setTime(deviceAlarm.getAlarmTime());
- mobilePosition.setLongitude(deviceAlarm.getLongitude());
- mobilePosition.setLatitude(deviceAlarm.getLatitude());
- mobilePosition.setReportSource("GPS Alarm");
- BaiduPoint bp = new BaiduPoint();
- bp = GpsUtil.Wgs84ToBd09(String.valueOf(mobilePosition.getLongitude()), String.valueOf(mobilePosition.getLatitude()));
- logger.info("鐧惧害鍧愭爣锛�" + bp.getBdLng() + ", " + bp.getBdLat());
- mobilePosition.setGeodeticSystem("BD-09");
- mobilePosition.setCnLng(bp.getBdLng());
- mobilePosition.setCnLat(bp.getBdLat());
- if (!userSetup.getSavePositionHistory()) {
- storager.clearMobilePositionsByDeviceId(deviceId);
- }
- storager.insertMobilePosition(mobilePosition);
- }
- }
- logger.debug("瀛樺偍鎶ヨ淇℃伅銆佹姤璀﹀垎绫�");
- // 瀛樺偍鎶ヨ淇℃伅銆佹姤璀﹀垎绫�
- deviceAlarmService.add(deviceAlarm);
-
- if (offLineDetector.isOnline(deviceId)) {
- publisher.deviceAlarmEventPublish(deviceAlarm);
- }
- } else if (rootElement.getName().equals("Response")) { // 澶勭悊鎶ヨ鏌ヨ鍝嶅簲
- JSONObject json = new JSONObject();
- XmlUtil.node2Json(rootElement, json);
- if (logger.isDebugEnabled()) {
- logger.debug(json.toJSONString());
- }
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setData(json);
- deferredResultHolder.invokeAllResult(msg);
- }
- } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
- e.printStackTrace();
- }
- }
-
- /***
- * 鏀跺埌keepalive璇锋眰 澶勭悊
- *
- * @param evt
- */
- private void processMessageKeepAlive(RequestEvent evt) {
- try {
-
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- // 鏌ヨ璁惧鏄惁瀛樺湪
- Device device = storager.queryVideoDevice(deviceId);
-
- Element rootElement = getRootElement(evt);
- String channelId = getText(rootElement, "DeviceID");
-
- // 妫�鏌ヨ澶囨槸鍚﹀瓨鍦ㄥ苟鍦ㄧ嚎锛� 涓嶅湪绾垮垯璁剧疆涓哄湪绾�
- if (device != null ) {
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
- }else{
- logger.warn("鏀跺埌[ "+deviceId+" ]蹇冭烦淇℃伅, 浣嗘槸璁惧涓嶅瓨鍦�, 鍥炲404");
- Response response = getMessageFactory().createResponse(Response.NOT_FOUND, evt.getRequest());
- ServerTransaction serverTransaction = getServerTransaction(evt);
- serverTransaction.sendResponse(response);
- if (serverTransaction.getDialog() != null) {
- serverTransaction.getDialog().delete();
- }
- }
-
-// if (device != null && device.getOnline() == 1) {
-//
-// if (offLineDetector.isOnline(deviceId)) {
-// publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
-// } else {
-// }
-// }else {
-//// logger.warn("鏀跺埌[ "+deviceId+" ]蹇冭烦淇℃伅, 浣嗘槸璁惧" + (device == null? "涓嶅瓨鍦�":"绂荤嚎") + ", 鍥炲401");
-//// Response response = getMessageFactory().createResponse(Response.UNAUTHORIZED, evt.getRequest());
-//// getServerTransaction(evt).sendResponse(response);
-// publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
-//
-// }
- } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
- e.printStackTrace();
- }
- }
-
- /***
- * 澶勭悊RecordInfo璁惧褰曞儚鍒楄〃Message璇锋眰 TODO 杩囨湡鏃堕棿鏆傛椂鍐欐180绉掞紝鍚庣画涓嶥eferredResult瓒呮椂鏃堕棿淇濇寔涓�鑷�
- *
- * @param evt
- */
- private void processMessageRecordInfo(RequestEvent evt) {
- try {
-
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- // 鏌ヨ璁惧鏄惁瀛樺湪
- Device device = storager.queryVideoDevice(deviceId);
- if (device == null) {
- logger.warn("澶勭悊DeviceInfo璁惧淇℃伅Message鏃舵湭鎵惧埌璁惧淇℃伅");
- responseAck(evt, Response.NOT_FOUND);
- return;
- }
-
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- String uuid = UUID.randomUUID().toString().replace("-", "");
- RecordInfo recordInfo = new RecordInfo();
- Element rootElement = getRootElement(evt);
- String sn = getText(rootElement, "SN");
- String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + sn;
- if (device != null ) {
- rootElement = getRootElement(evt, device.getCharset());
- }
- recordInfo.setDeviceId(deviceId);
- recordInfo.setSn(sn);
- recordInfo.setName(getText(rootElement, "Name"));
- if (getText(rootElement, "SumNum")== null || getText(rootElement, "SumNum") =="") {
- recordInfo.setSumNum(0);
- } else {
- recordInfo.setSumNum(Integer.parseInt(getText(rootElement, "SumNum")));
- }
-
- Element recordListElement = rootElement.element("RecordList");
- if (recordListElement == null || recordInfo.getSumNum() == 0) {
- logger.info("鏃犲綍鍍忔暟鎹�");
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setData(recordInfo);
- deferredResultHolder.invokeAllResult(msg);
- } else {
- Iterator<Element> recordListIterator = recordListElement.elementIterator();
- List<RecordItem> recordList = new ArrayList<RecordItem>();
- if (recordListIterator != null) {
- RecordItem record = new RecordItem();
- logger.info("澶勭悊褰曞儚鍒楄〃鏁版嵁...");
- // 閬嶅巻DeviceList
- while (recordListIterator.hasNext()) {
- Element itemRecord = recordListIterator.next();
- Element recordElement = itemRecord.element("DeviceID");
- if (recordElement == null) {
- logger.info("璁板綍涓虹┖锛屼笅涓�涓�...");
- continue;
- }
- record = new RecordItem();
- record.setDeviceId(getText(itemRecord, "DeviceID"));
- record.setName(getText(itemRecord, "Name"));
- record.setFilePath(getText(itemRecord, "FilePath"));
- record.setAddress(getText(itemRecord, "Address"));
- record.setStartTime(
- DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(getText(itemRecord, "StartTime")));
- record.setEndTime(
- DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(getText(itemRecord, "EndTime")));
- record.setSecrecy(itemRecord.element("Secrecy") == null ? 0
- : Integer.parseInt(getText(itemRecord, "Secrecy")));
- record.setType(getText(itemRecord, "Type"));
- record.setRecorderId(getText(itemRecord, "RecorderID"));
- recordList.add(record);
- }
- recordInfo.setRecordList(recordList);
- }
-
- // 鏀圭敤鍗曠嫭绾跨▼缁熻宸茶幏鍙栧綍鍍忔枃浠舵暟閲忥紝閬垮厤澶氬寘骞惰鍒嗗埆缁熻涓嶅畬鏁寸殑闂
- String cacheKey = CACHE_RECORDINFO_KEY + deviceId + sn;
- redis.set(cacheKey + "_" + uuid, recordList, 90);
- if (!threadNameList.contains(cacheKey)) {
- threadNameList.add(cacheKey);
- CheckForAllRecordsThread chk = new CheckForAllRecordsThread(cacheKey, recordInfo);
- chk.setName(cacheKey);
- chk.setDeferredResultHolder(deferredResultHolder);
- chk.setRedis(redis);
- chk.setLogger(logger);
- chk.start();
- if (logger.isDebugEnabled()) {
- logger.debug("Start Thread " + cacheKey + ".");
- }
- } else {
- if (logger.isDebugEnabled()) {
- logger.debug("Thread " + cacheKey + " already started.");
- }
- }
-
- // 瀛樺湪褰曞儚涓斿鏋滃綋鍓嶅綍鍍忔槑缁嗕釜鏁板皬浜庢�绘潯鏁帮紝璇存槑鎷嗗寘杩斿洖锛岄渶瑕佺粍瑁咃紝鏆備笉杩斿洖
- // if (recordInfo.getSumNum() > 0 && recordList.size() > 0 && recordList.size() < recordInfo.getSumNum()) {
- // // 涓洪槻姝㈣繛缁姹傝璁惧鐨勫綍鍍忔暟鎹紝杩斿洖鏁版嵁閿欎贡锛岀壒澧炲姞sn杩涜鍖哄垎
- // String cacheKey = CACHE_RECORDINFO_KEY + deviceId + sn;
-
- // redis.set(cacheKey + "_" + uuid, recordList, 90);
- // List<Object> cacheKeys = redis.scan(cacheKey + "_*");
- // List<RecordItem> totalRecordList = new ArrayList<RecordItem>();
- // for (int i = 0; i < cacheKeys.size(); i++) {
- // totalRecordList.addAll((List<RecordItem>) redis.get(cacheKeys.get(i).toString()));
- // }
- // if (totalRecordList.size() < recordInfo.getSumNum()) {
- // logger.info("宸茶幏鍙�" + totalRecordList.size() + "椤瑰綍鍍忔暟鎹紝鍏�" + recordInfo.getSumNum() + "椤�");
- // return;
- // }
- // logger.info("褰曞儚鏁版嵁宸插叏閮ㄨ幏鍙栵紝鍏�" + recordInfo.getSumNum() + "椤�");
- // recordInfo.setRecordList(totalRecordList);
- // for (int i = 0; i < cacheKeys.size(); i++) {
- // redis.del(cacheKeys.get(i).toString());
- // }
- // }
- // // 鑷劧椤哄簭鎺掑簭, 鍏冪礌杩涜鍗囧簭鎺掑垪
- // recordInfo.getRecordList().sort(Comparator.naturalOrder());
- }
- // 璧板埌杩欓噷锛屾湁浠ヤ笅鍙兘锛�1銆佹病鏈夊綍鍍忎俊鎭�,绗竴娆℃敹鍒皉ecordinfo鐨勬秷鎭嵆杩斿洖鍝嶅簲鏁版嵁锛屾棤redis鎿嶄綔
- // 2銆佹湁褰曞儚鏁版嵁锛屼笖绗竴娆″嵆鏀跺埌瀹屾暣鏁版嵁锛岃繑鍥炲搷搴旀暟鎹紝鏃爎edis鎿嶄綔
- // 3銆佹湁褰曞儚鏁版嵁锛屽湪瓒呮椂鏃堕棿鍐呮敹鍒板娆″寘缁勮鍚庢暟閲忚冻澶燂紝杩斿洖鏁版嵁
-
- // RequestMessage msg = new RequestMessage();
- // msg.setDeviceId(deviceId);
- // msg.setType(DeferredResultHolder.CALLBACK_CMD_RECORDINFO);
- // msg.setData(recordInfo);
- // deferredResultHolder.invokeResult(msg);
- // logger.info("澶勭悊瀹屾垚锛岃繑鍥炵粨鏋�");
- } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 鏀跺埌MediaStatus娑堟伅澶勭悊
- *
- * @param evt
- */
- private void processMessageMediaStatus(RequestEvent evt){
- try {
-
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- // 鏌ヨ璁惧鏄惁瀛樺湪
- Device device = storager.queryVideoDevice(deviceId);
- if (device == null) {
- logger.warn("澶勭悊DeviceInfo璁惧淇℃伅Message鏃舵湭鎵惧埌璁惧淇℃伅");
- responseAck(evt, Response.NOT_FOUND);
- return;
- }
-
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- Element rootElement = getRootElement(evt);
- String channelId = getText(rootElement, "DeviceID");
- String NotifyType =getText(rootElement, "NotifyType");
- if (NotifyType.equals("121")){
- logger.info("濯掍綋鎾斁瀹屾瘯锛岄�氱煡鍏虫祦");
- StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, "*");
- if (streamInfo != null) {
- redisCatchStorage.stopPlayback(streamInfo);
- cmder.streamByeCmd(streamInfo.getDeviceID(), streamInfo.getChannelId());
- }
- }
- } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 澶勭悊AudioBroadcast璇煶骞挎挱Message
- *
- * @param evt
- */
- private void processMessageBroadcast(RequestEvent evt) {
- try {
-
- String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- // 鏌ヨ璁惧鏄惁瀛樺湪
- Device device = storager.queryVideoDevice(deviceId);
- if (device == null) {
- logger.warn("澶勭悊DeviceInfo璁惧淇℃伅Message鏃舵湭鎵惧埌璁惧淇℃伅");
- responseAck(evt, Response.NOT_FOUND);
- return;
- }
-
- Element rootElement = getRootElement(evt);
- String channelId = getText(rootElement, "DeviceID");
- String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId + channelId;
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
- if (rootElement.getName().equals("Response")) {
- // 姝ゅ鏄鏈钩鍙板彂鍑築roadcast鎸囦护鐨勫簲绛�
- JSONObject json = new JSONObject();
- XmlUtil.node2Json(rootElement, json);
- if (logger.isDebugEnabled()) {
- logger.debug(json.toJSONString());
- }
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setData(json);
- deferredResultHolder.invokeAllResult(msg);
- } else {
- // 姝ゅ鏄笂绾у彂鍑虹殑Broadcast鎸囦护
- }
- } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
- e.printStackTrace();
- }
- }
-}
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 faa3924..74b63c8 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;
@@ -48,6 +49,9 @@
@Autowired
private IVideoManagerStorager storager;
+
+ @Autowired
+ private SipConfig sipConfig;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -156,6 +160,9 @@
* @param evt
*/
private void processNotifyAlarm(RequestEvent evt) {
+ if (!sipConfig.isAlarm()) {
+ return;
+ }
try {
Element rootElement = getRootElement(evt);
Element deviceIdElement = rootElement.element("DeviceID");
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
index 511083c..a46b003 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;
+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;
@@ -39,6 +40,9 @@
private UserSetup userSetup;
@Autowired
+ private SipConfig sipConfig;
+
+ @Autowired
private IVideoManagerStorager storager;
@Autowired
@@ -54,6 +58,9 @@
@Override
public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
+ if (!sipConfig.isAlarm()) {
+ return;
+ }
Element deviceIdElement = rootElement.element("DeviceID");
String channelId = deviceIdElement.getText().toString();
DeviceAlarm deviceAlarm = new DeviceAlarm();
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index 3e7d5c4..3339676 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -6,6 +6,7 @@
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.session.SsrcConfig;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
@@ -52,7 +53,7 @@
private Integer serverPort;
@Autowired
- private MediaConfig mediaConfig;
+ private UserSetup userSetup;
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
@@ -89,10 +90,10 @@
if (mediaServerItem.getSsrcConfig() == null) {
SsrcConfig ssrcConfig = new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain());
mediaServerItem.setSsrcConfig(ssrcConfig);
- redisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerItem.getId(), mediaServerItem);
+ redisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + mediaServerItem.getId(), mediaServerItem);
}
// 鏌ヨredis鏄惁瀛樺湪姝ediaServer
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerItem.getId();
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + mediaServerItem.getId();
if (!redisUtil.hasKey(key)) {
redisUtil.set(key, mediaServerItem);
}
@@ -110,7 +111,7 @@
return null;
}
// 鑾峰彇mediaServer鍙敤鐨剆src
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerItem.getId();
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + mediaServerItem.getId();
SsrcConfig ssrcConfig = mediaServerItem.getSsrcConfig();
if (ssrcConfig == null) {
@@ -156,7 +157,7 @@
SsrcConfig ssrcConfig = mediaServerItem.getSsrcConfig();
ssrcConfig.releaseSsrc(ssrc);
mediaServerItem.setSsrcConfig(ssrcConfig);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerItem.getId();
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + mediaServerItem.getId();
redisUtil.set(key, mediaServerItem);
}
@@ -166,7 +167,7 @@
@Override
public void clearRTPServer(MediaServerItem mediaServerItem) {
mediaServerItem.setSsrcConfig(new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain()));
- redisUtil.zAdd(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX, mediaServerItem.getId(), 0);
+ redisUtil.zAdd(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetup.getServerId(), mediaServerItem.getId(), 0);
}
@@ -186,15 +187,15 @@
)
);
}
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerItemInDataBase.getId();
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + mediaServerItemInDataBase.getId();
redisUtil.set(key, mediaServerItemInDataBase);
}
@Override
public List<MediaServerItem> getAll() {
List<MediaServerItem> result = new ArrayList<>();
- List<Object> mediaServerKeys = redisUtil.scan(String.format("%S*", VideoManagerConstants.MEDIA_SERVER_PREFIX));
- String onlineKey = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ List<Object> mediaServerKeys = redisUtil.scan(String.format("%S*", VideoManagerConstants.MEDIA_SERVER_PREFIX+ userSetup.getServerId() + "_" ));
+ String onlineKey = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetup.getServerId();
for (Object mediaServerKey : mediaServerKeys) {
String key = (String) mediaServerKey;
MediaServerItem mediaServerItem = (MediaServerItem) redisUtil.get(key);
@@ -224,12 +225,12 @@
@Override
public List<MediaServerItem> getAllOnline() {
- String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetup.getServerId();
Set<String> mediaServerIdSet = redisUtil.zRevRange(key, 0, -1);
List<MediaServerItem> result = new ArrayList<>();
if (mediaServerIdSet != null && mediaServerIdSet.size() > 0) {
for (String mediaServerId : mediaServerIdSet) {
- String serverKey = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerId;
+ String serverKey = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + mediaServerId;
result.add((MediaServerItem) redisUtil.get(serverKey));
}
}
@@ -246,7 +247,7 @@
if (mediaServerId == null) {
return null;
}
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + mediaServerId;
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + mediaServerId;
return (MediaServerItem)redisUtil.get(key);
}
@@ -262,7 +263,7 @@
@Override
public void clearMediaServerForOnline() {
- String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetup.getServerId();
redisUtil.del(key);
}
@@ -324,10 +325,10 @@
if (StringUtils.isEmpty(serverItem.getId())) {
serverItem.setId(zlmServerConfig.getGeneralMediaServerId());
}
- if (redisUtil.get(VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId()) == null) {
+ if (redisUtil.get(VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + serverItem.getId()) == null) {
SsrcConfig ssrcConfig = new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain());
serverItem.setSsrcConfig(ssrcConfig);
- redisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId(), serverItem);
+ redisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + serverItem.getId(), serverItem);
}
serverItem.setStatus(true);
@@ -405,7 +406,7 @@
@Override
public void resetOnlineServerItem(MediaServerItem serverItem) {
// 鏇存柊缂撳瓨
- String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetup.getServerId();
// 浣跨敤zset鐨勫垎鏁颁綔涓哄綋鍓嶅苟鍙戦噺锛� 榛樿鍊艰缃负0
if (redisUtil.zScore(key, serverItem.getId()) == null) { // 涓嶅瓨鍦ㄥ垯璁剧疆榛樿鍊� 宸插瓨鍦ㄥ垯閲嶇疆
redisUtil.zAdd(key, serverItem.getId(), 0L);
@@ -431,14 +432,14 @@
if (mediaServerId == null) {
return;
}
- String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetup.getServerId();
redisUtil.zIncrScore(key, mediaServerId, 1);
}
@Override
public void removeCount(String mediaServerId) {
- String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetup.getServerId();
redisUtil.zIncrScore(key, mediaServerId, - 1);
}
@@ -448,7 +449,7 @@
*/
@Override
public MediaServerItem getMediaServerForMinimumLoad() {
- String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
+ String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetup.getServerId();
if (redisUtil.zSize(key) == null || redisUtil.zSize(key) == 0) {
logger.info("鑾峰彇璐熻浇鏈�浣庣殑鑺傜偣鏃舵棤鍦ㄧ嚎鑺傜偣");
@@ -580,8 +581,8 @@
@Override
public void delete(String id) {
- redisUtil.zRemove(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX, id);
- String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + id;
+ redisUtil.zRemove(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetup.getServerId() + "_", id);
+ String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + id;
redisUtil.del(key);
mediaServerMapper.delOne(id);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
index 172213d..3314fb2 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -121,7 +121,7 @@
/**
* 鍦╮edis娣诲姞wvp鐨勪俊鎭�
*/
- void updateWVPInfo(String id, JSONObject jsonObject, int time);
+ void updateWVPInfo(JSONObject jsonObject, int time);
/**
* 鍙戦�佹帹娴佺敓鎴愪笌鎺ㄦ祦娑堝け娑堟伅
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
index 835f942..c008d1e 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -41,7 +41,7 @@
*/
@Override
public boolean startPlay(StreamInfo stream) {
- return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, stream.getStreamId(),stream.getDeviceID(), stream.getChannelId()),
+ return redis.set(String.format("%S_%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, userSetup.getServerId(), stream.getStreamId(),stream.getDeviceID(), stream.getChannelId()),
stream);
}
@@ -53,7 +53,8 @@
@Override
public boolean stopPlay(StreamInfo streamInfo) {
if (streamInfo == null) return false;
- return redis.del(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
+ return redis.del(String.format("%S_%s_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
+ userSetup.getServerId(),
streamInfo.getStreamId(),
streamInfo.getDeviceID(),
streamInfo.getChannelId()));
@@ -65,22 +66,23 @@
*/
@Override
public StreamInfo queryPlay(StreamInfo streamInfo) {
- return (StreamInfo)redis.get(String.format("%S_%s_%s_%s",
+ return (StreamInfo)redis.get(String.format("%S_%s_%s_%s_%s",
VideoManagerConstants.PLAYER_PREFIX,
+ userSetup.getServerId(),
streamInfo.getStreamId(),
streamInfo.getDeviceID(),
streamInfo.getChannelId()));
}
@Override
public StreamInfo queryPlayByStreamId(String streamId) {
- List<Object> playLeys = redis.scan(String.format("%S_%s_*", VideoManagerConstants.PLAYER_PREFIX, streamId));
+ List<Object> playLeys = redis.scan(String.format("%S_%s_%s_*", VideoManagerConstants.PLAYER_PREFIX, userSetup.getServerId(), streamId));
if (playLeys == null || playLeys.size() == 0) return null;
return (StreamInfo)redis.get(playLeys.get(0).toString());
}
@Override
public StreamInfo queryPlaybackByStreamId(String streamId) {
- List<Object> playLeys = redis.scan(String.format("%S_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX, streamId));
+ List<Object> playLeys = redis.scan(String.format("%S_%s_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX, userSetup.getServerId(), streamId));
if (playLeys == null || playLeys.size() == 0) return null;
return (StreamInfo)redis.get(playLeys.get(0).toString());
}
@@ -88,7 +90,8 @@
@Override
public StreamInfo queryPlayByDevice(String deviceId, String channelId) {
// List<Object> playLeys = redis.keys(String.format("%S_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
- List<Object> playLeys = redis.scan(String.format("%S_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
+ List<Object> playLeys = redis.scan(String.format("%S_%s_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
+ userSetup.getServerId(),
deviceId,
channelId));
if (playLeys == null || playLeys.size() == 0) return null;
@@ -99,7 +102,7 @@
public Map<String, StreamInfo> queryPlayByDeviceId(String deviceId) {
Map<String, StreamInfo> streamInfos = new HashMap<>();
// List<Object> playLeys = redis.keys(String.format("%S_*_%S_*", VideoManagerConstants.PLAYER_PREFIX, deviceId));
- List<Object> players = redis.scan(String.format("%S_*_%S_*", VideoManagerConstants.PLAYER_PREFIX, deviceId));
+ List<Object> players = redis.scan(String.format("%S_%s_*_%S_*", VideoManagerConstants.PLAYER_PREFIX, userSetup.getServerId(),deviceId));
if (players.size() == 0) return streamInfos;
for (int i = 0; i < players.size(); i++) {
String key = (String) players.get(i);
@@ -112,13 +115,13 @@
@Override
public boolean startPlayback(StreamInfo stream) {
- return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, stream.getStreamId(),
+ return redis.set(String.format("%S_%s_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, userSetup.getServerId(),stream.getStreamId(),
stream.getDeviceID(), stream.getChannelId()), stream);
}
@Override
public boolean startDownload(StreamInfo streamInfo) {
- return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.DOWNLOAD_PREFIX, streamInfo.getStreamId(),
+ return redis.set(String.format("%S_%s_%s_%s_%s", VideoManagerConstants.DOWNLOAD_PREFIX, userSetup.getServerId(),streamInfo.getStreamId(),
streamInfo.getDeviceID(), streamInfo.getChannelId()), streamInfo);
}
@@ -131,7 +134,8 @@
deviceChannel.setDeviceId(streamInfo.getDeviceID());
deviceChannelMapper.update(deviceChannel);
}
- return redis.del(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ return redis.del(String.format("%S_%s_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ userSetup.getServerId(),
streamInfo.getStreamId(),
streamInfo.getDeviceID(),
streamInfo.getChannelId()));
@@ -142,11 +146,13 @@
// String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
// deviceId,
// code);
- List<Object> playLeys = redis.scan(String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ List<Object> playLeys = redis.scan(String.format("%S_%s_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ userSetup.getServerId(),
deviceId,
code));
if (playLeys == null || playLeys.size() == 0) {
- playLeys = redis.scan(String.format("%S_*_*_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ playLeys = redis.scan(String.format("%S_%s_*_*_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ userSetup.getServerId(),
deviceId));
}
if (playLeys == null || playLeys.size() == 0) return null;
@@ -155,63 +161,63 @@
@Override
public void updatePlatformCatchInfo(ParentPlatformCatch parentPlatformCatch) {
- String key = VideoManagerConstants.PLATFORM_CATCH_PREFIX + parentPlatformCatch.getId();
+ String key = VideoManagerConstants.PLATFORM_CATCH_PREFIX + userSetup.getServerId() + "_" + parentPlatformCatch.getId();
redis.set(key, parentPlatformCatch);
}
@Override
public void updatePlatformKeepalive(ParentPlatform parentPlatform) {
- String key = VideoManagerConstants.PLATFORM_KEEPLIVEKEY_PREFIX + parentPlatform.getServerGBId();
+ String key = VideoManagerConstants.PLATFORM_KEEPALIVE_PREFIX + userSetup.getServerId() + "_" + parentPlatform.getServerGBId();
redis.set(key, "", Integer.parseInt(parentPlatform.getKeepTimeout()));
}
@Override
public void updatePlatformRegister(ParentPlatform parentPlatform) {
- String key = VideoManagerConstants.PLATFORM_REGISTER_PREFIX + parentPlatform.getServerGBId();
+ String key = VideoManagerConstants.PLATFORM_REGISTER_PREFIX + userSetup.getServerId() + "_" + parentPlatform.getServerGBId();
redis.set(key, "", Integer.parseInt(parentPlatform.getExpires()));
}
@Override
public ParentPlatformCatch queryPlatformCatchInfo(String platformGbId) {
- return (ParentPlatformCatch)redis.get(VideoManagerConstants.PLATFORM_CATCH_PREFIX + platformGbId);
+ return (ParentPlatformCatch)redis.get(VideoManagerConstants.PLATFORM_CATCH_PREFIX + userSetup.getServerId() + "_" + platformGbId);
}
@Override
public void delPlatformCatchInfo(String platformGbId) {
- redis.del(VideoManagerConstants.PLATFORM_CATCH_PREFIX + platformGbId);
+ redis.del(VideoManagerConstants.PLATFORM_CATCH_PREFIX + userSetup.getServerId() + "_" + platformGbId);
}
@Override
public void delPlatformKeepalive(String platformGbId) {
- redis.del(VideoManagerConstants.PLATFORM_KEEPLIVEKEY_PREFIX + platformGbId);
+ redis.del(VideoManagerConstants.PLATFORM_KEEPALIVE_PREFIX + userSetup.getServerId() + "_" + platformGbId);
}
@Override
public void delPlatformRegister(String platformGbId) {
- redis.del(VideoManagerConstants.PLATFORM_REGISTER_PREFIX + platformGbId);
+ redis.del(VideoManagerConstants.PLATFORM_REGISTER_PREFIX + userSetup.getServerId() + "_" + platformGbId);
}
@Override
public void updatePlatformRegisterInfo(String callId, String platformGbId) {
- String key = VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + callId;
+ String key = VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetup.getServerId() + "_" + callId;
redis.set(key, platformGbId);
}
@Override
public String queryPlatformRegisterInfo(String callId) {
- return (String)redis.get(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + callId);
+ return (String)redis.get(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetup.getServerId() + "_" + callId);
}
@Override
public void delPlatformRegisterInfo(String callId) {
- redis.del(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + callId);
+ redis.del(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetup.getServerId() + "_" + callId);
}
@Override
public void cleanPlatformRegisterInfos() {
- List regInfos = redis.scan(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + "*");
+ List regInfos = redis.scan(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetup.getServerId() + "_" + "*");
for (Object key : regInfos) {
redis.del(key.toString());
}
@@ -219,19 +225,19 @@
@Override
public void updateSendRTPSever(SendRtpItem sendRtpItem) {
- String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + sendRtpItem.getPlatformId() + "_" + sendRtpItem.getChannelId();
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + userSetup.getServerId() + "_" + sendRtpItem.getPlatformId() + "_" + sendRtpItem.getChannelId();
redis.set(key, sendRtpItem);
}
@Override
public SendRtpItem querySendRTPServer(String platformGbId, String channelId) {
- String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + platformGbId + "_" + channelId;
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + userSetup.getServerId() + "_" + platformGbId + "_" + channelId;
return (SendRtpItem)redis.get(key);
}
@Override
public List<SendRtpItem> querySendRTPServer(String platformGbId) {
- String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + platformGbId + "_*";
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + userSetup.getServerId() + "_" + platformGbId + "_*";
List<Object> queryResult = redis.scan(key);
List<SendRtpItem> result= new ArrayList<>();
@@ -250,7 +256,7 @@
*/
@Override
public void deleteSendRTPServer(String platformGbId, String channelId) {
- String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + platformGbId + "_" + channelId;
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + userSetup.getServerId() + "_" + platformGbId + "_" + channelId;
redis.del(key);
}
@@ -260,7 +266,7 @@
*/
@Override
public boolean isChannelSendingRTP(String channelId) {
- String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + "*_" + channelId;
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + userSetup.getServerId() + "_" + "*_" + channelId;
List<Object> RtpStreams = redis.scan(key);
if (RtpStreams.size() > 0) {
return true;
@@ -271,7 +277,8 @@
@Override
public void clearCatchByDeviceId(String deviceId) {
- List<Object> playLeys = redis.scan(String.format("%S_*_%s_*", VideoManagerConstants.PLAYER_PREFIX,
+ List<Object> playLeys = redis.scan(String.format("%S_%s_*_%s_*", VideoManagerConstants.PLAYER_PREFIX,
+ userSetup.getServerId(),
deviceId));
if (playLeys.size() > 0) {
for (Object key : playLeys) {
@@ -279,7 +286,8 @@
}
}
- List<Object> playBackers = redis.scan(String.format("%S_*_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ List<Object> playBackers = redis.scan(String.format("%S_%s_*_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ userSetup.getServerId(),
deviceId));
if (playBackers.size() > 0) {
for (Object key : playBackers) {
@@ -290,7 +298,7 @@
@Override
public void outlineForAll() {
- List<Object> onlineDevices = redis.scan(VideoManagerConstants.KEEPLIVEKEY_PREFIX + "*" );
+ List<Object> onlineDevices = redis.scan(VideoManagerConstants.KEEPLIVEKEY_PREFIX + userSetup.getServerId() + "_" + "*" );
for (int i = 0; i < onlineDevices.size(); i++) {
String key = (String) onlineDevices.get(i);
redis.del(key);
@@ -300,7 +308,7 @@
@Override
public List<String> getOnlineForAll() {
List<String> result = new ArrayList<>();
- List<Object> onlineDevices = redis.scan(VideoManagerConstants.KEEPLIVEKEY_PREFIX + "*" );
+ List<Object> onlineDevices = redis.scan(VideoManagerConstants.KEEPLIVEKEY_PREFIX + userSetup.getServerId() + "_" + "*" );
for (int i = 0; i < onlineDevices.size(); i++) {
String key = (String) onlineDevices.get(i);
result.add((String) redis.get(key));
@@ -309,14 +317,14 @@
}
@Override
- public void updateWVPInfo(String id, JSONObject jsonObject, int time) {
- String key = VideoManagerConstants.WVP_SERVER_PREFIX + id;
+ public void updateWVPInfo(JSONObject jsonObject, int time) {
+ String key = VideoManagerConstants.WVP_SERVER_PREFIX + userSetup.getServerId();
redis.set(key, jsonObject, time);
}
@Override
public void sendStreamChangeMsg(String type, JSONObject jsonObject) {
- String key = VideoManagerConstants.WVP_MSG_STREAM_PUSH_CHANGE_PREFIX + type;
+ String key = VideoManagerConstants.WVP_MSG_STREAM_CHANGE__PREFIX + type;
logger.debug("[redis 娴佸彉鍖栦簨浠禲 {}: {}", key, jsonObject.toString());
redis.convertAndSend(key, jsonObject);
}
@@ -338,7 +346,7 @@
@Override
public StreamInfo queryDownloadByStreamId(String streamId) {
- List<Object> playLeys = redis.scan(String.format("%S_%s_*", VideoManagerConstants.DOWNLOAD_PREFIX, streamId));
+ List<Object> playLeys = redis.scan(String.format("%S_%s_%s_*", VideoManagerConstants.DOWNLOAD_PREFIX, userSetup.getServerId(), streamId));
if (playLeys == null || playLeys.size() == 0) return null;
return (StreamInfo)redis.get(playLeys.get(0).toString());
}
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 6328bc3..752008b 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -80,6 +80,8 @@
ptz-speed: 50
# TODO [鍙�塢 鏀跺埌蹇冭烦鍚庤嚜鍔ㄤ笂绾匡紝 閲嶅惎鏈嶅姟鍚庝細灏嗘墍鏈夎澶囩疆涓虹绾匡紝榛樿false锛岀瓑寰呮敞鍐屽悗涓婄嚎銆傝缃负true鍒欐敹鍒板績璺宠缃负涓婄嚎銆�
# keepalliveToOnline: false
+ # 鏄惁瀛樺偍alarm淇℃伅
+ alarm: false
#zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
media:
@@ -134,7 +136,7 @@
level:
com.genersoft.iot: debug
com.genersoft.iot.vmp.storager.dao: info
- com.genersoft.iot.vmp.gb28181: info
+ com.genersoft.iot.vmp.gb28181: debug
# [鏍规嵁涓氬姟闇�姹傞厤缃甝
user-settings:
# [鍙�塢 鏈嶅姟ID锛屼笉鍐欏垯涓�000000
--
Gitblit v1.8.0