From 66e67569095f0ba871c2b584ceed73dfaa50d00c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 12 七月 2022 16:28:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into liujie-20220712
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 d587e0d..eae186e 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
@@ -197,7 +197,7 @@
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
result.put("key", data.getString("key"));
- StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStreamWithCheck("convert", streamId, mediaInfo.getId());
+ StreamInfo streamInfoResult = mediaService.getStreamInfoByAppAndStreamWithCheck("convert", streamId, mediaInfo.getId(), false);
result.put("data", streamInfoResult);
}
}else {
@@ -319,6 +319,22 @@
return result;
}
+
+ @ApiOperation("鍋滄璇煶骞挎挱")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "deviceId", value = "璁惧Id", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "channelId", value = "閫氶亾Id", dataTypeClass = String.class),
+ })
+ @GetMapping("/broadcast/stop/{deviceId}/{channelId}")
+ @PostMapping("/broadcast/stop/{deviceId}/{channelId}")
+ public WVPResult<String> stopBroadcastA(@PathVariable String deviceId, @PathVariable String channelId) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("鍋滄璇煶骞挎挱API璋冪敤");
+ }
+ playService.stopAudioBroadcast(deviceId, channelId);
+ return new WVPResult<>(0, "success", null);
+ }
+
@ApiOperation("鑾峰彇鎵�鏈夌殑ssrc")
@GetMapping("/ssrc")
public WVPResult<JSONObject> getSsrc() {
--
Gitblit v1.8.0