From 80bfd9ce026e67dd2eb86c519b5b1b70e3cc7d12 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 17 十一月 2021 17:03:48 +0800
Subject: [PATCH] 使用@Async多线程处理sip消息
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 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 62f732e..f8c01dd 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
@@ -1,7 +1,9 @@
package com.genersoft.iot.vmp.vmanager.streamProxy;
import com.alibaba.fastjson.JSONObject;
+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.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.service.IStreamProxyService;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
@@ -14,8 +16,10 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+@SuppressWarnings("rawtypes")
/**
* 鎷夋祦浠ｇ悊鎺ュ彛
*/
@@ -29,6 +33,10 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+
+ @Autowired
+ private IMediaServerService mediaServerService;
@Autowired
private IStreamProxyService streamProxyService;
@@ -59,6 +67,7 @@
@ResponseBody
public WVPResult save(@RequestBody StreamProxyItem param){
logger.info("娣诲姞浠ｇ悊锛� " + JSONObject.toJSONString(param));
+ if (StringUtils.isEmpty(param.getMediaServerId())) param.setMediaServerId("auto");
String msg = streamProxyService.save(param);
WVPResult<Object> result = new WVPResult<>();
result.setCode(0);
@@ -66,19 +75,42 @@
return result;
}
+ @ApiOperation("鑾峰彇ffmpeg.cmd妯℃澘")
+ @GetMapping(value = "/ffmpeg_cmd/list")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "mediaServerId", value = "娴佸獟浣揑D", dataTypeClass = String.class),
+ })
+ @ResponseBody
+ public WVPResult 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;
+ }
+
@ApiOperation("绉婚櫎浠ｇ悊")
@ApiImplicitParams({
- @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "stream", value = "娴両D", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", required = true, dataTypeClass = String.class),
+ @ApiImplicitParam(name = "stream", value = "娴両D", required = true, dataTypeClass = String.class),
})
@DeleteMapping(value = "/del")
@ResponseBody
- public WVPResult del(String app, String stream){
+ public WVPResult del(@RequestParam String app, @RequestParam String stream){
logger.info("绉婚櫎浠ｇ悊锛� " + app + "/" + stream);
- streamProxyService.del(app, stream);
WVPResult<Object> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
+ if (app == null || stream == null) {
+ result.setCode(400);
+ result.setMsg(app == null ?"app涓嶈兘涓簄ull":"stream涓嶈兘涓簄ull");
+ }else {
+ streamProxyService.del(app, stream);
+ result.setCode(0);
+ result.setMsg("success");
+ }
return result;
}
--
Gitblit v1.8.0