From 379830f7ebd3d9b93bfbfeb52584e5e4de29a979 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 23 七月 2021 17:20:24 +0800
Subject: [PATCH] Merge pull request #129 from lawrencehj/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 60 +++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 23 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 3417acf..eafb8a0 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
@@ -1,15 +1,19 @@
package com.genersoft.iot.vmp.storager.impl;
+import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.*;
+import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.text.SimpleDateFormat;
import java.util.*;
@SuppressWarnings("rawtypes")
@@ -22,6 +26,7 @@
@Autowired
private DeviceChannelMapper deviceChannelMapper;
+ private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/**
* 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆redis
@@ -75,33 +80,13 @@
}
@Override
- public StreamInfo queryPlayByDevice(String deviceId, String code) {
+ 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,
deviceId,
- code));
+ channelId));
if (playLeys == null || playLeys.size() == 0) return null;
return (StreamInfo)redis.get(playLeys.get(0).toString());
- }
-
- /**
- * 鏇存柊娴佸獟浣撲俊鎭�
- * @param mediaServerConfig
- * @return
- */
- @Override
- public boolean updateMediaInfo(MediaServerConfig mediaServerConfig) {
- mediaServerConfig.setUpdateTime(System.currentTimeMillis());
- return redis.set(VideoManagerConstants.MEDIA_SERVER_PREFIX,mediaServerConfig);
- }
-
- /**
- * 鑾峰彇娴佸獟浣撲俊鎭�
- * @return
- */
- @Override
- public MediaServerConfig getMediaInfo() {
- return (MediaServerConfig)redis.get(VideoManagerConstants.MEDIA_SERVER_PREFIX);
}
@Override
@@ -233,6 +218,20 @@
return (SendRtpItem)redis.get(key);
}
+ @Override
+ public List<SendRtpItem> querySendRTPServer(String platformGbId) {
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + platformGbId + "_*";
+ List<Object> queryResult = redis.scan(key);
+ List<SendRtpItem> result= new ArrayList<>();
+
+ for (int i = 0; i < queryResult.size(); i++) {
+ String keyItem = (String) queryResult.get(i);
+ result.add((SendRtpItem)redis.get(keyItem));
+ }
+
+ return result;
+ }
+
/**
* 鍒犻櫎RTP鎺ㄩ�佷俊鎭紦瀛�
* @param platformGbId
@@ -277,4 +276,19 @@
}
}
}
+
+ @Override
+ public void outlineForAll() {
+ List<Object> onlineDevices = redis.scan(VideoManagerConstants.KEEPLIVEKEY_PREFIX + "*" );
+ for (int i = 0; i < onlineDevices.size(); i++) {
+ String key = (String) onlineDevices.get(i);
+ redis.del(key);
+ }
+ }
+
+ @Override
+ public void updateWVPInfo(JSONObject jsonObject) {
+
+ }
+
}
--
Gitblit v1.8.0