From b4e7ed0bf777541ea2196775d08be3d79db6f87f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 30 十一月 2021 10:16:09 +0800
Subject: [PATCH] 修复兼容接口云台控制
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 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..4e223e9 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
@@ -129,12 +129,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