From 69d9692f6194d1e03ec81cf87ea8f0e7a62f7173 Mon Sep 17 00:00:00 2001 From: wangyimeng <421132955@qq.com> Date: 星期三, 16 三月 2022 15:27:12 +0800 Subject: [PATCH] 删除重复字段 --- src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 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 0c4c2ff..5f02b2a 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 @@ -71,10 +71,32 @@ logger.info("娣诲姞浠g悊锛� " + JSONObject.toJSONString(param)); if (StringUtils.isEmpty(param.getMediaServerId())) param.setMediaServerId("auto"); if (StringUtils.isEmpty(param.getType())) param.setType("default"); + if (StringUtils.isEmpty(param.getGbId())) param.setGbId(null); WVPResult<StreamInfo> result = streamProxyService.save(param); return result; } - + @ApiOperation("淇敼浠g悊") + @ApiImplicitParams({ + @ApiImplicitParam(name = "param", value = "浠g悊鍙傛暟", dataTypeClass = StreamProxyItem.class), + }) + @PostMapping(value = "/update") + @ResponseBody + public WVPResult update(@RequestBody StreamProxyItem param){ + logger.info("淇敼浠g悊锛� " + JSONObject.toJSONString(param)); + WVPResult<StreamInfo> result = new WVPResult<>(); + if(StringUtils.isEmpty(param.getApp())||StringUtils.isEmpty(param.getStream())){ + result.setCode(400); + result.setMsg("app涓嶈兘涓簄ull涓攕tream涓嶈兘涓簄ull锛岃妫�鏌ュ叿浣撳弬鏁帮紒"); + return result; + } + streamProxyService.del(param.getApp(), param.getStream()); + if (StringUtils.isEmpty(param.getMediaServerId())) param.setMediaServerId("auto"); + if (StringUtils.isEmpty(param.getType())) param.setType("default"); + if (StringUtils.isEmpty(param.getGbId())) param.setGbId(null); + param.setEnable(false); + result = streamProxyService.save(param); + return result; + } @ApiOperation("鑾峰彇ffmpeg.cmd妯℃澘") @GetMapping(value = "/ffmpeg_cmd/list") @ApiImplicitParams({ -- Gitblit v1.8.0