From b019106c449cdb64b125aa2a913e7f8037c8d85d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 03 三月 2022 16:23:03 +0800
Subject: [PATCH] Merge pull request #365 from TristingChen/zlm-node-manage
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index 6a5642e..4f08c99 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -46,8 +46,7 @@
* 濯掍綋鏈嶅姟鍣ㄨ妭鐐圭鐞�
*/
@Service
-@Order(value=2)
-public class MediaServerServiceImpl implements IMediaServerService, CommandLineRunner {
+public class MediaServerServiceImpl implements IMediaServerService {
private final static Logger logger = LoggerFactory.getLogger(MediaServerServiceImpl.class);
@@ -102,9 +101,8 @@
* 鍒濆鍖�
*/
@Override
- public void run(String... args) throws Exception {
+ public void updateVmServer(List<MediaServerItem> mediaServerItemList) {
logger.info("[缂撳瓨鍒濆鍖朷 Media Server ");
- List<MediaServerItem> mediaServerItemList = mediaServerMapper.queryAll();
for (MediaServerItem mediaServerItem : mediaServerItemList) {
if (StringUtils.isEmpty(mediaServerItem.getId())) {
continue;
@@ -225,7 +223,8 @@
String key = (String) mediaServerKey;
MediaServerItem mediaServerItem = (MediaServerItem) redisUtil.get(key);
// 妫�鏌ョ姸鎬�
- if (redisUtil.zScore(onlineKey, mediaServerItem.getId()) != null) {
+ Double aDouble = redisUtil.zScore(onlineKey, mediaServerItem.getId());
+ if (aDouble != null) {
mediaServerItem.setStatus(true);
}
result.add(mediaServerItem);
@@ -610,6 +609,11 @@
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + id;
redisUtil.del(key);
}
+ @Override
+ public void deleteDb(String id){
+ //鍚屾鍒犻櫎鏁版嵁搴撲腑鐨勬暟鎹�
+ mediaServerMapper.delOne(id);
+ }
@Override
public void updateMediaServerKeepalive(String mediaServerId, JSONObject data) {
--
Gitblit v1.8.0