From 89a9ab4534f10a224f70e546db838423e84a1965 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期五, 16 七月 2021 16:34:51 +0800
Subject: [PATCH] 添加zlm集群支持
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
index bbd4bd5..45eeac8 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
@@ -2,8 +2,11 @@
import com.genersoft.iot.vmp.VManageBootstrap;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
+import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
+import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.utils.SpringBeanFactory;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import gov.nist.javax.sip.SipStackImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +19,7 @@
import javax.sip.SipProvider;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
@SuppressWarnings("rawtypes")
@Api(tags = "鏈嶅姟鎺у埗")
@@ -28,17 +32,28 @@
private ConfigurableApplicationContext context;
@Autowired
- private IRedisCatchStorage redisCatchStorage;
+ private IMediaServerService mediaServerService;
@ApiOperation("娴佸獟浣撴湇鍔″垪琛�")
@GetMapping(value = "/media_server/list")
@ResponseBody
- public Object getMediaServerList(){
- // TODO 涓哄悗缁涓獄lm鏀寔鍑嗗
- ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
- ArrayList<ZLMServerConfig> result = new ArrayList<>();
- result.add(mediaInfo);
+ public WVPResult<List<IMediaServerItem>> getMediaServerList(){
+ WVPResult<List<IMediaServerItem>> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ result.setData(mediaServerService.getAll());
+ return result;
+ }
+
+ @ApiOperation("鑾峰彇娴佸獟浣撴湇鍔�")
+ @GetMapping(value = "/media_server/one/{id}")
+ @ResponseBody
+ public WVPResult<IMediaServerItem> getMediaServer(@PathVariable String id){
+ WVPResult<IMediaServerItem> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ result.setData(mediaServerService.getOne(id));
return result;
}
--
Gitblit v1.8.0