From 61f5950b4fbc0c9d59ac755314c0d1a9efb702bc Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期六, 07 八月 2021 14:05:42 +0800
Subject: [PATCH] 添加日志存储与查询功能 登录接口返回用户详细信息
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 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..76ad86c 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,13 @@
package com.genersoft.iot.vmp.vmanager.server;
import com.genersoft.iot.vmp.VManageBootstrap;
+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.gbStream.bean.GbStreamParam;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
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.*;
@@ -12,7 +16,10 @@
import javax.sip.ObjectInUseException;
import javax.sip.SipProvider;
import java.util.Iterator;
+import java.util.List;
+@SuppressWarnings("rawtypes")
+@Api(tags = "鏈嶅姟鎺у埗")
@CrossOrigin
@RestController
@RequestMapping("/api/server")
@@ -21,8 +28,45 @@
@Autowired
private ConfigurableApplicationContext context;
+ @Autowired
+ private IMediaServerService mediaServerService;
- @RequestMapping(value = "/restart")
+
+ @ApiOperation("娴佸獟浣撴湇鍔″垪琛�")
+ @GetMapping(value = "/media_server/list")
+ @ResponseBody
+ 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;
+ }
+
+ @ApiOperation("閲嶅惎鏈嶅姟")
+ @GetMapping(value = "/restart")
@ResponseBody
public Object restart(){
Thread restartThread = new Thread(new Runnable() {
--
Gitblit v1.8.0