From 2ff3cdb6a1550941dbd36585749499064db4f8d5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 九月 2022 11:25:53 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 89 +++++++++++++++++++++++++++-----------------
1 files changed, 54 insertions(+), 35 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 b965254..ff9a39a 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
@@ -13,6 +13,7 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
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;
@@ -43,6 +44,10 @@
import java.util.List;
import java.util.UUID;
+
+/**
+ * @author lin
+ */
@Tag(name = "鍥芥爣璁惧鐐规挱")
@CrossOrigin
@RestController
@@ -207,52 +212,33 @@
@Operation(summary = "璇煶骞挎挱鍛戒护")
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
- @GetMapping("/broadcast/{deviceId}")
- @PostMapping("/broadcast/{deviceId}")
- public DeferredResult<String> broadcastApi(@PathVariable String deviceId) {
+ @Parameter(name = "deviceId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+ @Parameter(name = "timeout", description = "鎺ㄦ祦瓒呮椂鏃堕棿(绉�)", required = true)
+ @GetMapping("/broadcast/{deviceId}/{channelId}")
+ @PostMapping("/broadcast/{deviceId}/{channelId}")
+ public DeferredResult<String> broadcastApi(@PathVariable String deviceId, @PathVariable String channelId, Integer timeout) {
if (logger.isDebugEnabled()) {
logger.debug("璇煶骞挎挱API璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
DeferredResult<String> result = new DeferredResult<>(3 * 1000L);
+ if (device == null) {
+ result.setResult("鏈壘鍒拌澶囷細 " + deviceId);
+ return result;
+ }
+ if (channelId == null) {
+ result.setResult("鏈壘鍒伴�氶亾锛� " + channelId);
+ return result;
+ }
String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId;
if (resultHolder.exist(key, null)) {
result.setResult("璁惧浣跨敤涓�");
return result;
}
+ if (timeout == null){
+ timeout = 30;
+ }
String uuid = UUID.randomUUID().toString();
- if (device == null) {
-
- resultHolder.put(key, key, result);
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setId(uuid);
- JSONObject json = new JSONObject();
- json.put("DeviceID", deviceId);
- json.put("CmdType", "Broadcast");
- json.put("Result", "Failed");
- json.put("Description", "Device 涓嶅瓨鍦�");
- msg.setData(json);
- resultHolder.invokeResult(msg);
- return result;
- }
- try {
- cmder.audioBroadcastCmd(device, (event) -> {
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setId(uuid);
- JSONObject json = new JSONObject();
- json.put("DeviceID", deviceId);
- json.put("CmdType", "Broadcast");
- json.put("Result", "Failed");
- json.put("Description", String.format("璇煶骞挎挱鎿嶄綔澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg));
- msg.setData(json);
- resultHolder.invokeResult(msg);
- });
- } catch (InvalidArgumentException | SipException | ParseException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 璇煶骞挎挱: {}", e.getMessage());
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
- }
result.onTimeout(() -> {
logger.warn("璇煶骞挎挱鎿嶄綔瓒呮椂, 璁惧鏈繑鍥炲簲绛旀寚浠�");
@@ -267,10 +253,43 @@
msg.setData(json);
resultHolder.invokeResult(msg);
});
+
+ result.onTimeout(()->{
+ WVPResult<AudioBroadcastResult> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("璇锋眰瓒呮椂");
+ RequestMessage requestMessage = new RequestMessage();
+ requestMessage.setKey(key);
+ requestMessage.setData(wvpResult);
+ resultHolder.invokeAllResult(requestMessage);
+ });
+ playService.audioBroadcast(device, channelId, timeout, (msg)->{
+ WVPResult<AudioBroadcastResult> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg(msg);
+ RequestMessage requestMessage = new RequestMessage();
+ requestMessage.setKey(key);
+ requestMessage.setData(wvpResult);
+ resultHolder.invokeAllResult(requestMessage);
+ });
resultHolder.put(key, uuid, result);
+
return result;
}
+
+ @Operation(summary = "鍋滄璇煶骞挎挱")
+ @Parameter(name = "deviceId", description = "璁惧Id", required = true)
+ @Parameter(name = "channelId", description = "閫氶亾Id", required = true)
+ @GetMapping("/broadcast/stop/{deviceId}/{channelId}")
+ @PostMapping("/broadcast/stop/{deviceId}/{channelId}")
+ public void stopBroadcastA(@PathVariable String deviceId, @PathVariable String channelId) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("鍋滄璇煶骞挎挱API璋冪敤");
+ }
+ playService.stopAudioBroadcast(deviceId, channelId);
+ }
+
@Operation(summary = "鑾峰彇鎵�鏈夌殑ssrc")
@GetMapping("/ssrc")
public JSONObject getSSRC() {
--
Gitblit v1.8.0