From 82fd369ce554467f794c9aa66e453adecefc73a9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 16:56:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 10 +++++++++-
1 files changed, 9 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 bcd8bf1..0046a0e 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
@@ -87,7 +87,7 @@
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
@GetMapping("/start/{deviceId}/{channelId}")
- public DeferredResult<WVPResult<String>> play(@PathVariable String deviceId,
+ public DeferredResult<WVPResult<StreamInfo>> play(@PathVariable String deviceId,
@PathVariable String channelId) {
// 鑾峰彇鍙敤鐨剒lm
@@ -232,6 +232,14 @@
}
+ @GetMapping("/1111")
+ public void broadcastApi1() {
+ MediaServerItem defaultMediaServer = mediaServerService.getMediaServerForMinimumLoad();
+ Device device = storager.queryVideoDevice("34020000001320090001");
+ playService.talk(defaultMediaServer, device, "34020000001370000001", null, null, null);
+
+ }
+
@Operation(summary = "鍋滄璇煶骞挎挱")
@Parameter(name = "deviceId", description = "璁惧Id", required = true)
--
Gitblit v1.8.0