From f99c9cac6afc899c244aa66897cb3bf35a2da7d6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 一月 2022 16:24:37 +0800
Subject: [PATCH] 优化通道更新

---
 src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
index 6396b10..6dfc257 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
@@ -3,6 +3,7 @@
 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
 import com.genersoft.iot.vmp.service.IStreamPushService;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -32,14 +33,14 @@
             @ApiImplicitParam(name="query", value = "鏌ヨ鍐呭", dataTypeClass = String.class),
             @ApiImplicitParam(name="online", value = "鏄惁鍦ㄧ嚎", dataTypeClass = Boolean.class),
     })
-    @RequestMapping(value = "/list")
+    @GetMapping(value = "/list")
     @ResponseBody
     public PageInfo<StreamPushItem> list(@RequestParam(required = false)Integer page,
                                          @RequestParam(required = false)Integer count,
                                          @RequestParam(required = false)String query,
                                          @RequestParam(required = false)Boolean online ){
 
-        PageInfo<StreamPushItem> pushList = streamPushService.getPushList(page - 1, page - 1 + count);
+        PageInfo<StreamPushItem> pushList = streamPushService.getPushList(page, count);
         return pushList;
     }
 
@@ -47,7 +48,7 @@
     @ApiImplicitParams({
             @ApiImplicitParam(name = "stream", value = "鐩存挱娴佸叧鑱斿浗鏍囧钩鍙�", dataTypeClass = GbStream.class),
     })
-    @RequestMapping(value = "/save_to_gb")
+    @PostMapping(value = "/save_to_gb")
     @ResponseBody
     public Object saveToGB(@RequestBody GbStream stream){
         if (streamPushService.saveToGB(stream)){
@@ -62,7 +63,7 @@
     @ApiImplicitParams({
             @ApiImplicitParam(name = "stream", value = "鐩存挱娴佸叧鑱斿浗鏍囧钩鍙�", dataTypeClass = GbStream.class),
     })
-    @RequestMapping(value = "/remove_form_gb")
+    @DeleteMapping(value = "/remove_form_gb")
     @ResponseBody
     public Object removeFormGB(@RequestBody GbStream stream){
         if (streamPushService.removeFromGB(stream)){
@@ -71,4 +72,21 @@
             return "fail";
         }
     }
+
+
+    @ApiOperation("涓涓�涓帹娴�")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", required = true, dataTypeClass = String.class),
+            @ApiImplicitParam(name = "streamId", value = "娴両D", required = true, dataTypeClass = String.class),
+    })
+    @PostMapping(value = "/stop")
+    @ResponseBody
+    public Object removeFormGB(@RequestParam(required = true)String app, @RequestParam(required = true)String streamId){
+        if (streamPushService.stop(app, streamId)){
+            return "success";
+        }else {
+            return "fail";
+        }
+    }
+
 }

--
Gitblit v1.8.0