From 16c056e338b7d2006da05f1f70bf87624f458d3d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 23 十月 2023 17:59:27 +0800
Subject: [PATCH] 优化云端录像转化

---
 src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java            |    3 ++-
 src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java                          |    2 +-
 src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java            |    6 +++---
 sql/初始化.sql                                                                      |    2 +-
 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java           |   14 --------------
 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnRecordMp4HookParam.java |    6 +++---
 6 files changed, 10 insertions(+), 23 deletions(-)

diff --git "a/sql/\345\210\235\345\247\213\345\214\226.sql" "b/sql/\345\210\235\345\247\213\345\214\226.sql"
index 42798e4..9a90db7 100644
--- "a/sql/\345\210\235\345\247\213\345\214\226.sql"
+++ "b/sql/\345\210\235\345\247\213\345\214\226.sql"
@@ -282,7 +282,7 @@
                                   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 7cbb2ae..365f154 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,14 +80,8 @@
     @Schema(description = "鏄惁鏄粯璁LM")
     private boolean defaultServer;
 
-    @Schema(description = "褰曞儚瀛樺偍璺緞")
-    private String recordPath;
-
     @Schema(description = "褰曞儚瀛樺偍鏃堕暱")
     private int recordDate;
-
-
-
 
     public MediaServerItem() {
     }
@@ -304,14 +298,6 @@
 
     public void setSendRtpPortRange(String sendRtpPortRange) {
         this.sendRtpPortRange = sendRtpPortRange;
-    }
-
-    public String getRecordPath() {
-        return recordPath;
-    }
-
-    public void setRecordPath(String recordPath) {
-        this.recordPath = recordPath;
     }
 
     public int getRecordDate() {
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 80db8b0..d52165e 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 @@
     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 @@
         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 897dc9a..771e4c8 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 @@
         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 87b839f..0d1bad6 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 @@
             } else {
                 String startTime = inviteInfo.getStreamInfo().getStartTime();
                 String endTime = inviteInfo.getStreamInfo().getEndTime();
+                // 姝ゆ椂start鍜宔nd鍗曚綅鏄
                 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 93d4086..617d9f2 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 @@
      * 鏃堕棿鎴� 杞� 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)));
     }
 

--
Gitblit v1.8.0