From e48ef997c03b49c8090970f5fbb29ce80b0ac6df Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期三, 14 七月 2021 15:57:39 +0800
Subject: [PATCH] 更换播放器， 修正和优化sql脚本，
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 675fc01..bbd4bd5 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
@@ -1,9 +1,12 @@
package com.genersoft.iot.vmp.vmanager.server;
import com.genersoft.iot.vmp.VManageBootstrap;
+import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.utils.SpringBeanFactory;
-import com.genersoft.iot.vmp.vmanager.gbStream.bean.GbStreamParam;
import gov.nist.javax.sip.SipStackImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.web.bind.annotation.*;
@@ -11,8 +14,11 @@
import javax.sip.ListeningPoint;
import javax.sip.ObjectInUseException;
import javax.sip.SipProvider;
+import java.util.ArrayList;
import java.util.Iterator;
+@SuppressWarnings("rawtypes")
+@Api(tags = "鏈嶅姟鎺у埗")
@CrossOrigin
@RestController
@RequestMapping("/api/server")
@@ -21,8 +27,23 @@
@Autowired
private ConfigurableApplicationContext context;
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
- @RequestMapping(value = "/restart")
+
+ @ApiOperation("娴佸獟浣撴湇鍔″垪琛�")
+ @GetMapping(value = "/media_server/list")
+ @ResponseBody
+ public Object getMediaServerList(){
+ // TODO 涓哄悗缁涓獄lm鏀寔鍑嗗
+ ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
+ ArrayList<ZLMServerConfig> result = new ArrayList<>();
+ result.add(mediaInfo);
+ return result;
+ }
+
+ @ApiOperation("閲嶅惎鏈嶅姟")
+ @GetMapping(value = "/restart")
@ResponseBody
public Object restart(){
Thread restartThread = new Thread(new Runnable() {
--
Gitblit v1.8.0