From ca922a9afc4692b1c813a4947b68f2a8975fbb53 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Mon, 17 Oct 2022 14:33:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=A7=8B=E7=82=B9?= =?UTF-8?q?=E6=92=AD=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0=E4=B8=8E=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=9A=84=E4=B8=8D=E7=AC=A6=20#635?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../genersoft/iot/vmp/common/StreamInfo.java | 36 ++++++++++++++++++- .../iot/vmp/service/impl/PlayServiceImpl.java | 2 +- .../vmanager/gb28181/play/PlayController.java | 2 +- .../gb28181/play/bean/PlayResult.java | 7 ++-- 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java index 928c305e..93d837c8 100644 --- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java +++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java @@ -1,44 +1,78 @@ package com.genersoft.iot.vmp.common; +import io.swagger.v3.oas.annotations.media.Schema; +@Schema(description = "流信息") public class StreamInfo { + @Schema(description = "应用名") private String app; + @Schema(description = "流ID") private String stream; + @Schema(description = "设备编号") private String deviceID; + @Schema(description = "通道编号") private String channelId; + @Schema(description = "HTTP-FLV流地址") private String flv; + @Schema(description = "IP") private String ip; - + @Schema(description = "HTTPS-FLV流地址") private String https_flv; + @Schema(description = "Websocket-FLV流地址") private String ws_flv; + @Schema(description = "Websockets-FLV流地址") private String wss_flv; + @Schema(description = "HTTP-FMP4流地址") private String fmp4; + @Schema(description = "HTTPS-FMP4流地址") private String https_fmp4; + @Schema(description = "Websocket-FMP4流地址") private String ws_fmp4; + @Schema(description = "Websockets-FMP4流地址") private String wss_fmp4; + @Schema(description = "HLS流地址") private String hls; + @Schema(description = "HTTPS-HLS流地址") private String https_hls; + @Schema(description = "Websocket-HLS流地址") private String ws_hls; + @Schema(description = "Websockets-HLS流地址") private String wss_hls; + @Schema(description = "HTTP-TS流地址") private String ts; + @Schema(description = "HTTPS-TS流地址") private String https_ts; + @Schema(description = "Websocket-TS流地址") private String ws_ts; + @Schema(description = "Websockets-TS流地址") private String wss_ts; + @Schema(description = "RTMP流地址") private String rtmp; + @Schema(description = "RTMPS流地址") private String rtmps; + @Schema(description = "RTSP流地址") private String rtsp; + @Schema(description = "RTSPS流地址") private String rtsps; + @Schema(description = "RTC流地址") private String rtc; + @Schema(description = "RTCS流地址") private String rtcs; + @Schema(description = "流媒体ID") private String mediaServerId; + @Schema(description = "流编码信息") private Object tracks; + @Schema(description = "开始时间") private String startTime; + @Schema(description = "结束时间") private String endTime; + @Schema(description = "进度（录像下载使用）") private double progress; + @Schema(description = "是否暂停（录像回放使用）") private boolean pause; public static class TransactionInfo{ diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java index 667daceb..20a31fec 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java @@ -129,7 +129,7 @@ public class PlayServiceImpl implements IPlayService { String uuid = UUID.randomUUID().toString(); msg.setId(uuid); playResult.setUuid(uuid); - DeferredResult> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue()); + DeferredResult> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue()); playResult.setResult(result); // 录像查询以channelId作为deviceId查询 resultHolder.put(key, uuid, result); 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 b9652541..d22e56b9 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 @@ -82,7 +82,7 @@ public class PlayController { @Parameter(name = "deviceId", description = "设备国标编号", required = true) @Parameter(name = "channelId", description = "通道国标编号", required = true) @GetMapping("/start/{deviceId}/{channelId}") - public DeferredResult> play(@PathVariable String deviceId, + public DeferredResult> play(@PathVariable String deviceId, @PathVariable String channelId) { // 获取可用的zlm diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/bean/PlayResult.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/bean/PlayResult.java index bfbf3eb3..58d4ce20 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/bean/PlayResult.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/bean/PlayResult.java @@ -1,5 +1,6 @@ package com.genersoft.iot.vmp.vmanager.gb28181.play.bean; +import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.gb28181.bean.Device; import com.genersoft.iot.vmp.vmanager.bean.WVPResult; import org.springframework.http.ResponseEntity; @@ -7,16 +8,16 @@ import org.springframework.web.context.request.async.DeferredResult; public class PlayResult { - private DeferredResult> result; + private DeferredResult> result; private String uuid; private Device device; - public DeferredResult> getResult() { + public DeferredResult> getResult() { return result; } - public void setResult(DeferredResult> result) { + public void setResult(DeferredResult> result) { this.result = result; }