From 1e1364e51a66614469b91e396d33a54bdf8f6e98 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 14:33:25 +0800
Subject: [PATCH] 修复开始点播功能接口调用返回参数与定义的不符 #635

---
 src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java          |    2 +-
 src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java                     |   36 +++++++++++++++++++++++++++++++++++-
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java  |    2 +-
 src/main/java/com/genersoft/iot/vmp/vmanager/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 928c305..93d837c 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 = "娴両D")
     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 = "娴佸獟浣揑D")
     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 667dace..20a31fe 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 @@
         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);
         // 褰曞儚鏌ヨ浠hannelId浣滀负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 b965254..d22e56b 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 @@
 	@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
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 bfbf3eb..58d4ce2 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 @@
 
 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;
     }
 

--
Gitblit v1.8.0