From e1fcc1f21f6622871a5507fcd50aacfa99181879 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期四, 08 七月 2021 14:48:00 +0800
Subject: [PATCH] 补充swf文件
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 62f732e..51c8c8e 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
@@ -16,6 +16,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
+@SuppressWarnings("rawtypes")
/**
* 鎷夋祦浠ｇ悊鎺ュ彛
*/
@@ -66,6 +67,19 @@
return result;
}
+ @ApiOperation("鑾峰彇ffmpeg.cmd妯℃澘")
+ @GetMapping(value = "/ffmpeg_cmd/list")
+ @ResponseBody
+ public WVPResult getFFmpegCMDs(){
+ logger.debug("鑾峰彇ffmpeg.cmd妯℃澘锛�" );
+ JSONObject data = streamProxyService.getFFmpegCMDs();
+ WVPResult<JSONObject> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ result.setData(data);
+ return result;
+ }
+
@ApiOperation("绉婚櫎浠ｇ悊")
@ApiImplicitParams({
@ApiImplicitParam(name = "app", value = "搴旂敤鍚�", dataTypeClass = String.class),
@@ -75,10 +89,15 @@
@ResponseBody
public WVPResult del(String app, String stream){
logger.info("绉婚櫎浠ｇ悊锛� " + app + "/" + stream);
- streamProxyService.del(app, stream);
WVPResult<Object> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
+ if (app == null || stream == null) {
+ result.setCode(400);
+ result.setMsg(app == null ?"app涓嶈兘涓簄ull":"stream涓嶈兘涓簄ull");
+ }else {
+ streamProxyService.del(app, stream);
+ result.setCode(0);
+ result.setMsg("success");
+ }
return result;
}
--
Gitblit v1.8.0