From dbc525e8fb59f70c474863304e3c580e81dcedf0 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期一, 09 八月 2021 16:54:36 +0800
Subject: [PATCH] 添加版本信息接口
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 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..4b7adc6 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.common.VersionPo;
+import com.genersoft.iot.vmp.conf.VersionInfo;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.service.IMediaServerService;
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;
@@ -14,8 +17,8 @@
import javax.sip.ListeningPoint;
import javax.sip.ObjectInUseException;
import javax.sip.SipProvider;
-import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
@SuppressWarnings("rawtypes")
@Api(tags = "鏈嶅姟鎺у埗")
@@ -28,17 +31,42 @@
private ConfigurableApplicationContext context;
@Autowired
- private IRedisCatchStorage redisCatchStorage;
+ private IMediaServerService mediaServerService;
+
+ @Autowired
+ VersionInfo versionInfo;
@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<MediaServerItem>> getMediaServerList(){
+ WVPResult<List<MediaServerItem>> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ result.setData(mediaServerService.getAll());
+ return result;
+ }
+
+ @ApiOperation("鍦ㄧ嚎娴佸獟浣撴湇鍔″垪琛�")
+ @GetMapping(value = "/media_server/online/list")
+ @ResponseBody
+ public WVPResult<List<MediaServerItem>> getOnlineMediaServerList(){
+ WVPResult<List<MediaServerItem>> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ result.setData(mediaServerService.getAllOnline());
+ return result;
+ }
+
+ @ApiOperation("鑾峰彇娴佸獟浣撴湇鍔�")
+ @GetMapping(value = "/media_server/one/{id}")
+ @ResponseBody
+ public WVPResult<MediaServerItem> getMediaServer(@PathVariable String id){
+ WVPResult<MediaServerItem> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ result.setData(mediaServerService.getOne(id));
return result;
}
@@ -74,4 +102,15 @@
restartThread.start();
return "success";
}
+
+ @ApiOperation("鐗堟湰淇℃伅")
+ @GetMapping(value = "/version")
+ @ResponseBody
+ public WVPResult<VersionPo> getVersion(){
+ WVPResult<VersionPo> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ result.setData(versionInfo.getVersion());
+ return result;
+ }
}
--
Gitblit v1.8.0