From 0eba7c40c34d92c93448f39793726e02b0e3cd12 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 十二月 2021 08:56:42 +0800
Subject: [PATCH] 修复录像下载

---
 src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java |   91 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 90 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..4e223e9 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,91 @@
         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> saveMediaServer(@RequestBody  MediaServerItem mediaServerItem){
+        MediaServerItem mediaServerItemInDatabase = mediaServerService.getOne(mediaServerItem.getId());
+
+        if (mediaServerItemInDatabase != null) {
+            if (StringUtils.isEmpty(mediaServerItemInDatabase.getSendRtpPortRange())
+                    && StringUtils.isEmpty(mediaServerItem.getSendRtpPortRange())){
+                mediaServerItem.setSendRtpPortRange("30000,30500");
+            }
+           mediaServerService.update(mediaServerItem);
+        }else {
+            if (StringUtils.isEmpty(mediaServerItem.getSendRtpPortRange())){
+                mediaServerItem.setSendRtpPortRange("30000,30500");
+            }
+            return mediaServerService.add(mediaServerItem);
+        }
+
+        WVPResult<String> result = new WVPResult<>();
+        result.setCode(0);
+        result.setMsg("success");
+        return result;
+    }
+
+    @ApiOperation("绉婚櫎娴佸獟浣撴湇鍔�")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="id", value = "娴佸獟浣揑D", dataTypeClass = String.class)
+    })
+    @DeleteMapping(value = "/media_server/delete")
+    @ResponseBody
+    public WVPResult<String> deleteMediaServer(@RequestParam  String id){
+        if (mediaServerService.getOne(id) != null) {
+            mediaServerService.delete(id);
+        }else {
+            WVPResult<String> result = new WVPResult<>();
+            result.setCode(-1);
+            result.setMsg("鏈壘鍒版鑺傜偣");
+            return result;
+        }
+        WVPResult<String> result = new WVPResult<>();
+        result.setCode(0);
+        result.setMsg("success");
+        return result;
+    }
+
+
 
     @ApiOperation("閲嶅惎鏈嶅姟")
     @GetMapping(value = "/restart")
@@ -155,6 +242,8 @@
                 case "base":
                     jsonObject.put("base", userSetup);
                     break;
+                default:
+                    break;
             }
         }
         result.setData(jsonObject);

--
Gitblit v1.8.0