From dc20ccfce84d46f86209309ea70ba81d0360e070 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 05 一月 2022 15:23:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 2 deletions(-)
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 6adc05d..0293a82 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
@@ -36,6 +36,28 @@
private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ @Override
+ public Long getCSEQ(String method) {
+ String key = VideoManagerConstants.SIP_CSEQ_PREFIX + userSetup.getServerId() + "_" + method;
+
+ long result = redis.incr(key, 1L);
+ if (result > Integer.MAX_VALUE) {
+ redis.set(key, 1);
+ result = 1;
+ }
+ return result;
+ }
+
+ @Override
+ public void resetAllCSEQ() {
+ String scanKey = VideoManagerConstants.SIP_CSEQ_PREFIX + userSetup.getServerId() + "_*";
+ List<Object> keys = redis.scan(scanKey);
+ for (int i = 0; i < keys.size(); i++) {
+ String key = (String) keys.get(i);
+ redis.set(key, 1);
+ }
+ }
+
/**
* 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆redis
*
@@ -296,6 +318,15 @@
redis.del(key.toString());
}
}
+
+ List<Object> deviceCache = redis.scan(String.format("%S%s_%s", VideoManagerConstants.DEVICE_PREFIX,
+ userSetup.getServerId(),
+ deviceId));
+ if (deviceCache.size() > 0) {
+ for (Object key : deviceCache) {
+ redis.del(key.toString());
+ }
+ }
}
@Override
@@ -338,8 +369,8 @@
}
@Override
- public void removeStream(MediaServerItem mediaServerItem, String type, String app, String streamId) {
- String key = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX + userSetup.getServerId() + "_" + type + "_" + app + "_" + streamId + "_" + mediaServerItem.getId();
+ public void removeStream(String mediaServerId, String type, String app, String streamId) {
+ String key = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX + userSetup.getServerId() + "_" + type + "_" + app + "_" + streamId + "_" + mediaServerId;
redis.del(key);
}
@@ -365,4 +396,34 @@
redis.del((String) stream);
}
}
+
+ @Override
+ public List<StreamInfo> getStreams(String mediaServerId, String type) {
+ List<StreamInfo> result = new ArrayList<>();
+ String key = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX + userSetup.getServerId() + "_" + type + "_*_*_" + mediaServerId;
+ List<Object> streams = redis.scan(key);
+ for (Object stream : streams) {
+ StreamInfo streamInfo = (StreamInfo)redis.get((String) stream);
+ result.add(streamInfo);
+ }
+ return result;
+ }
+
+ @Override
+ public void updateDevice(Device device) {
+ String key = VideoManagerConstants.DEVICE_PREFIX + userSetup.getServerId() + "_" + device.getDeviceId();
+ redis.set(key, device);
+ }
+
+ @Override
+ public void removeDevice(String deviceId) {
+ String key = VideoManagerConstants.DEVICE_PREFIX + userSetup.getServerId() + "_" + deviceId;
+ redis.del(key);
+ }
+
+ @Override
+ public Device getDevice(String deviceId) {
+ String key = VideoManagerConstants.DEVICE_PREFIX + userSetup.getServerId() + "_" + deviceId;
+ return (Device)redis.get(key);
+ }
}
--
Gitblit v1.8.0