From 10f776678eeabfa0c73cf052db0e0044342f407f Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 25 二月 2022 20:33:38 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-pro-record --- src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java index 881a20a..c27fb0e 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java @@ -58,8 +58,6 @@ @GetMapping(value = "/media_server/list") @ResponseBody public WVPResult<List<MediaServerItem>> getMediaServerList(boolean detail){ - List<MediaServerItem> all = mediaServerService.getAll(); - WVPResult<List<MediaServerItem>> result = new WVPResult<>(); result.setCode(0); result.setMsg("success"); @@ -129,12 +127,43 @@ }) @PostMapping(value = "/media_server/save") @ResponseBody - public WVPResult<String> checkMediaServer(@RequestBody MediaServerItem mediaServerItem){ - if (mediaServerService.getOne(mediaServerItem.getId()) != null) { + public WVPResult<String> saveMediaServer(@RequestBody MediaServerItem mediaServerItem){ + MediaServerItem mediaServerItemInDatabase = mediaServerService.getOne(mediaServerItem.getId()); + + if (mediaServerItemInDatabase != null) { + if (StringUtils.isEmpty(mediaServerItemInDatabase.getSendRtpPortRange()) + && StringUtils.isEmpty(mediaServerItem.getSendRtpPortRange())){ + mediaServerItem.setSendRtpPortRange("30000,30500"); + } mediaServerService.update(mediaServerItem); }else { + if (StringUtils.isEmpty(mediaServerItem.getSendRtpPortRange())){ + mediaServerItem.setSendRtpPortRange("30000,30500"); + } return mediaServerService.add(mediaServerItem); } + + WVPResult<String> result = new WVPResult<>(); + result.setCode(0); + result.setMsg("success"); + return result; + } + + @ApiOperation("绉婚櫎娴佸獟浣撴湇鍔�") + @ApiImplicitParams({ + @ApiImplicitParam(name="id", value = "娴佸獟浣揑D", dataTypeClass = String.class) + }) + @DeleteMapping(value = "/media_server/delete") + @ResponseBody + public WVPResult<String> deleteMediaServer(@RequestParam String id){ + if (mediaServerService.getOne(id) != null) { + mediaServerService.delete(id); + }else { + WVPResult<String> result = new WVPResult<>(); + result.setCode(-1); + result.setMsg("鏈壘鍒版鑺傜偣"); + return result; + } WVPResult<String> result = new WVPResult<>(); result.setCode(0); result.setMsg("success"); -- Gitblit v1.8.0