From 3639d2224d423ccfd937a302af62b71a7cad925f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 18 四月 2024 17:22:25 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 180 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 143 insertions(+), 37 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
old mode 100644
new mode 100755
index e9dbd3b..b2909ee
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -5,10 +5,7 @@
import com.genersoft.iot.vmp.common.SystemAllInfo;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.UserSetting;
-import com.genersoft.iot.vmp.gb28181.bean.AlarmChannelMessage;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
-import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
+import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
@@ -16,6 +13,7 @@
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
+import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.utils.JsonUtil;
@@ -39,6 +37,9 @@
@Autowired
private DeviceChannelMapper deviceChannelMapper;
+
+ @Autowired
+ private DeviceMapper deviceMapper;
@Autowired
private UserSetting userSetting;
@@ -140,15 +141,26 @@
@Override
public void updateSendRTPSever(SendRtpItem sendRtpItem) {
+ redisTemplate.opsForValue().set(sendRtpItem.getRedisKey(), sendRtpItem);
+ }
- String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX +
- userSetting.getServerId() + "_"
- + sendRtpItem.getMediaServerId() + "_"
- + sendRtpItem.getPlatformId() + "_"
- + sendRtpItem.getChannelId() + "_"
- + sendRtpItem.getStreamId() + "_"
- + sendRtpItem.getCallId();
- redisTemplate.opsForValue().set(key, sendRtpItem);
+ @Override
+ public List<SendRtpItem> querySendRTPServer(String platformGbId, String channelId, String streamId) {
+ String scanKey = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
+ + userSetting.getServerId() + "_*_"
+ + platformGbId + "_"
+ + channelId + "_"
+ + streamId + "_"
+ + "*";
+ List<SendRtpItem> result = new ArrayList<>();
+ List<Object> scan = RedisUtil.scan(redisTemplate, scanKey);
+ if (!scan.isEmpty()) {
+ for (Object o : scan) {
+ String key = (String) o;
+ result.add(JsonUtil.redisJsonToObject(redisTemplate, key, SendRtpItem.class));
+ }
+ }
+ return result;
}
@Override
@@ -166,7 +178,7 @@
callId = "*";
}
String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
- + userSetting.getServerId() + "_*_"
+ + "*_*_"
+ platformGbId + "_"
+ channelId + "_"
+ streamId + "_"
@@ -180,7 +192,7 @@
}
@Override
- public List<SendRtpItem> querySendRTPServerByChnnelId(String channelId) {
+ public List<SendRtpItem> querySendRTPServerByChannelId(String channelId) {
if (channelId == null) {
return null;
}
@@ -267,6 +279,14 @@
}
}
+ /**
+ * 鍒犻櫎RTP鎺ㄩ�佷俊鎭紦瀛�
+ */
+ @Override
+ public void deleteSendRTPServer(SendRtpItem sendRtpItem) {
+ deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(),sendRtpItem.getCallId(), sendRtpItem.getStream());
+ }
+
@Override
public List<SendRtpItem> queryAllSendRTPServer() {
String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
@@ -304,7 +324,7 @@
@Override
public void sendStreamChangeMsg(String type, JSONObject jsonObject) {
String key = VideoManagerConstants.WVP_MSG_STREAM_CHANGE_PREFIX + type;
- logger.info("[redis 娴佸彉鍖栦簨浠禲 {}: {}", key, jsonObject.toString());
+ logger.info("[redis 娴佸彉鍖栦簨浠禲 鍙戦�� {}: {}", key, jsonObject.toString());
redisTemplate.convertAndSend(key, jsonObject);
}
@@ -375,7 +395,8 @@
for (Object o : keys) {
String key = (String) o;
Device device = JsonUtil.redisJsonToObject(redisTemplate, key, Device.class);
- if (Objects.nonNull(device)) { // 鍙彇娌℃湁瀛樿繃寰�
+ if (Objects.nonNull(device)) {
+ // 鍙彇娌℃湁瀛樿繃寰�
result.add(JsonUtil.redisJsonToObject(redisTemplate, key, Device.class));
}
}
@@ -386,14 +407,22 @@
@Override
public Device getDevice(String deviceId) {
String key = VideoManagerConstants.DEVICE_PREFIX + userSetting.getServerId() + "_" + deviceId;
- return JsonUtil.redisJsonToObject(redisTemplate, key, Device.class);
+ Device device = JsonUtil.redisJsonToObject(redisTemplate, key, Device.class);
+ if (device == null){
+ device = deviceMapper.getDeviceByDeviceId(deviceId);
+ if (device != null) {
+ updateDevice(device);
+ }
+ }
+ return device;
}
@Override
public void updateGpsMsgInfo(GPSMsgInfo gpsMsgInfo) {
String key = VideoManagerConstants.WVP_STREAM_GPS_MSG_PREFIX + userSetting.getServerId() + "_" + gpsMsgInfo.getId();
Duration duration = Duration.ofSeconds(60L);
- redisTemplate.opsForValue().set(key, gpsMsgInfo, duration); // 榛樿GPS娑堟伅淇濆瓨1鍒嗛挓
+ redisTemplate.opsForValue().set(key, gpsMsgInfo, duration);
+ // 榛樿GPS娑堟伅淇濆瓨1鍒嗛挓
}
@Override
@@ -540,14 +569,14 @@
@Override
public void sendMobilePositionMsg(JSONObject jsonObject) {
String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_MOBILE_POSITION;
- logger.info("[redis鍙戦�侀�氱煡] 绉诲姩浣嶇疆 {}: {}", key, jsonObject.toString());
+ logger.info("[redis鍙戦�侀�氱煡] 鍙戦�� 绉诲姩浣嶇疆 {}: {}", key, jsonObject.toString());
redisTemplate.convertAndSend(key, jsonObject);
}
@Override
public void sendStreamPushRequestedMsg(MessageForPushChannel msg) {
String key = VideoManagerConstants.VM_MSG_STREAM_PUSH_REQUESTED;
- logger.info("[redis鍙戦�侀�氱煡] 鎺ㄦ祦琚姹� {}: {}/{}", key, msg.getApp(), msg.getStream());
+ logger.info("[redis鍙戦�侀�氱煡] 鍙戦�� 鎺ㄦ祦琚姹� {}: {}/{}", key, msg.getApp(), msg.getStream());
redisTemplate.convertAndSend(key, JSON.toJSON(msg));
}
@@ -555,7 +584,7 @@
public void sendAlarmMsg(AlarmChannelMessage msg) {
// 姝ゆ秷鎭敤浜庡鎺ョ涓夋柟鏈嶅姟涓嬬骇鏉ョ殑娑堟伅鍐呭
String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_ALARM;
- logger.info("[redis鍙戦�侀�氱煡] 鎶ヨ{}: {}", key, JSON.toJSON(msg));
+ logger.info("[redis鍙戦�侀�氱煡] 鍙戦�� 鎶ヨ{}: {}", key, JSON.toJSON(msg));
redisTemplate.convertAndSend(key, JSON.toJSON(msg));
}
@@ -568,7 +597,7 @@
@Override
public void sendStreamPushRequestedMsgForStatus() {
String key = VideoManagerConstants.VM_MSG_GET_ALL_ONLINE_REQUESTED;
- logger.info("[redis閫氱煡]鑾峰彇鎵�鏈夋帹娴佽澶囩殑鐘舵��");
+ logger.info("[redis閫氱煡] 鍙戦�� 鑾峰彇鎵�鏈夋帹娴佽澶囩殑鐘舵��");
JSONObject jsonObject = new JSONObject();
jsonObject.put(key, key);
redisTemplate.convertAndSend(key, jsonObject);
@@ -587,15 +616,6 @@
}
@Override
- public int getGbReceiveCount(String id) {
- String playKey = VideoManagerConstants.PLAYER_PREFIX + "_" + userSetting.getServerId() + "_" + id + "_*";
- String playBackKey = VideoManagerConstants.PLAY_BLACK_PREFIX + "_" + userSetting.getServerId() + "_" + id + "_*";
- String downloadKey = VideoManagerConstants.DOWNLOAD_PREFIX + "_" + userSetting.getServerId() + "_" + id + "_*";
-
- return RedisUtil.scan(redisTemplate, playKey).size() + RedisUtil.scan(redisTemplate, playBackKey).size() + RedisUtil.scan(redisTemplate, downloadKey).size();
- }
-
- @Override
public int getGbSendCount(String id) {
String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
+ userSetting.getServerId() + "_*_" + id + "_*";
@@ -605,19 +625,105 @@
@Override
public void sendDeviceOrChannelStatus(String deviceId, String channelId, boolean online) {
String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_DEVICE_STATUS;
- if (channelId == null) {
- logger.info("[redis閫氱煡] 鎺ㄩ�佽澶囩姸鎬侊紝 {}-{}", deviceId, online);
- }else {
- logger.info("[redis閫氱煡] 鎺ㄩ�侀�氶亾鐘舵�侊紝 {}/{}-{}", deviceId, channelId, online);
- }
-
StringBuilder msg = new StringBuilder();
msg.append(deviceId);
if (channelId != null) {
msg.append(":").append(channelId);
}
msg.append(" ").append(online? "ON":"OFF");
+ logger.info("[redis閫氱煡] 鎺ㄩ�佽澶�/閫氶亾鐘舵��-> {} ", msg);
// 浣跨敤 RedisTemplate<Object, Object> 鍙戦�佸瓧绗︿覆娑堟伅浼氬鑷村彂閫佺殑娑堟伅澶氬甫浜嗗弻寮曞彿
stringRedisTemplate.convertAndSend(key, msg.toString());
}
+
+ @Override
+ public void sendChannelAddOrDelete(String deviceId, String channelId, boolean add) {
+ String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_DEVICE_STATUS;
+
+
+ StringBuilder msg = new StringBuilder();
+ msg.append(deviceId);
+ if (channelId != null) {
+ msg.append(":").append(channelId);
+ }
+ msg.append(" ").append(add? "ADD":"DELETE");
+ logger.info("[redis閫氱煡] 鎺ㄩ�侀�氶亾-> {}", msg);
+ // 浣跨敤 RedisTemplate<Object, Object> 鍙戦�佸瓧绗︿覆娑堟伅浼氬鑷村彂閫佺殑娑堟伅澶氬甫浜嗗弻寮曞彿
+ stringRedisTemplate.convertAndSend(key, msg.toString());
+ }
+
+ @Override
+ public void sendPlatformStartPlayMsg(MessageForPushChannel msg) {
+ String key = VideoManagerConstants.VM_MSG_STREAM_START_PLAY_NOTIFY;
+ logger.info("[redis鍙戦�侀�氱煡] 鍙戦�� 鎺ㄦ祦琚笂绾у钩鍙拌鐪� {}: {}/{}->{}", key, msg.getApp(), msg.getStream(), msg.getPlatFormId());
+ redisTemplate.convertAndSend(key, JSON.toJSON(msg));
+ }
+
+ @Override
+ public void sendPlatformStopPlayMsg(SendRtpItem sendRtpItem, ParentPlatform platform) {
+
+ MessageForPushChannel msg = MessageForPushChannel.getInstance(0,
+ sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getChannelId(),
+ sendRtpItem.getPlatformId(), platform.getName(), userSetting.getServerId(), sendRtpItem.getMediaServerId());
+ msg.setPlatFormIndex(platform.getId());
+
+ String key = VideoManagerConstants.VM_MSG_STREAM_STOP_PLAY_NOTIFY;
+ logger.info("[redis鍙戦�侀�氱煡] 鍙戦�� 涓婄骇骞冲彴鍋滄瑙傜湅 {}: {}/{}->{}", key, sendRtpItem.getApp(), sendRtpItem.getStream(), platform.getServerGBId());
+ redisTemplate.convertAndSend(key, JSON.toJSON(msg));
+ }
+
+ @Override
+ public void addPushListItem(String app, String stream, OnStreamChangedHookParam param) {
+ String key = VideoManagerConstants.PUSH_STREAM_LIST + app + "_" + stream;
+ redisTemplate.opsForValue().set(key, param);
+ }
+
+ @Override
+ public OnStreamChangedHookParam getPushListItem(String app, String stream) {
+ String key = VideoManagerConstants.PUSH_STREAM_LIST + app + "_" + stream;
+ return (OnStreamChangedHookParam)redisTemplate.opsForValue().get(key);
+ }
+
+ @Override
+ public void removePushListItem(String app, String stream, String mediaServerId) {
+ String key = VideoManagerConstants.PUSH_STREAM_LIST + app + "_" + stream;
+ OnStreamChangedHookParam param = (OnStreamChangedHookParam)redisTemplate.opsForValue().get(key);
+ if (param != null && param.getMediaServerId().equalsIgnoreCase(mediaServerId)) {
+ redisTemplate.delete(key);
+ }
+
+ }
+
+ @Override
+ public void sendPushStreamClose(MessageForPushChannel msg) {
+ String key = VideoManagerConstants.VM_MSG_STREAM_PUSH_CLOSE_REQUESTED;
+ logger.info("[redis鍙戦�侀�氱煡] 鍙戦�� 鍋滄鍚戜笂绾ф帹娴� {}: {}/{}->{}", key, msg.getApp(), msg.getStream(), msg.getPlatFormId());
+ redisTemplate.convertAndSend(key, JSON.toJSON(msg));
+ }
+
+ @Override
+ public void addWaiteSendRtpItem(SendRtpItem sendRtpItem, int platformPlayTimeout) {
+ String key = VideoManagerConstants.WAITE_SEND_PUSH_STREAM + sendRtpItem.getApp() + "_" + sendRtpItem.getStream();
+ redisTemplate.opsForValue().set(key, sendRtpItem);
+ }
+
+ @Override
+ public SendRtpItem getWaiteSendRtpItem(String app, String stream) {
+ String key = VideoManagerConstants.WAITE_SEND_PUSH_STREAM + app + "_" + stream;
+ return JsonUtil.redisJsonToObject(redisTemplate, key, SendRtpItem.class);
+ }
+
+ @Override
+ public void sendStartSendRtp(SendRtpItem sendRtpItem) {
+ String key = VideoManagerConstants.START_SEND_PUSH_STREAM + sendRtpItem.getApp() + "_" + sendRtpItem.getStream();
+ logger.info("[redis鍙戦�侀�氱煡] 閫氱煡鍏朵粬WVP鎺ㄦ祦 {}: {}/{}->{}", key, sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getPlatformId());
+ redisTemplate.convertAndSend(key, JSON.toJSON(sendRtpItem));
+ }
+
+ @Override
+ public void sendPushStreamOnline(SendRtpItem sendRtpItem) {
+ String key = VideoManagerConstants.VM_MSG_STREAM_PUSH_CLOSE_REQUESTED;
+ logger.info("[redis鍙戦�侀�氱煡] 娴佷笂绾� {}: {}/{}->{}", key, sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getPlatformId());
+ redisTemplate.convertAndSend(key, JSON.toJSON(sendRtpItem));
+ }
}
--
Gitblit v1.8.0