From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 112 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
old mode 100644
new mode 100755
index 368399b..193c95d
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
@@ -1,40 +1,104 @@
package com.genersoft.iot.vmp.vmanager.bean;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.media.bean.MediaInfo;
+import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
+import io.swagger.v3.oas.annotations.media.Schema;
+@Schema(description = "娴佷俊鎭�")
public class StreamContent {
+ @Schema(description = "搴旂敤鍚�")
private String app;
+
+ @Schema(description = "娴両D")
private String stream;
+ @Schema(description = "IP")
private String ip;
+ @Schema(description = "HTTP-FLV娴佸湴鍧�")
private String flv;
+ @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;
- private Object tracks;
+
+ @Schema(description = "娴佺紪鐮佷俊鎭�")
+ private MediaInfo mediaInfo;
+
+ @Schema(description = "寮�濮嬫椂闂�")
+ private String startTime;
+
+ @Schema(description = "缁撴潫鏃堕棿")
+ private String endTime;
+
+ @Schema(description = "鏂囦欢涓嬭浇鍦板潃锛堝綍鍍忎笅杞戒娇鐢級")
+ private DownloadFileInfo downLoadFilePath;
+
+ private double progress;
public StreamContent(StreamInfo streamInfo) {
if (streamInfo == null) {
@@ -56,6 +120,9 @@
}
if (streamInfo.getFmp4() != null) {
this.fmp4 = streamInfo.getFmp4().getUrl();
+ }
+ if (streamInfo.getHttps_fmp4() != null) {
+ this.https_fmp4 = streamInfo.getHttps_fmp4().getUrl();
}
if (streamInfo.getWs_fmp4() != null) {
this.ws_fmp4 = streamInfo.getWs_fmp4().getUrl();
@@ -104,7 +171,14 @@
}
this.mediaServerId = streamInfo.getMediaServerId();
- this.tracks = streamInfo.getTracks();
+ this.mediaInfo = streamInfo.getMediaInfo();
+ this.startTime = streamInfo.getStartTime();
+ this.endTime = streamInfo.getEndTime();
+ this.progress = streamInfo.getProgress();
+
+ if (streamInfo.getDownLoadFilePath() != null) {
+ this.downLoadFilePath = streamInfo.getDownLoadFilePath();
+ }
}
public String getApp() {
@@ -315,11 +389,43 @@
this.mediaServerId = mediaServerId;
}
- public Object getTracks() {
- return tracks;
+ public MediaInfo getMediaInfo() {
+ return mediaInfo;
}
- public void setTracks(Object tracks) {
- this.tracks = tracks;
+ public void setMediaInfo(MediaInfo mediaInfo) {
+ this.mediaInfo = mediaInfo;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public double getProgress() {
+ return progress;
+ }
+
+ public void setProgress(double progress) {
+ this.progress = progress;
+ }
+
+ public DownloadFileInfo getDownLoadFilePath() {
+ return downLoadFilePath;
+ }
+
+ public void setDownLoadFilePath(DownloadFileInfo downLoadFilePath) {
+ this.downLoadFilePath = downLoadFilePath;
}
}
--
Gitblit v1.8.0