From c2aaae9325db012c9960b69784330ced5ec15ab9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 09 五月 2022 18:15:30 +0800
Subject: [PATCH] 初步实现语音喊话
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 118 ++++++++++++++++++++++++++++------------------------------
1 files changed, 57 insertions(+), 61 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 dc88da0..d587e0d 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
@@ -11,6 +11,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.WVPResult;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult;
import com.genersoft.iot.vmp.service.IMediaService;
@@ -39,6 +40,9 @@
import java.util.List;
import java.util.UUID;
+/**
+ * @author lin
+ */
@Api(tags = "鍥芥爣璁惧鐐规挱")
@CrossOrigin
@RestController
@@ -102,7 +106,7 @@
logger.debug(String.format("璁惧棰勮/鍥炴斁鍋滄API璋冪敤锛宻treamId锛�%s_%s", deviceId, channelId ));
String uuid = UUID.randomUUID().toString();
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<>();
// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
String key = DeferredResultHolder.CALLBACK_CMD_STOP + deviceId + channelId;
@@ -123,7 +127,7 @@
RequestMessage msgForSuccess = new RequestMessage();
msgForSuccess.setId(uuid);
msgForSuccess.setKey(key);
- msgForSuccess.setData(String.format("success"));
+ msgForSuccess.setData("success");
resultHolder.invokeAllResult(msgForSuccess);
});
@@ -251,81 +255,73 @@
@ApiOperation("璇煶骞挎挱鍛戒护")
@ApiImplicitParams({
@ApiImplicitParam(name = "deviceId", value = "璁惧Id", dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelForSend", value = "璁惧鐢ㄤ簬鍙戦�佽闊虫暟鎹殑閫氶亾", dataTypeClass = String.class),
- @ApiImplicitParam(name = "channelForReceive", value = "璁惧鐢ㄤ簬鎺ユ敹璇煶鏁版嵁鐨勯�氶亾", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "channelId", value = "閫氶亾Id", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "timeout", value = "鎺ㄦ祦瓒呮椂鏃堕棿(绉�)", dataTypeClass = Integer.class),
})
- @GetMapping("/broadcast/{deviceId}")
- @PostMapping("/broadcast/{deviceId}")
- public DeferredResult<ResponseEntity<String>> broadcastApi(@PathVariable String deviceId,
- String channelForSend,
- String channelForReceive) {
+ @GetMapping("/broadcast/{deviceId}/{channelId}")
+ @PostMapping("/broadcast/{deviceId}/{channelId}")
+ public DeferredResult<WVPResult<AudioBroadcastResult>> broadcastApi(@PathVariable String deviceId, @PathVariable String channelId, Integer timeout) {
if (logger.isDebugEnabled()) {
logger.debug("璇煶骞挎挱API璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<>(3 * 1000L);
- String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId;
+ if (device == null) {
+ WVPResult<AudioBroadcastResult> result = new WVPResult<>();
+ result.setCode(-1);
+ result.setMsg("鏈壘鍒拌澶囷細 " + deviceId);
+ DeferredResult<WVPResult<AudioBroadcastResult>> deferredResult = new DeferredResult<>();
+ deferredResult.setResult(result);
+ return deferredResult;
+ }
+ if (channelId == null) {
+ WVPResult<AudioBroadcastResult> result = new WVPResult<>();
+ result.setCode(-1);
+ result.setMsg("鏈壘鍒伴�氶亾锛� " + channelId);
+ DeferredResult<WVPResult<AudioBroadcastResult>> deferredResult = new DeferredResult<>();
+ deferredResult.setResult(result);
+ return deferredResult;
+ }
+
+ String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId;
if (resultHolder.exist(key, null)) {
- result.setResult(new ResponseEntity<>("璁惧浣跨敤涓�",HttpStatus.OK));
- return result;
+ WVPResult<AudioBroadcastResult> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("璁惧浣跨敤涓�");
+ DeferredResult<WVPResult<AudioBroadcastResult>> deferredResult = new DeferredResult<>();
+ deferredResult.setResult(wvpResult);
+ return deferredResult;
}
-
-// playService.audioBroadcast(deviceId, channelForSend, channelForReceive);
-
-
-
-
-
-
+ if (timeout == null){
+ timeout = 30;
+ }
+ DeferredResult<WVPResult<AudioBroadcastResult>> result = new DeferredResult<>(timeout.longValue()*1000 + 2000);
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;
- }
- 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);
+ 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);
});
-
- result.onTimeout(() -> {
- logger.warn(String.format("璇煶骞挎挱鎿嶄綔瓒呮椂, 璁惧鏈繑鍥炲簲绛旀寚浠�"));
- 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("Error", "Timeout. Device did not response to broadcast command.");
- msg.setData(json);
- resultHolder.invokeResult(msg);
+ 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;
}
@ApiOperation("鑾峰彇鎵�鏈夌殑ssrc")
@GetMapping("/ssrc")
- public WVPResult<JSONObject> getSSRC() {
+ public WVPResult<JSONObject> getSsrc() {
if (logger.isDebugEnabled()) {
logger.debug("鑾峰彇鎵�鏈夌殑ssrc");
}
--
Gitblit v1.8.0