From 9c5b1060af4e6c468b2cf95fbb9ec6d0a05fad5c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 28 二月 2022 17:56:27 +0800
Subject: [PATCH] 支持删除在线设备
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
index be9959a..ec2714f 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -1,10 +1,11 @@
package com.genersoft.iot.vmp.service;
-import com.genersoft.iot.vmp.conf.MediaConfig;
+import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import java.util.List;
@@ -15,24 +16,35 @@
List<MediaServerItem> getAll();
+ List<MediaServerItem> getAllFromDatabase();
+
List<MediaServerItem> getAllOnline();
MediaServerItem getOne(String generalMediaServerId);
- MediaServerItem getOneByHostAndPort(String host, int port);
+ void syncCatchFromDatabase();
/**
* 鏂扮殑鑺傜偣鍔犲叆
* @param zlmServerConfig
* @return
*/
- void handLeZLMServerConfig(ZLMServerConfig zlmServerConfig);
+ void zlmServerOnline(ZLMServerConfig zlmServerConfig);
+
+ /**
+ * 鑺傜偣绂荤嚎
+ * @param mediaServerId
+ * @return
+ */
+ void zlmServerOffline(String mediaServerId);
MediaServerItem getMediaServerForMinimumLoad();
- void setZLMConfig(MediaServerItem mediaServerItem);
+ void setZLMConfig(MediaServerItem mediaServerItem, boolean restart);
SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId);
+
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean isPlayback);
void closeRTPServer(Device device, String channelId);
@@ -48,7 +60,21 @@
void clearMediaServerForOnline();
- void add(MediaServerItem mediaSerItem);
+ WVPResult<String> add(MediaServerItem mediaSerItem);
+
+ int addToDatabase(MediaServerItem mediaSerItem);
+
+ int updateToDatabase(MediaServerItem mediaSerItem);
void resetOnlineServerItem(MediaServerItem serverItem);
+
+ WVPResult<MediaServerItem> checkMediaServer(String ip, int port, String secret);
+
+ boolean checkMediaRecordServer(String ip, int port);
+
+ void delete(String id);
+
+ MediaServerItem getDefaultMediaServer();
+
+ void updateMediaServerKeepalive(String mediaServerId, JSONObject data);
}
--
Gitblit v1.8.0