From 87e01cbe56c9f5de1c89e88ca563b4def8035664 Mon Sep 17 00:00:00 2001
From: xuhong <1987xuhong@163.com>
Date: Wed, 14 Dec 2022 11:31:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=BF=9B=E5=BA=A6=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC=E6=94=B9=E5=9B=9EStreamInf?=
 =?UTF-8?q?o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/genersoft/iot/vmp/service/IPlayService.java    | 2 +-
 .../com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 6 +++---
 .../iot/vmp/vmanager/gb28181/record/GBRecordController.java | 2 +-
 web_src/src/components/dialog/devicePlayer.vue              | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java b/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
index ba04d466a..b1c46eb62 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
@@ -44,7 +44,7 @@ public interface IPlayService {
     DeferredResult<WVPResult<StreamContent>> download(String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, InviteStreamCallback infoCallBack, PlayBackCallback hookCallBack);
     DeferredResult<WVPResult<StreamContent>> download(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo,String deviceId,  String channelId, String startTime, String endTime, int downloadSpeed, InviteStreamCallback infoCallBack, PlayBackCallback hookCallBack);
 
-    StreamContent getDownLoadInfo(String deviceId, String channelId, String stream);
+    StreamInfo getDownLoadInfo(String deviceId, String channelId, String stream);
 
     void zlmServerOnline(String mediaServerId);
 
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 69405923a..39f104e8b 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
@@ -681,11 +681,11 @@ public class PlayServiceImpl implements IPlayService {
     }
 
     @Override
-    public StreamContent getDownLoadInfo(String deviceId, String channelId, String stream) {
+    public StreamInfo getDownLoadInfo(String deviceId, String channelId, String stream) {
         StreamInfo streamInfo = redisCatchStorage.queryDownload(deviceId, channelId, stream, null);
         if (streamInfo != null) {
             if (streamInfo.getProgress() == 1) {
-                return new StreamContent(streamInfo);
+                return streamInfo;
             }
 
             // 获取当前已下载时长
@@ -717,7 +717,7 @@ public class PlayServiceImpl implements IPlayService {
                 }
             }
         }
-        return new StreamContent(streamInfo);
+        return streamInfo;
     }
 
     @Override
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
index 8758763b0..586d816ea 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
@@ -169,7 +169,7 @@ public class GBRecordController {
 	@Parameter(name = "channelId", description = "通道国标编号", required = true)
 	@Parameter(name = "stream", description = "流ID", required = true)
 	@GetMapping("/download/progress/{deviceId}/{channelId}/{stream}")
-	public StreamContent getProgress(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
+	public StreamInfo getProgress(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) {
 		return playService.getDownLoadInfo(deviceId, channelId, stream);
 	}
 }
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index 9ecbb9b2d..f1e20bd82 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -579,7 +579,7 @@ export default {
                   // 处理时间信息
                   that.videoHistory.searchHistoryResult = res.data.data.recordList;
                 }else {
-                  this.$message({
+                  that.$message({
                     showClose: true,
                     message: res.data.msg,
                     type: "error",
@@ -652,7 +652,7 @@ export default {
                     that.streamId = "";
                     that.downloadRecord(row);
                   }else {
-                    this.$message({
+                    that.$message({
                       showClose: true,
                       message: res.data.msg,
                       type: "error",