From 720231d33f387c6d1bf13bdef653314c5c450809 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期六, 25 九月 2021 22:12:15 +0800
Subject: [PATCH] 添加发送媒体流, 添加媒体服务器节点管理ui,修复修改密码
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 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 3bfa595..881a20a 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
@@ -57,7 +57,9 @@
@ApiOperation("娴佸獟浣撴湇鍔″垪琛�")
@GetMapping(value = "/media_server/list")
@ResponseBody
- public WVPResult<List<MediaServerItem>> getMediaServerList(){
+ public WVPResult<List<MediaServerItem>> getMediaServerList(boolean detail){
+ List<MediaServerItem> all = mediaServerService.getAll();
+
WVPResult<List<MediaServerItem>> result = new WVPResult<>();
result.setCode(0);
result.setMsg("success");
@@ -86,6 +88,60 @@
result.setData(mediaServerService.getOne(id));
return result;
}
+
+ @ApiOperation("娴嬭瘯娴佸獟浣撴湇鍔�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name="ip", value = "娴佸獟浣撴湇鍔P", dataTypeClass = String.class),
+ @ApiImplicitParam(name="port", value = "娴佸獟浣撴湇鍔TT绔彛", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name="secret", value = "娴佸獟浣撴湇鍔ecret", dataTypeClass = String.class),
+ })
+ @GetMapping(value = "/media_server/check")
+ @ResponseBody
+ public WVPResult<MediaServerItem> checkMediaServer(@RequestParam String ip, @RequestParam int port, @RequestParam String secret){
+ return mediaServerService.checkMediaServer(ip, port, secret);
+ }
+
+ @ApiOperation("娴嬭瘯娴佸獟浣撳綍鍍忕鐞嗘湇鍔�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name="ip", value = "娴佸獟浣撴湇鍔P", dataTypeClass = String.class),
+ @ApiImplicitParam(name="port", value = "娴佸獟浣撴湇鍔TT绔彛", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name="secret", value = "娴佸獟浣撴湇鍔ecret", dataTypeClass = String.class),
+ })
+ @GetMapping(value = "/media_server/record/check")
+ @ResponseBody
+ public WVPResult<String> checkMediaRecordServer(@RequestParam String ip, @RequestParam int port){
+ boolean checkResult = mediaServerService.checkMediaRecordServer(ip, port);
+ WVPResult<String> result = new WVPResult<>();
+ if (checkResult) {
+ result.setCode(0);
+ result.setMsg("success");
+
+ }else {
+ result.setCode(-1);
+ result.setMsg("杩炴帴澶辫触");
+ }
+ return result;
+ }
+
+ @ApiOperation("淇濆瓨娴佸獟浣撴湇鍔�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name="mediaServerItem", value = "娴佸獟浣撲俊鎭�", dataTypeClass = MediaServerItem.class)
+ })
+ @PostMapping(value = "/media_server/save")
+ @ResponseBody
+ public WVPResult<String> checkMediaServer(@RequestBody MediaServerItem mediaServerItem){
+ if (mediaServerService.getOne(mediaServerItem.getId()) != null) {
+ mediaServerService.update(mediaServerItem);
+ }else {
+ return mediaServerService.add(mediaServerItem);
+ }
+ WVPResult<String> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ return result;
+ }
+
+
@ApiOperation("閲嶅惎鏈嶅姟")
@GetMapping(value = "/restart")
@@ -155,6 +211,8 @@
case "base":
jsonObject.put("base", userSetup);
break;
+ default:
+ break;
}
}
result.setData(jsonObject);
--
Gitblit v1.8.0