From 020f9ea8a05165979afe6a1736abcce29ed6a2f8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 23 八月 2022 11:01:53 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 50 ++++++++++++++++++++++----------------------------
1 files changed, 22 insertions(+), 28 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 1ec4318..95537c4 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
@@ -2,12 +2,14 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IMediaService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.service.IStreamProxyService;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
@@ -18,6 +20,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -32,10 +35,6 @@
public class StreamProxyController {
private final static Logger logger = LoggerFactory.getLogger(StreamProxyController.class);
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
-
@Autowired
private IMediaServerService mediaServerService;
@@ -64,35 +63,32 @@
})
@PostMapping(value = "/save")
@ResponseBody
- public WVPResult save(@RequestBody StreamProxyItem param){
+ public StreamInfo save(@RequestBody StreamProxyItem param){
logger.info("娣诲姞浠ｇ悊锛� " + JSONObject.toJSONString(param));
- if (StringUtils.isEmpty(param.getMediaServerId())) {
+ if (ObjectUtils.isEmpty(param.getMediaServerId())) {
param.setMediaServerId("auto");
}
- if (StringUtils.isEmpty(param.getType())) {
+ if (ObjectUtils.isEmpty(param.getType())) {
param.setType("default");
}
- if (StringUtils.isEmpty(param.getGbId())) {
+ if (ObjectUtils.isEmpty(param.getGbId())) {
param.setGbId(null);
}
- WVPResult<StreamInfo> result = streamProxyService.save(param);
- return result;
+ return streamProxyService.save(param);
}
@GetMapping(value = "/ffmpeg_cmd/list")
@ResponseBody
@Operation(summary = "鑾峰彇ffmpeg.cmd妯℃澘")
@Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = true)
- public WVPResult getFFmpegCMDs(@RequestParam String mediaServerId){
+ public JSONObject getFFmpegCMDs(@RequestParam String mediaServerId){
logger.debug("鑾峰彇鑺傜偣[ {} ]ffmpeg.cmd妯℃澘", mediaServerId );
MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
- JSONObject data = streamProxyService.getFFmpegCMDs(mediaServerItem);
- WVPResult<JSONObject> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- result.setData(data);
- return result;
+ if (mediaServerItem == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "娴佸獟浣擄細 " + mediaServerId + "鏈壘鍒�");
+ }
+ return streamProxyService.getFFmpegCMDs(mediaServerItem);
}
@DeleteMapping(value = "/del")
@@ -100,18 +96,13 @@
@Operation(summary = "绉婚櫎浠ｇ悊")
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴乮d", required = true)
- public WVPResult del(@RequestParam String app, @RequestParam String stream){
+ public void del(@RequestParam String app, @RequestParam String stream){
logger.info("绉婚櫎浠ｇ悊锛� " + app + "/" + stream);
- WVPResult<Object> result = new WVPResult<>();
if (app == null || stream == null) {
- result.setCode(400);
- result.setMsg(app == null ?"app涓嶈兘涓簄ull":"stream涓嶈兘涓簄ull");
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), app == null ?"app涓嶈兘涓簄ull":"stream涓嶈兘涓簄ull");
}else {
streamProxyService.del(app, stream);
- result.setCode(0);
- result.setMsg("success");
}
- return result;
}
@GetMapping(value = "/start")
@@ -119,13 +110,13 @@
@Operation(summary = "鍚敤浠ｇ悊")
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴乮d", required = true)
- public Object start(String app, String stream){
+ public void start(String app, String stream){
logger.info("鍚敤浠ｇ悊锛� " + app + "/" + stream);
boolean result = streamProxyService.start(app, stream);
if (!result) {
logger.info("鍚敤浠ｇ悊澶辫触锛� " + app + "/" + stream);
+ throw new ControllerException(ErrorCode.ERROR100);
}
- return result?"success":"fail";
}
@GetMapping(value = "/stop")
@@ -133,9 +124,12 @@
@Operation(summary = "鍋滅敤浠ｇ悊")
@Parameter(name = "app", description = "搴旂敤鍚�", required = true)
@Parameter(name = "stream", description = "娴乮d", required = true)
- public Object stop(String app, String stream){
+ public void stop(String app, String stream){
logger.info("鍋滅敤浠ｇ悊锛� " + app + "/" + stream);
boolean result = streamProxyService.stop(app, stream);
- return result?"success":"fail";
+ if (!result) {
+ logger.info("鍋滅敤浠ｇ悊澶辫触锛� " + app + "/" + stream);
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
}
}
--
Gitblit v1.8.0