修复开始点播功能接口调用返回参数与定义的不符 #635

648540858
1 parent 72e91f69
Showing 4 changed files with 41 additions and 6 deletions
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/bean/PlayResult.java
 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{
@@ -129,7 +129,7 @@ public class PlayServiceImpl implements IPlayService {
         String uuid = UUID.randomUUID().toString();
         msg.setId(uuid);
         playResult.setUuid(uuid);
-        DeferredResult<WVPResult<String>> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
+        DeferredResult<WVPResult<StreamInfo>> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
         playResult.setResult(result);
         // 录像查询以channelId作为deviceId查询
         resultHolder.put(key, uuid, result);
@@ -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<WVPResult<String>> play(@PathVariable String deviceId,
+	public DeferredResult<WVPResult<StreamInfo>> play(@PathVariable String deviceId,
 													   @PathVariable String channelId) {
 		// 获取可用的zlm
 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<WVPResult<String>> result;
+    private DeferredResult<WVPResult<StreamInfo>> result;
     private String uuid;
     private Device device;
-    public DeferredResult<WVPResult<String>> getResult() {
+    public DeferredResult<WVPResult<StreamInfo>> getResult() {
         return result;
     }
-    public void setResult(DeferredResult<WVPResult<String>> result) {
+    public void setResult(DeferredResult<WVPResult<StreamInfo>> result) {
         this.result = result;
     }