From e48ef997c03b49c8090970f5fbb29ce80b0ac6df Mon Sep 17 00:00:00 2001 From: 64850858 <648540858@qq.com> Date: 星期三, 14 七月 2021 15:57:39 +0800 Subject: [PATCH] 更换播放器, 修正和优化sql脚本, --- src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 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 2baa999..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") /** * 鎷夋祦浠g悊鎺ュ彛 */ @@ -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("绉婚櫎浠g悊") @ApiImplicitParams({ @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", dataTypeClass = String.class), -- Gitblit v1.8.0