From e6790d88fc5b1ac33d239c0d90ce6cdea666b821 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 16 五月 2022 10:14:24 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 10 +++++++++-
1 files changed, 9 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 4390bfc..f2e48d8 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
@@ -69,7 +69,15 @@
@ResponseBody
public WVPResult save(@RequestBody StreamProxyItem param){
logger.info("娣诲姞浠ｇ悊锛� " + JSONObject.toJSONString(param));
- if (StringUtils.isEmpty(param.getMediaServerId())) param.setMediaServerId("auto");
+ 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;
}
--
Gitblit v1.8.0