From 16c056e338b7d2006da05f1f70bf87624f458d3d Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Mon, 23 Oct 2023 17:59:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=91=E7=AB=AF=E5=BD=95?= =?UTF-8?q?=E5=83=8F=E8=BD=AC=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/初始化.sql | 2 +- .../iot/vmp/media/zlm/dto/MediaServerItem.java | 14 -------------- .../media/zlm/dto/hook/OnRecordMp4HookParam.java | 6 +++--- .../iot/vmp/service/bean/CloudRecordItem.java | 6 +++--- .../iot/vmp/service/impl/PlayServiceImpl.java | 3 ++- .../java/com/genersoft/iot/vmp/utils/DateUtil.java | 2 +- 6 files changed, 10 insertions(+), 23 deletions(-) diff --git a/sql/初始化.sql b/sql/初始化.sql index 42798e4f..9a90db7c 100644 --- a/sql/初始化.sql +++ b/sql/初始化.sql @@ -282,7 +282,7 @@ create table wvp_cloud_record ( collect bool default false, reserve bool default false, file_size integer, - time_len integer, + time_len float, constraint uk_stream_push_app_stream_path unique (app, stream, file_path) ); diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java index 7cbb2ae9..365f1540 100755 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java @@ -80,15 +80,9 @@ public class MediaServerItem{ @Schema(description = "是否是默认ZLM") private boolean defaultServer; - @Schema(description = "录像存储路径") - private String recordPath; - @Schema(description = "录像存储时长") private int recordDate; - - - public MediaServerItem() { } @@ -306,14 +300,6 @@ public class MediaServerItem{ this.sendRtpPortRange = sendRtpPortRange; } - public String getRecordPath() { - return recordPath; - } - - public void setRecordPath(String recordPath) { - this.recordPath = recordPath; - } - public int getRecordDate() { return recordDate; } diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnRecordMp4HookParam.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnRecordMp4HookParam.java index 80db8b01..d52165ed 100755 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnRecordMp4HookParam.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnRecordMp4HookParam.java @@ -14,7 +14,7 @@ public class OnRecordMp4HookParam extends HookParam{ private String url; private String vhost; private long start_time; - private long time_len; + private double time_len; public String getApp() { return app; @@ -88,11 +88,11 @@ public class OnRecordMp4HookParam extends HookParam{ this.start_time = start_time; } - public long getTime_len() { + public double getTime_len() { return time_len; } - public void setTime_len(long time_len) { + public void setTime_len(double time_len) { this.time_len = time_len; } diff --git a/src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java b/src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java index 897dc9a7..771e4c81 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java +++ b/src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java @@ -80,14 +80,14 @@ public class CloudRecordItem { CloudRecordItem cloudRecordItem = new CloudRecordItem(); cloudRecordItem.setApp(param.getApp()); cloudRecordItem.setStream(param.getStream()); - cloudRecordItem.setStartTime(param.getStart_time()); + cloudRecordItem.setStartTime(param.getStart_time()*1000); cloudRecordItem.setFileName(param.getFile_name()); cloudRecordItem.setFolder(param.getFolder()); cloudRecordItem.setFileSize(param.getFile_size()); cloudRecordItem.setFilePath(param.getFile_path()); cloudRecordItem.setMediaServerId(param.getMediaServerId()); - cloudRecordItem.setTimeLen(param.getTime_len()); - cloudRecordItem.setEndTime(param.getStart_time() + param.getTime_len()); + cloudRecordItem.setTimeLen((long) param.getTime_len() * 1000); + cloudRecordItem.setEndTime((param.getStart_time() + (long)param.getTime_len()) * 1000); return cloudRecordItem; } 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 87b839f7..0d1bad69 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java @@ -780,11 +780,12 @@ public class PlayServiceImpl implements IPlayService { } else { String startTime = inviteInfo.getStreamInfo().getStartTime(); String endTime = inviteInfo.getStreamInfo().getEndTime(); + // 此时start和end单位是秒 long start = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime); long end = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime); BigDecimal currentCount = new BigDecimal(duration); - BigDecimal totalCount = new BigDecimal(end - start); + BigDecimal totalCount = new BigDecimal((end - start) * 1000); BigDecimal divide = currentCount.divide(totalCount, 2, RoundingMode.HALF_UP); double process = divide.doubleValue(); inviteInfo.getStreamInfo().setProgress(process); diff --git a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java index 93d4086d..617d9f24 100755 --- a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java +++ b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java @@ -89,7 +89,7 @@ public class DateUtil { * 时间戳 转 yyyy_MM_dd */ public static String timestampTo_yyyy_MM_dd(long timestamp) { - Instant instant = Instant.ofEpochSecond(timestamp); + Instant instant = Instant.ofEpochMilli(timestamp); return DateFormatter.format(LocalDateTime.ofInstant(instant, ZoneId.of(zoneStr))); }