From ecf4fbb68445cf412d5e946f67f92c9928df8273 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 八月 2022 16:53:16 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 186 +++++++++++++++-------------------------------
1 files changed, 60 insertions(+), 126 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index e87c106..dcd89b3 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -12,19 +13,18 @@
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.vmanager.bean.AudioBroadcastResult;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
import com.genersoft.iot.vmp.service.IMediaService;
import com.genersoft.iot.vmp.service.IPlayService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -40,10 +40,11 @@
import java.util.List;
import java.util.UUID;
+
/**
* @author lin
*/
-@Api(tags = "鍥芥爣璁惧鐐规挱")
+@Tag(name = "鍥芥爣璁惧鐐规挱")
@CrossOrigin
@RestController
@RequestMapping("/api/play")
@@ -78,13 +79,11 @@
@Autowired
private IMediaServerService mediaServerService;
- @ApiOperation("寮�濮嬬偣鎾�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class),
- })
+ @Operation(summary = "寮�濮嬬偣鎾�")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@GetMapping("/start/{deviceId}/{channelId}")
- public DeferredResult<ResponseEntity<String>> play(@PathVariable String deviceId,
+ public DeferredResult<WVPResult<String>> play(@PathVariable String deviceId,
@PathVariable String channelId) {
// 鑾峰彇鍙敤鐨剒lm
@@ -95,174 +94,112 @@
return playResult.getResult();
}
- @ApiOperation("鍋滄鐐规挱")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧ID", dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class),
- })
+
+ @Operation(summary = "鍋滄鐐规挱")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@GetMapping("/stop/{deviceId}/{channelId}")
- public DeferredResult<ResponseEntity<String>> playStop(@PathVariable String deviceId, @PathVariable String channelId) {
+ public JSONObject playStop(@PathVariable String deviceId, @PathVariable String channelId) {
logger.debug(String.format("璁惧棰勮/鍥炴斁鍋滄API璋冪敤锛宻treamId锛�%s_%s", deviceId, channelId ));
- String uuid = UUID.randomUUID().toString();
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<>();
+ if (deviceId == null || channelId == null) {
+ throw new ControllerException(ErrorCode.ERROR400);
+ }
- // 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
- String key = DeferredResultHolder.CALLBACK_CMD_STOP + deviceId + channelId;
- resultHolder.put(key, uuid, result);
StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
if (streamInfo == null) {
- RequestMessage msg = new RequestMessage();
- msg.setId(uuid);
- msg.setKey(key);
- msg.setData("鐐规挱鏈壘鍒�");
- resultHolder.invokeAllResult(msg);
- storager.stopPlay(deviceId, channelId);
- return result;
- }
- cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, eventResult -> {
- redisCatchStorage.stopPlay(streamInfo);
- storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
- RequestMessage msgForSuccess = new RequestMessage();
- msgForSuccess.setId(uuid);
- msgForSuccess.setKey(key);
- msgForSuccess.setData("success");
- resultHolder.invokeAllResult(msgForSuccess);
- });
-
- if (deviceId != null || channelId != null) {
- JSONObject json = new JSONObject();
- json.put("deviceId", deviceId);
- json.put("channelId", channelId);
- RequestMessage msg = new RequestMessage();
- msg.setId(uuid);
- msg.setKey(key);
- msg.setData(json.toString());
- resultHolder.invokeAllResult(msg);
- } else {
- logger.warn("璁惧棰勮/鍥炴斁鍋滄API璋冪敤澶辫触锛�");
- RequestMessage msg = new RequestMessage();
- msg.setId(uuid);
- msg.setKey(key);
- msg.setData("streamId null");
- resultHolder.invokeAllResult(msg);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鐐规挱鏈壘鍒�");
}
- // 瓒呮椂澶勭悊
- result.onTimeout(()->{
- logger.warn(String.format("璁惧棰勮/鍥炴斁鍋滄瓒呮椂锛宒eviceId/channelId锛�%s_%s ", deviceId, channelId));
- redisCatchStorage.stopPlay(streamInfo);
- storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
- RequestMessage msg = new RequestMessage();
- msg.setId(uuid);
- msg.setKey(key);
- msg.setData("Timeout");
- resultHolder.invokeAllResult(msg);
- });
- return result;
+ cmder.streamByeCmd(deviceId, channelId, streamInfo.getStream(), null, null);
+ redisCatchStorage.stopPlay(streamInfo);
+
+ storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+ JSONObject json = new JSONObject();
+ json.put("deviceId", deviceId);
+ json.put("channelId", channelId);
+ return json;
+
}
/**
* 灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac
* @param streamId 娴両D
- * @return
*/
- @ApiOperation("灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "streamId", value = "瑙嗛娴両D", dataTypeClass = String.class),
- })
+ @Operation(summary = "灏嗕笉鏄痟264鐨勮棰戦�氳繃ffmpeg 杞爜涓篽264 + aac")
+ @Parameter(name = "streamId", description = "瑙嗛娴両D", required = true)
@PostMapping("/convert/{streamId}")
- public ResponseEntity<String> playConvert(@PathVariable String streamId) {
+ public JSONObject playConvert(@PathVariable String streamId) {
StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
if (streamInfo == null) {
streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, null);
}
if (streamInfo == null) {
logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡缁忓仠姝�!");
- return new ResponseEntity<String>("鏈壘鍒拌棰戞祦淇℃伅, 瑙嗛娴佸彲鑳藉凡缁忓仠姝�", HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒拌棰戞祦淇℃伅, 瑙嗛娴佸彲鑳藉凡缁忓仠姝�");
}
MediaServerItem mediaInfo = mediaServerService.getOne(streamInfo.getMediaServerId());
JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(mediaInfo, streamId);
if (!rtpInfo.getBoolean("exist")) {
logger.warn("瑙嗛杞爜API璋冪敤澶辫触锛�, 瑙嗛娴佸凡鍋滄鎺ㄦ祦!");
- return new ResponseEntity<String>("鎺ㄦ祦淇℃伅鍦ㄦ祦濯掍綋涓笉瀛樺湪, 瑙嗛娴佸彲鑳藉凡鍋滄鎺ㄦ祦", HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒拌棰戞祦淇℃伅, 瑙嗛娴佸彲鑳藉凡鍋滄鎺ㄦ祦");
} else {
String dstUrl = String.format("rtmp://%s:%s/convert/%s", "127.0.0.1", mediaInfo.getRtmpPort(),
streamId );
String srcUrl = String.format("rtsp://%s:%s/rtp/%s", "127.0.0.1", mediaInfo.getRtspPort(), streamId);
JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(mediaInfo, srcUrl, dstUrl, "1000000", true, false, null);
logger.info(jsonObject.toJSONString());
- JSONObject result = new JSONObject();
if (jsonObject != null && jsonObject.getInteger("code") == 0) {
- result.put("code", 0);
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
- result.put("key", data.getString("key"));
+ JSONObject result = new JSONObject();
+ result.put("key", data.getString("key"));
StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStreamWithCheck("convert", streamId, mediaInfo.getId(), false);
- result.put("data", streamInfoResult);
+ result.put("StreamInfo", streamInfoResult);
+ return result;
+ }else {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "杞爜澶辫触");
}
}else {
- result.put("code", 1);
- result.put("msg", "cover fail");
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "杞爜澶辫触");
}
- return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
}
}
/**
* 缁撴潫杞爜
- * @param key
- * @return
*/
- @ApiOperation("缁撴潫杞爜")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "key", value = "瑙嗛娴乲ey", dataTypeClass = String.class),
- })
+ @Operation(summary = "缁撴潫杞爜")
+ @Parameter(name = "key", description = "瑙嗛娴乲ey", required = true)
+ @Parameter(name = "mediaServerId", description = "娴佸獟浣撴湇鍔D", required = true)
@PostMapping("/convertStop/{key}")
- public ResponseEntity<String> playConvertStop(@PathVariable String key, String mediaServerId) {
- JSONObject result = new JSONObject();
+ public void playConvertStop(@PathVariable String key, String mediaServerId) {
if (mediaServerId == null) {
- result.put("code", 400);
- result.put("msg", "mediaServerId is null");
- return new ResponseEntity<String>( result.toJSONString(), HttpStatus.BAD_REQUEST);
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "娴佸獟浣擄細" + mediaServerId + "涓嶅瓨鍦�" );
}
MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
if (mediaInfo == null) {
- result.put("code", 0);
- result.put("msg", "浣跨敤鐨勬祦濯掍綋宸茬粡鍋滄杩愯");
- return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "浣跨敤鐨勬祦濯掍綋宸茬粡鍋滄杩愯" );
}else {
JSONObject jsonObject = zlmresTfulUtils.delFFmpegSource(mediaInfo, key);
logger.info(jsonObject.toJSONString());
if (jsonObject != null && jsonObject.getInteger("code") == 0) {
- result.put("code", 0);
JSONObject data = jsonObject.getJSONObject("data");
- if (data != null && data.getBoolean("flag")) {
- result.put("code", "0");
- result.put("msg", "success");
- }else {
-
+ if (data == null || data.getBoolean("flag") == null || !data.getBoolean("flag")) {
+ throw new ControllerException(ErrorCode.ERROR100 );
}
}else {
- result.put("code", 1);
- result.put("msg", "delFFmpegSource fail");
+ throw new ControllerException(ErrorCode.ERROR100 );
}
- return new ResponseEntity<String>( result.toJSONString(), HttpStatus.OK);
}
-
-
}
- @ApiOperation("璇煶骞挎挱鍛戒护")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "璁惧Id", dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelId", value = "閫氶亾Id", dataTypeClass = String.class),
- @ApiImplicitParam(name = "timeout", value = "鎺ㄦ祦瓒呮椂鏃堕棿(绉�)", dataTypeClass = Integer.class),
- })
- @GetMapping("/broadcast/{deviceId}/{channelId}")
- @PostMapping("/broadcast/{deviceId}/{channelId}")
- public DeferredResult<WVPResult<AudioBroadcastResult>> broadcastApi(@PathVariable String deviceId, @PathVariable String channelId, Integer timeout) {
+ @Operation(summary = "璇煶骞挎挱鍛戒护")
+ @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+ @GetMapping("/broadcast/{deviceId}")
+ @PostMapping("/broadcast/{deviceId}")
+ public DeferredResult<WVPResult<AudioBroadcastResult>> broadcastApi(@PathVariable String deviceId) {
if (logger.isDebugEnabled()) {
logger.debug("璇煶骞挎挱API璋冪敤");
}
@@ -321,6 +258,7 @@
return result;
}
+ @Operation(summary = "鑾峰彇鎵�鏈夌殑ssrc")
@ApiOperation("鍋滄璇煶骞挎挱")
@ApiImplicitParams({
@@ -337,9 +275,9 @@
return new WVPResult<>(0, "success", null);
}
- @ApiOperation("鑾峰彇鎵�鏈夌殑ssrc")
+ @Operation(summary = "鑾峰彇鎵�鏈夌殑ssrc")
@GetMapping("/ssrc")
- public WVPResult<JSONObject> getSsrc() {
+ public JSONObject getSSRC() {
if (logger.isDebugEnabled()) {
logger.debug("鑾峰彇鎵�鏈夌殑ssrc");
}
@@ -354,14 +292,10 @@
objects.add(jsonObject);
}
- WVPResult<JSONObject> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
JSONObject jsonObject = new JSONObject();
jsonObject.put("data", objects);
jsonObject.put("count", objects.size());
- result.setData(jsonObject);
- return result;
+ return jsonObject;
}
}
--
Gitblit v1.8.0