From c82608125353a7cd96aa19c2c96ac7a40d1ec23f Mon Sep 17 00:00:00 2001 From: 64850858 <648540858@qq.com> Date: 星期一, 07 六月 2021 18:09:36 +0800 Subject: [PATCH] 关闭接口鉴权与自动一起使用可以完成单网页集成 --- src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 40 ++++++++++++++++++++++++++++++++-------- 1 files changed, 32 insertions(+), 8 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 9b2e4f0..fd53cea 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 @@ -4,12 +4,12 @@ import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 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 io.swagger.models.auth.In; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -57,10 +57,26 @@ }) @PostMapping(value = "/save") @ResponseBody - public Object save(@RequestBody StreamProxyItem param){ + public WVPResult save(@RequestBody StreamProxyItem param){ logger.info("娣诲姞浠g悊锛� " + 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; + } + + @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悊") @@ -70,10 +86,18 @@ }) @DeleteMapping(value = "/del") @ResponseBody - public Object del(String app, String stream){ + public WVPResult del(String app, String stream){ logger.info("绉婚櫎浠g悊锛� " + app + "/" + stream); - streamProxyService.del(app, stream); - return "success"; + WVPResult<Object> result = new WVPResult<>(); + 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; } @ApiOperation("鍚敤浠g悊") @@ -86,7 +110,7 @@ public Object start(String app, String stream){ logger.info("鍚敤浠g悊锛� " + app + "/" + stream); boolean result = streamProxyService.start(app, stream); - return "success"; + return result?"success":"fail"; } @ApiOperation("鍋滅敤浠g悊") -- Gitblit v1.8.0