From 402ffa0b1e6b0453338a57469e00903564ac53f5 Mon Sep 17 00:00:00 2001 From: linshunhua <my_lv@163.com> Date: 星期二, 06 八月 2024 16:52:22 +0800 Subject: [PATCH] 修复在ORACLE,达梦等数据库下的用户查询BUG --- src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java | 43 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 37 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 abf6df4..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,6 +1,8 @@ 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 = "娴佷俊鎭�") @@ -85,13 +87,19 @@ private String mediaServerId; @Schema(description = "娴佺紪鐮佷俊鎭�") - private Object tracks; + 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; @@ -166,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() { @@ -380,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() { @@ -411,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