优化对旧录像文件的处理

648540858
1 parent d7d49dee
Showing 4 changed files with 60 additions and 22 deletions
src/main/java/top/panll/assist/config/StartConfig.java
src/main/java/top/panll/assist/mapper/CloudRecordServiceMapper.java
src/main/java/top/panll/assist/utils/DateUtils.java
src/main/resources/application.yml
@@ -46,7 +46,7 @@ public class StartConfig implements CommandLineRunner {
     @Override
-    public void run(String... args) {
+    public void run(String... args) throws IOException {
         if (!record.endsWith(File.separator)) {
             record = record + File.separator;
         }
@@ -68,6 +68,7 @@ public class StartConfig implements CommandLineRunner {
         }
         List<CloudRecordItem> cloudRecordItemList = new ArrayList<>();
         Map<String, String> renameMap = new HashMap<>();
+        Map<String, List<CloudRecordItem>> dateVideoFileIndexList = new HashMap<>();
         List<String> streamFileList = new ArrayList<>();
         // 搜集数据
         for (File appFile : appFiles) {
@@ -92,24 +93,27 @@ public class StartConfig implements CommandLineRunner {
                         }
                         stream = streamInfoArray[0];
                         String callId = streamInfoArray[1];
-                        File[] dateFiles = streamFile.listFiles();
+                        boolean collect = false;
+                        boolean reserve = false;
+                        File[] signFiles = streamFile.listFiles(File::isFile);
+                        if (signFiles.length > 0) {
+                            for (File signFile : signFiles) {
+                                if (signFile.getName().equals("a.sign")) {
+                                    reserve = true; // 关联
+                                }else if (signFile.getName().equals("b.sign")) {
+                                    collect = true; // 归档
+                                }
+                            }
+                        }
+
+                        File[] dateFiles = streamFile.listFiles(File::isDirectory);
                         if (dateFiles == null || dateFiles.length == 0) {
                             continue;
                         }
                         streamFileList.add(streamFile.getAbsolutePath());
-                        // TODC 确定关联和归档分别使用了什么类型名称
-                        boolean collect = false;
-                        boolean reserve = false;
+
                         for (File dateFile : dateFiles) {
-                            if (dateFile.isFile()) {
-                                if (dateFile.getName().endsWith(".sign")) {
-                                    if (dateFile.getName().startsWith("a")) {
-                                        collect = true;
-                                    }else if (dateFile.getName().startsWith("b")) {
-                                        reserve = true;
-                                    }
-                                }
-                            }else {
+                            if (dateFile.isDirectory()) {
                                 // 检验是否是日期格式
                                 if (!DateUtils.checkDateFormat(dateFile.getName())) {
                                     continue;
@@ -119,6 +123,8 @@ public class StartConfig implements CommandLineRunner {
                                 if (videoFiles == null || videoFiles.length == 0) {
                                     continue;
                                 }
+
+
                                 for (int i = 0; i < videoFiles.length; i++) {
                                     File videoFile = videoFiles[i];
                                     if (!videoFile.getName().endsWith(".mp4") && !videoFile.getName().contains("-")) {
@@ -136,10 +142,16 @@ public class StartConfig implements CommandLineRunner {
                                     }
                                     String startTime = date + " "  + videoInfoArray[0];
                                     String endTime = date + " " + videoInfoArray[1];
-                                    Long startTimeStamp = DateUtils.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime);
-                                    Long endTimeStamp = DateUtils.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime);
+                                    Long startTimeStamp = DateUtils.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime) * 1000;
+                                    Long endTimeStamp = DateUtils.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) * 1000;
                                     long timeLength = Long.parseLong(videoInfoArray[2].substring(0, videoInfoArray[2].length() - 4));
+
+                                    String dataPath = appFile.getAbsolutePath() + File.separator +  stream + File.separator + dateFile.getName();
+                                    if (dateVideoFileIndexList.get(dataPath) == null) {
+                                        dateVideoFileIndexList.put(dataPath, new ArrayList<>());
+                                    }
+
                                     CloudRecordItem cloudRecordItem = new CloudRecordItem();
                                     cloudRecordItem.setApp(app);
                                     cloudRecordItem.setStream(stream);
@@ -149,14 +161,14 @@ public class StartConfig implements CommandLineRunner {
                                     cloudRecordItem.setCollect(collect);
                                     cloudRecordItem.setReserve(reserve);
                                     cloudRecordItem.setMediaServerId(mediaServerId);
-                                    cloudRecordItem.setFileName(DateUtils.getTimeStr(startTimeStamp) + "-" + i + ".mp4");
+                                    cloudRecordItem.setFileName(DateUtils.getTimeStr(startTimeStamp) + "-" + dateVideoFileIndexList.get(dataPath).size() + ".mp4");
                                     cloudRecordItem.setFolder(streamFile.getAbsolutePath());
                                     cloudRecordItem.setFileSize(videoFile.length());
                                     cloudRecordItem.setTimeLen(timeLength);
                                     cloudRecordItem.setFilePath(appFile.getAbsolutePath() + File.separator +  stream + File.separator + dateFile.getName() + File.separator + cloudRecordItem.getFileName());
                                     cloudRecordItemList.add(cloudRecordItem);
+                                    dateVideoFileIndexList.get(dataPath).add(cloudRecordItem);
                                     renameMap.put(videoFile.getAbsolutePath(), cloudRecordItem.getFilePath());
-                                    System.out.println(cloudRecordItem.getFilePath());
                                 }
                             }
                         }
@@ -195,6 +207,10 @@ public class StartConfig implements CommandLineRunner {
             logger.info("开始修改磁盘文件");
             for (String oldFileName : renameMap.keySet()) {
                 File oldFile = new File(oldFileName);
+                File newFile = new File(renameMap.get(oldFileName));
+                if (!newFile.getParentFile().exists()) {
+                    newFile.getParentFile().mkdirs();
+                }
                 boolean result = oldFile.renameTo(new File(renameMap.get(oldFileName)));
                 if (result) {
                     logger.info("重命名成功： " + oldFileName + "===" + renameMap.get(oldFileName));
@@ -203,7 +219,9 @@ public class StartConfig implements CommandLineRunner {
             logger.info("修改磁盘文件完成");
             logger.info("清理失效文件夹");
             for (String streamFileStr : streamFileList) {
-                new File(streamFileStr).delete();
+                System.out.println(streamFileStr);
+                File deleteFile = new File(streamFileStr);
+                deleteFile(deleteFile);
             }
             logger.info("清理失效文件夹结束");
         }
@@ -212,4 +230,22 @@ public class StartConfig implements CommandLineRunner {
     }
+    public void deleteFile(File file) {
+        if (!file.exists()) {
+            logger.warn("[删除文件] {} 不存在 ", file.getAbsolutePath());
+        }else {
+            if (file.isFile()) {
+                file.delete();
+                return;
+            }
+            File[] files = file.listFiles();
+            if (files.length > 0) {
+                for (File childFile : files) {
+                    deleteFile(childFile);
+                }
+            }
+            file.delete();
+        }
+    }
+
 }
@@ -90,13 +90,15 @@ public interface CloudRecordServiceMapper {
             " folder," +
             " file_path," +
             " file_size," +
+            " collect," +
+            " reserve," +
             " time_len " +
             ") " +
             "values " +
             "<foreach collection='cloudRecordItems' index='index' item='item' separator=','> " +
             "(#{item.app}, #{item.stream}, #{item.callId}, #{item.startTime}, " +
             "#{item.endTime}, #{item.mediaServerId}, #{item.fileName},#{item.folder}," +
-            "#{item.filePath}, #{item.fileSize}, #{item.timeLen}) " +
+            "#{item.filePath}, #{item.fileSize}, #{item.collect}, #{item.reserve}, #{item.timeLen}) " +
             "</foreach> " +
             "</script>")
     int batchAdd(@Param("cloudRecordItems") List<CloudRecordItem> cloudRecordItems);
@@ -49,7 +49,7 @@ public class DateUtils {
         return formatter.format(date);
     }
     public static String getTimeStr(Long dateTime) {
-        SimpleDateFormat formatter =  new SimpleDateFormat(PATTERNForTime);
+        SimpleDateFormat formatter =  new SimpleDateFormat(PATTERNForTime, Locale.CHINESE);
         return formatter.format(new Date(dateTime));
     }
@@ -17,7 +17,7 @@ user-settings:
   id: 1111
   media-server-id: 11212
   # [可选 ] zlm配置的录像路径，不配置则使用当前目录下的record目录 即： ./record
-  record: /home/lin/record1/
+  record: /home/lin/record/
   # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理, 不配置则不删除
   recordDay: 7
   # [可选 ] 录像下载合成临时文件保存时长， 不配置默认取值recordDay（单位： 天）每天晚12点自动对过期文件执行清理