Merge branch 'refs/heads/2.7.1'

648540858

2024-06-25 57a230afb3b02cedf8ec39cd60e5163f953e3260

 src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java

@@ -98,6 +98,9 @@
    @Schema(description = "文件下载地址（录像下载使用）")
    private DownloadFileInfo downLoadFilePath;

    @Schema(description = "转码后的视频流")
    private StreamContent transcodeStream;

    private double progress;

    public StreamContent(StreamInfo streamInfo) {
@@ -179,6 +182,17 @@
        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() {