From 8ae17764fd61c1013eb874018ad078480c025d09 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 20 三月 2024 11:07:08 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java | 44 +++++++++++---------------------------------
1 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
index 2c421ba..be090ec 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
@@ -264,6 +264,9 @@
}
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItemInDataBase.getId();
redisTemplate.opsForValue().set(key, mediaServerItemInDataBase);
+ if (mediaSerItem.isStatus()) {
+ resetOnlineServerItem(mediaSerItem);
+ }
}
@Override
@@ -459,30 +462,6 @@
zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
}
- class KeepAliveTimeoutRunnable implements Runnable{
-
- private MediaServerItem serverItem;
-
- public KeepAliveTimeoutRunnable(MediaServerItem serverItem) {
- this.serverItem = serverItem;
- }
-
- @Override
- public void run() {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣蹇冭烦鍒版湡]锛�" + serverItem.getId());
- // 鍙戣捣http璇锋眰楠岃瘉zlm鏄惁纭疄鏃犳硶杩炴帴锛屽鏋滅‘瀹炴棤娉曡繛鎺ュ垯鍙戦�佺绾夸簨浠讹紝鍚﹀垯涓嶄綔澶勭悊
- JSONObject mediaServerConfig = zlmresTfulUtils.getMediaServerConfig(serverItem);
- if (mediaServerConfig != null && mediaServerConfig.getInteger("code") == 0) {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣蹇冭烦鍒版湡]锛歿}楠岃瘉鍚庡獟浣撴湇鍔¤妭鐐逛粛鍦ㄧ嚎锛屾仮澶嶅績璺充俊鎭�,璇锋鏌ュ獟浣撴湇鍔¤妭鐐规槸鍚﹀彲浠ユ甯稿悜wvp鍙戦�佸績璺�", serverItem.getId());
- // 娣诲姞濯掍綋鏈嶅姟鑺傜偣淇℃伅
- updateMediaServerKeepalive(serverItem.getId(), null);
- }else {
- publisher.zlmOfflineEventPublish(serverItem.getId());
- }
- }
- }
-
-
@Override
public void zlmServerOffline(String mediaServerId) {
delete(mediaServerId);
@@ -498,18 +477,16 @@
if (redisTemplate.opsForZSet().score(key, serverItem.getId()) == null) { // 涓嶅瓨鍦ㄥ垯璁剧疆榛樿鍊� 宸插瓨鍦ㄥ垯閲嶇疆
redisTemplate.opsForZSet().add(key, serverItem.getId(), 0L);
// 鏌ヨ鏈嶅姟娴佹暟閲�
- zlmresTfulUtils.getMediaList(serverItem, null, null, "rtsp",(mediaList ->{
- Integer code = mediaList.getInteger("code");
- if (code == 0) {
- JSONArray data = mediaList.getJSONArray("data");
- if (data != null) {
- redisTemplate.opsForZSet().add(key, serverItem.getId(), data.size());
- }
- }
- }));
+ int count = getMediaList(serverItem);
+ redisTemplate.opsForZSet().add(key, serverItem.getId(), count);
}else {
clearRTPServer(serverItem);
}
+ }
+
+ private int getMediaList(MediaServerItem serverItem) {
+
+ return 0;
}
@@ -748,6 +725,7 @@
mediaServerItemMap.put(mediaServerItem.getId(), mediaServerItem);
}
for (MediaServerItem mediaServerItem : allInCatch) {
+ // 娓呴櫎鏁版嵁涓笉瀛樺湪浣唕edis缂撳瓨鏁版嵁
if (!mediaServerItemMap.containsKey(mediaServerItem.getId())) {
delete(mediaServerItem.getId());
}
--
Gitblit v1.8.0