From ab491a079ba4ab85ffef35d14c0767eba01455d8 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 15 一月 2025 09:18:36 +0800 Subject: [PATCH] 切正式服 --- src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 94 insertions(+), 7 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 e7c24aa..ce74251 --- 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,44 +1,105 @@ 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; - private String mediaServerId; - private Object tracks; + @Schema(description = "娴佸獟浣揑D") + private String mediaServerId; + + @Schema(description = "娴佺紪鐮佷俊鎭�") + private MediaInfo mediaInfo; + + @Schema(description = "寮�濮嬫椂闂�") private String startTime; + @Schema(description = "缁撴潫鏃堕棿") private String endTime; + + @Schema(description = "鏂囦欢涓嬭浇鍦板潃锛堝綍鍍忎笅杞戒娇鐢級") + private DownloadFileInfo downLoadFilePath; + + @Schema(description = "杞爜鍚庣殑瑙嗛娴�") + private StreamContent transcodeStream; private double progress; @@ -62,6 +123,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(); @@ -110,10 +174,25 @@ } 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(); + } + if (streamInfo.getTranscodeStream() != null) { + this.transcodeStream = new StreamContent(streamInfo.getTranscodeStream()); + } + } + + public StreamContent getTranscodeStream() { + return transcodeStream; + } + + public void setTranscodeStream(StreamContent transcodeStream) { + this.transcodeStream = transcodeStream; } public String getApp() { @@ -324,12 +403,12 @@ 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() { @@ -355,4 +434,12 @@ 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