From fd296d1a6acccbe9f3a72623719bf7101725f4e9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 06 五月 2021 09:28:22 +0800
Subject: [PATCH] Merge pull request #93 from yu1183688986/wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java |   75 ++++++++++++++++++++++++++++---------
 1 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
index 09d4174..62f732e 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
@@ -1,11 +1,15 @@
 package com.genersoft.iot.vmp.vmanager.streamProxy;
 
 import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.vmanager.service.IStreamProxyService;
+import com.genersoft.iot.vmp.service.IStreamProxyService;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
 import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +19,7 @@
 /**
  * 鎷夋祦浠ｇ悊鎺ュ彛
  */
+@Api(tags = "鎷夋祦浠ｇ悊")
 @Controller
 @CrossOrigin
 @RequestMapping(value = "/api/proxy")
@@ -29,45 +34,77 @@
     private IStreamProxyService streamProxyService;
 
 
-    @RequestMapping(value = "/list")
+    @ApiOperation("鍒嗛〉鏌ヨ娴佷唬鐞�")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="page", value = "褰撳墠椤�", required = true, dataTypeClass = Integer.class),
+            @ApiImplicitParam(name="count", value = "姣忛〉鏌ヨ鏁伴噺", required = true, dataTypeClass = Integer.class),
+            @ApiImplicitParam(name="query", value = "鏌ヨ鍐呭", dataTypeClass = String.class),
+            @ApiImplicitParam(name="online", value = "鏄惁鍦ㄧ嚎", dataTypeClass = Boolean.class),
+    })
+    @GetMapping(value = "/list")
     @ResponseBody
-    public PageInfo<StreamProxyDto> list(@RequestParam(required = false)Integer page,
-                                         @RequestParam(required = false)Integer count,
-                                         @RequestParam(required = false)String q,
-                                         @RequestParam(required = false)Boolean online ){
+    public PageInfo<StreamProxyItem> list(@RequestParam(required = false)Integer page,
+                                          @RequestParam(required = false)Integer count,
+                                          @RequestParam(required = false)String query,
+                                          @RequestParam(required = false)Boolean online ){
 
         return streamProxyService.getAll(page, count);
     }
 
-    @RequestMapping(value = "/save")
+    @ApiOperation("淇濆瓨浠ｇ悊")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "param", value = "浠ｇ悊鍙傛暟", dataTypeClass = StreamProxyItem.class),
+    })
+    @PostMapping(value = "/save")
     @ResponseBody
-    public Object save(@RequestBody StreamProxyDto param){
+    public WVPResult save(@RequestBody StreamProxyItem param){
         logger.info("娣诲姞浠ｇ悊锛� " + JSONObject.toJSONString(param));
-        streamProxyService.save(param);
-        return "success";
+        String msg = streamProxyService.save(param);
+        WVPResult<Object> result = new WVPResult<>();
+        result.setCode(0);
+        result.setMsg(msg);
+        return result;
     }
 
-    @RequestMapping(value = "/del")
+    @ApiOperation("绉婚櫎浠ｇ悊")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "stream", value = "娴両D", dataTypeClass = String.class),
+    })
+    @DeleteMapping(value = "/del")
     @ResponseBody
-    public Object del(String app, String stream){
+    public WVPResult del(String app, String stream){
         logger.info("绉婚櫎浠ｇ悊锛� " + app + "/" + stream);
         streamProxyService.del(app, stream);
-        return "success";
+        WVPResult<Object> result = new WVPResult<>();
+        result.setCode(0);
+        result.setMsg("success");
+        return result;
     }
 
-    @RequestMapping(value = "/start")
+    @ApiOperation("鍚敤浠ｇ悊")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "stream", value = "娴両D", dataTypeClass = String.class),
+    })
+    @GetMapping(value = "/start")
     @ResponseBody
     public Object start(String app, String stream){
         logger.info("鍚敤浠ｇ悊锛� " + app + "/" + stream);
         boolean result = streamProxyService.start(app, stream);
-        return "success";
+        return result?"success":"fail";
     }
 
-    @RequestMapping(value = "/stop")
+    @ApiOperation("鍋滅敤浠ｇ悊")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "stream", value = "娴両D", dataTypeClass = String.class),
+    })
+    @GetMapping(value = "/stop")
     @ResponseBody
     public Object stop(String app, String stream){
         logger.info("鍋滅敤浠ｇ悊锛� " + app + "/" + stream);
         boolean result = streamProxyService.stop(app, stream);
-        return "success";
+        return result?"success":"fail";
     }
 }

--
Gitblit v1.8.0