优化多平台的命名规则

648540858
1 parent add6d0eb
Showing 11 changed files with 410 additions and 137 deletions
src/main/java/top/panll/assist/config/WebMvcConfig.java
src/main/java/top/panll/assist/controller/DownController.java
src/main/java/top/panll/assist/controller/RecordController.java
src/main/java/top/panll/assist/controller/bean/ControllerException.java
src/main/java/top/panll/assist/controller/bean/RecordFile.java
src/main/java/top/panll/assist/dto/AssistConstants.java
src/main/java/top/panll/assist/dto/VideoFile.java
src/main/java/top/panll/assist/service/FFmpegExecUtils.java
src/main/java/top/panll/assist/service/VideoFileFactory.java
src/main/java/top/panll/assist/service/VideoFileService.java
src/main/resources/static/download.html
@@ -14,6 +14,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import top.panll.assist.controller.bean.ControllerException;
 import top.panll.assist.controller.bean.ErrorCode;
+import top.panll.assist.controller.bean.RecordFile;
 import top.panll.assist.controller.bean.WVPResult;
 import top.panll.assist.dto.*;
 import top.panll.assist.service.VideoFileService;
@@ -22,6 +23,7 @@ import top.panll.assist.utils.RedisUtil;
  
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -160,7 +162,7 @@ public class RecordController {
      * 获取视频文件列表
      * @return
      */
-    @Operation(summary ="获取日期文件夹列表")
+    @Operation(summary ="获取视频文件列表")
     @Parameter(name = "page", description = "当前页", required = true)
     @Parameter(name = "count", description = "每页查询数量", required = true)
     @Parameter(name = "app", description = "应用名", required = true)
@@ -204,6 +206,54 @@ public class RecordController {
         }
     }
  
+    /**
+     * 获取视频文件列表
+     * @return
+     */
+    @Operation(summary ="获取视频文件列表")
+    @Parameter(name = "page", description = "当前页", required = true)
+    @Parameter(name = "count", description = "每页查询数量", required = true)
+    @Parameter(name = "app", description = "应用名", required = true)
+    @Parameter(name = "stream", description = "流ID", required = true)
+    @Parameter(name = "startTime", description = "开始时间(yyyy-MM-dd HH:mm:ss)", required = true)
+    @Parameter(name = "endTime", description = "结束时间(yyyy-MM-dd HH:mm:ss)", required = true)
+    @GetMapping(value = "/file/listWithDate")
+    @ResponseBody
+    public PageInfo<RecordFile> getRecordListWithDate(@RequestParam int page,
+                                                      @RequestParam int count,
+                                                      @RequestParam String app,
+                                                      @RequestParam String stream,
+                                                      @RequestParam(required = false) String startTime,
+                                                      @RequestParam(required = false) String endTime
+    ){
+
+        // 开始时间与结束时间可不传或只传其一
+        List<RecordFile> recordList = new ArrayList<>();
+        try {
+            Date startTimeDate  = null;
+            Date endTimeDate  = null;
+            if (startTime != null ) {
+                startTimeDate = formatter.parse(startTime);
+            }
+            if (endTime != null ) {
+                endTimeDate = formatter.parse(endTime);
+            }
+
+            List<File> filesInTime = videoFileService.getFilesInTime(app, stream, startTimeDate, endTimeDate);
+            if (filesInTime != null && filesInTime.size() > 0) {
+                for (File file : filesInTime) {
+                    recordList.add(RecordFile.instance(app, stream, file.getName(), file.getParentFile().getName()));
+                }
+            }
+            PageInfo<RecordFile> stringPageInfo = new PageInfo<>(recordList);
+            stringPageInfo.startPage(page, count);
+            return stringPageInfo;
+        } catch (ParseException e) {
+            logger.error("错误的开始时间[{}]或结束时间[{}]", startTime, endTime);
+            throw new ControllerException(ErrorCode.ERROR400.getCode(), "错误的开始时间或结束时间, e=" + e.getMessage());
+        }
+    }
+
  
     /**
      * 添加视频裁剪合并任务
+package top.panll.assist.controller.bean;
+
+public class RecordFile {
+    private String app;
+    private String stream;
+
+    private String fileName;
+
+    private String date;
+
+
+    public static RecordFile instance(String app, String stream, String fileName, String date) {
+        RecordFile recordFile = new RecordFile();
+        recordFile.setApp(app);
+        recordFile.setStream(stream);
+        recordFile.setFileName(fileName);
+        recordFile.setDate(date);
+        return recordFile;
+    }
+
+
+    public String getApp() {
+        return app;
+    }
+
+    public void setApp(String app) {
+        this.app = app;
+    }
+
+    public String getStream() {
+        return stream;
+    }
+
+    public void setStream(String stream) {
+        this.stream = stream;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+}
+package top.panll.assist.dto;
+
+import java.io.File;
+import java.util.Date;
+
+/**
+ * 视频文件
+ */
+public class VideoFile {
+
+    /**
+     * 文件对象
+     */
+    private File file;
+
+    /**
+     * 文件开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 文件结束时间
+     */
+    private Date endTime;
+
+
+    /**
+     * 时长, 单位：秒
+     */
+    private long duration;
+
+
+    /**
+     * 是否是目标格式
+     */
+    private boolean targetFormat;
+
+    public File getFile() {
+        return file;
+    }
+
+    public void setFile(File file) {
+        this.file = file;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public long getDuration() {
+        return duration;
+    }
+
+    public void setDuration(long duration) {
+        this.duration = duration;
+    }
+
+    public boolean isTargetFormat() {
+        return targetFormat;
+    }
+
+    public void setTargetFormat(boolean targetFormat) {
+        this.targetFormat = targetFormat;
+    }
+}
@@ -17,6 +17,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.util.DigestUtils;
 import top.panll.assist.dto.UserSettings;
+import top.panll.assist.dto.VideoFile;
 import top.panll.assist.utils.RedisUtil;
  
 import java.io.BufferedWriter;
@@ -93,13 +94,13 @@ public class FFmpegExecUtils implements InitializingBean{
         try {
             BufferedWriter bw =new BufferedWriter(new FileWriter(fileListName));
             for (File file : fils) {
-                String[] split = file.getName().split("-");
-                if (split.length != 3) continue;
-                String durationStr = split[2].replace(".mp4", "");
-                Double duration = Double.parseDouble(durationStr)/1000;
+                VideoFile videoFile = VideoFileFactory.createFile(this, file);
+                if (videoFile == null || !videoFile.isTargetFormat()) {
+                    return;
+                }
                 bw.write("file " + file.getAbsolutePath());
                 bw.newLine();
-                durationAll += duration;
+                durationAll += videoFile.getDuration();
             }
             bw.flush();
             bw.close();
@@ -127,16 +128,16 @@ public class FFmpegExecUtils implements InitializingBean{
             final double duration_ns = finalDurationAll * TimeUnit.SECONDS.toNanos(1);
             double percentage = progress.out_time_ns / duration_ns;
  
-            // Print out interesting information about the progress
-//            System.out.println(String.format(
-//                    "[%.0f%%] status:%s frame:%d time:%s ms fps:%.0f speed:%.2fx",
-//                    percentage * 100,
-//                    progress.status,
-//                    progress.frame,
-//                    FFmpegUtils.toTimecode(progress.out_time_ns, TimeUnit.NANOSECONDS),
-//                    progress.fps.doubleValue(),
-//                    progress.speed
-//            ));
+//             Print out interesting information about the progress
+            System.out.println(String.format(
+                    "[%.0f%%] status:%s frame:%d time:%s ms fps:%.0f speed:%.2fx",
+                    percentage * 100,
+                    progress.status,
+                    progress.frame,
+                    FFmpegUtils.toTimecode(progress.out_time_ns, TimeUnit.NANOSECONDS),
+                    progress.fps.doubleValue(),
+                    progress.speed
+            ));
  
             if (progress.status.equals(Progress.Status.END)){
                 callBack.run(progress.status.name(), percentage, recordFileResultPath);
+package top.panll.assist.service;
+
+import net.bramp.ffmpeg.probe.FFmpegProbeResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import top.panll.assist.dto.VideoFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class VideoFileFactory {
+
+    private final static Logger logger = LoggerFactory.getLogger(VideoFileFactory.class);
+
+    public static VideoFile createFile(FFmpegExecUtils ffmpegExecUtils, File file){
+        if (!file.exists()) {
+            return null;
+        }
+        if (!file.isFile()){
+            return null;
+        }
+        if (file.getName().startsWith(".")){
+            return null;
+        }
+        if (!file.getName().endsWith(".mp4")){
+            return null;
+        }
+        String date = file.getParentFile().getName();
+        if (file.getName().indexOf(":") > 0) {
+            // 格式为 HH:mm:ss-HH:mm:ss-时长
+
+            String[] split = file.getName().split("-");
+            if (split.length != 3) {
+                return null;
+            }
+            String startTimeStr = date + " " + split[0];
+            String endTimeStr = date + " " + split[1];
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            VideoFile videoFile = new VideoFile();
+            videoFile.setFile(file);
+            videoFile.setTargetFormat(false);
+            try {
+                Date startTimeDate = simpleDateFormat.parse(startTimeStr);
+                videoFile.setStartTime(startTimeDate);
+                Date endTimeDate = simpleDateFormat.parse(endTimeStr);
+                videoFile.setEndTime(endTimeDate);
+                videoFile.setDuration((endTimeDate.getTime() - startTimeDate.getTime()));
+            } catch (ParseException e) {
+                logger.error("[构建视频文件对象] 格式化时间失败, file:{}", file.getAbsolutePath(), e);
+                return null;
+            }
+            return videoFile;
+
+        }else if (getStrCountInStr(file.getName(), "-") == 3){
+
+            // 格式为zlm的录制格式 HH-mm-ss-序号
+            String startStr = file.getName().substring(0, file.getName().lastIndexOf("-"));
+            String startTimeStr = date  + " " + startStr;
+            VideoFile videoFile = null;
+            try {
+                FFmpegProbeResult fFmpegProbeResult = ffmpegExecUtils.getFfprobe().probe(file.getAbsolutePath());
+                double duration = fFmpegProbeResult.getFormat().duration * 1000;
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss");
+                Date startTimeDate = simpleDateFormat.parse(startTimeStr);
+                Date endTimeDate = new Date(startTimeDate.getTime() + new Double(duration).longValue());
+                videoFile = new VideoFile();
+                videoFile.setTargetFormat(false);
+                videoFile.setFile(file);
+                videoFile.setStartTime(startTimeDate);
+                videoFile.setEndTime(endTimeDate);
+                videoFile.setDuration((endTimeDate.getTime() - startTimeDate.getTime())/1000);
+            } catch (IOException e) {
+                logger.error("[构建视频文件对象] 获取视频时长失败, file:{}", file.getAbsolutePath(), e);
+                return null;
+            } catch (ParseException e) {
+                logger.error("[构建视频文件对象] 格式化时间失败, file:{}", file.getAbsolutePath(), e);
+                return null;
+            }
+            return videoFile;
+        }else if (getStrCountInStr(file.getName(), "-") == 2 && file.getName().length() == 10 ){
+            // 格式为zlm的录制格式 HH-mm-ss
+            String startTimeStr = date  + " " + file.getName();
+            VideoFile videoFile = null;
+            try {
+                FFmpegProbeResult fFmpegProbeResult = ffmpegExecUtils.getFfprobe().probe(file.getAbsolutePath());
+                double duration = fFmpegProbeResult.getFormat().duration * 1000;
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss");
+                Date startTimeDate = simpleDateFormat.parse(startTimeStr);
+                Date endTimeDate = new Date(startTimeDate.getTime() + new Double(duration).longValue());
+                videoFile = new VideoFile();
+                videoFile.setTargetFormat(false);
+                videoFile.setFile(file);
+                videoFile.setStartTime(startTimeDate);
+                videoFile.setEndTime(endTimeDate);
+                videoFile.setDuration((endTimeDate.getTime() - startTimeDate.getTime())/1000);
+            } catch (IOException e) {
+                logger.error("[构建视频文件对象] 获取视频时长失败, file:{}", file.getAbsolutePath(), e);
+                return null;
+            } catch (ParseException e) {
+                logger.warn("[构建视频文件对象] 格式化时间失败, file:{}", file.getAbsolutePath(), e);
+                return null;
+            }
+            return videoFile;
+        }else if (getStrCountInStr(file.getName(), "-") == 1 ){
+            // 格式为zlm的录制格式 HH-mm-ss
+            // 格式为 HH:mm:ss-HH:mm:ss-时长
+
+            String[] split = file.getName().split("-");
+            if (split.length != 2) {
+                return null;
+            }
+            String startTimeStr = date + " " + split[0];
+            String endTimeStr = date + " " + split[1];
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HHmmss");
+            VideoFile videoFile = new VideoFile();
+            videoFile.setTargetFormat(true);
+            videoFile.setFile(file);
+            try {
+                Date startTimeDate = simpleDateFormat.parse(startTimeStr);
+                videoFile.setStartTime(startTimeDate);
+                Date endTimeDate = simpleDateFormat.parse(endTimeStr);
+                videoFile.setEndTime(endTimeDate);
+                videoFile.setDuration((endTimeDate.getTime() - startTimeDate.getTime()));
+            } catch (ParseException e) {
+                logger.error("[构建视频文件对象] 格式化时间失败, file:{}", file.getAbsolutePath(), e);
+                return null;
+            }
+            return videoFile;
+        }else {
+            return null;
+        }
+    }
+
+
+    public static int getStrCountInStr(String sourceStr, String content) {
+        int index = sourceStr.indexOf(content);
+        if (index < 0) {
+            return 0;
+        }
+        int count = 1;
+        int lastIndex = sourceStr.lastIndexOf(content);
+        while (index != lastIndex) {
+            index = sourceStr.indexOf(content, index + 1);
+            count++;
+        }
+        return count;
+    }
+
+}
@@ -68,35 +68,6 @@ public class VideoFileService {
         return spaceInfo;
     }
  
-//    public String getPrintSize(long size) {
-//        // 如果字节数少于1024，则直接以B为单位，否则先除于1024，后3位因太少无意义
-//        if (size < 1024) {
-//            return String.valueOf(size) + "B";
-//        } else {
-//            size = size / 1024;
-//        }
-//        // 如果原字节数除于1024之后，少于1024，则可以直接以KB作为单位
-//        // 因为还没有到达要使用另一个单位的时候
-//        // 接下去以此类推
-//        if (size < 1024) {
-//            return String.valueOf(size) + "KB";
-//        } else {
-//            size = size / 1024;
-//        }
-//        if (size < 1024) {
-//            // 因为如果以MB为单位的话，要保留最后1位小数，
-//            // 因此，把此数乘以100之后再取余
-//            size = size * 100;
-//            return String.valueOf((size / 100)) + "."
-//                    + String.valueOf((size % 100)) + "MB";
-//        } else {
-//            // 否则如果要以GB为单位的，先除于1024再作同样的处理
-//            size = size * 100 / 1024;
-//            return String.valueOf((size / 100)) + "."
-//                    + String.valueOf((size % 100)) + "GB";
-//        }
-//    }
-
     public List<File> getStreamList(String app, Boolean sort) {
         File appFile = new File(userSettings.getRecord() + File.separator + app);
         return getStreamList(appFile, sort);
@@ -119,47 +90,32 @@ public class VideoFileService {
     }
  
     /**
-     * 对视频文件重命名， 00：00：00-00：00：00
-     * @param file
-     * @throws ParseException
+     * 对视频文件重命名
      */
     public void handFile(File file,String app, String stream) {
-        FFprobe ffprobe = ffmpegExecUtils.getFfprobe();
-        if(file.exists() && file.isFile() && !file.getName().startsWith(".")&& file.getName().endsWith(".mp4") && file.getName().indexOf(":") < 0) {
-            try {
-
-                FFmpegProbeResult in = ffprobe.probe(file.getAbsolutePath());
-                double duration = in.getFormat().duration * 1000;
-                String endTimeStr = file.getName().replace(".mp4", "");
-
-                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss");
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
-
-                File dateFile = new File(file.getParent());
+        VideoFile videoFile = VideoFileFactory.createFile(ffmpegExecUtils, file);
+        if (videoFile == null || videoFile.isTargetFormat()) {
+            return;
+        }
  
-                long startTime = formatter.parse(dateFile.getName() + " " + endTimeStr).getTime();
-                long durationLong = new Double(duration).longValue();
-                long endTime = startTime + durationLong;
-                endTime = endTime - endTime%1000;
+        SimpleDateFormat dateFormat = new SimpleDateFormat("HHmmss");
  
-                String key = AssistConstants.STREAM_CALL_INFO + userSettings.getId() + "_" + app + "_" + stream;
-                String callId = (String) redisUtil.get(key);
+        String key = AssistConstants.STREAM_CALL_INFO + userSettings.getId() + "_" + app + "_" + stream;
+        String callId = (String) redisUtil.get(key);
  
-                String streamNew = (callId == null? stream : stream + "_" + callId);
-                File newPath = new File(userSettings.getRecord() + File.separator +  app + File.separator + streamNew + File.separator + DateUtils.getDateStr(new Date(startTime)));
-                if (!newPath.exists()) {
-                    newPath.mkdirs();
-                }
+        String streamNew = (callId == null? stream : stream + "_" + callId);
+        File newPath = new File(userSettings.getRecord() + File.separator +  app + File.separator + streamNew
+                + File.separator + DateUtils.getDateStr(videoFile.getStartTime()));
+        if (!newPath.exists()) {
+            newPath.mkdirs();
+        }
  
-                String newName = newPath.getAbsolutePath() + File.separator+  simpleDateFormat.format(startTime) + "-" + simpleDateFormat.format(endTime) + "-" + durationLong + ".mp4";
-                file.renameTo(new File(newName));
-                System.out.println(file.getAbsolutePath());
-                logger.info("[处理文件] {}", file.getName());
-            } catch (IOException e) {
-                logger.warn("文件可能以损坏[{}]", file.getAbsolutePath());
-            } catch (ParseException e) {
-                logger.error("时间格式化失败", e.getMessage());
-            }
+        String newName = newPath.getAbsolutePath() + File.separator+  dateFormat.format(videoFile.getStartTime())
+                + "-" + dateFormat.format(videoFile.getEndTime()) + ".mp4";
+        logger.info("[处理文件] {}->{}", file.getAbsolutePath(), newName);
+        boolean renameTo = file.renameTo(new File(newName));
+        if (!renameTo) {
+            logger.info("[处理文件]文件重命名失败 {}->{}", file.getAbsolutePath(), newName);
         }
     }
  
@@ -199,7 +155,7 @@ public class VideoFileService {
                 time1 = simpleDateFormatForTime.parse(f1.get("time").toString());
                 time2 = simpleDateFormatForTime.parse(f2.get("time").toString());
             } catch (ParseException e) {
-                logger.error("时间格式化失败", e.getMessage());
+                logger.error("时间格式化失败", e);
             }
             return time1.compareTo(time2) * -1;
         });
@@ -221,7 +177,7 @@ public class VideoFileService {
             return result;
         }
  
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HHmmss");
         SimpleDateFormat formatterForDate = new SimpleDateFormat("yyyy-MM-dd");
         String startTimeStr = null;
         String endTimeStr = null;
@@ -277,54 +233,50 @@ public class VideoFileService {
  
         if (dateFiles != null && dateFiles.length > 0) {
             for (File dateFile : dateFiles) {
-                // TODO 按时间获取文件
                 File[] files = dateFile.listFiles((File dir, String name) ->{
-                    boolean filterResult = true;
                     File currentFile = new File(dir + File.separator + name);
-                    if (currentFile.isFile()  && name.contains(":") && name.endsWith(".mp4") && !name.startsWith(".") && currentFile.length() > 0){
-                        String[] timeArray = name.split("-");
-                        if (timeArray.length == 3){
-                            String fileStartTimeStr = dateFile.getName() + " " + timeArray[0];
-                            String fileEndTimeStr = dateFile.getName() + " " + timeArray[1];
-                            try {
-                                if (startTime != null) {
-                                    filterResult = filterResult &&  (formatter.parse(fileStartTimeStr).after(startTime) || (formatter.parse(fileStartTimeStr).before(startTime) && formatter.parse(fileEndTimeStr).after(startTime)));
-                                }
-                                if (endTime != null) {
-                                    filterResult = filterResult &&  (formatter.parse(fileEndTimeStr).before(endTime) || (formatter.parse(fileEndTimeStr).after(endTime) && formatter.parse(fileStartTimeStr).before(endTime)));
-                                }
-                            } catch (ParseException e) {
-                                logger.error("过滤视频文件时异常： {}-{}", name, e.getMessage());
-                                return false;
-                            }
-                        }
+                    VideoFile videoFile = VideoFileFactory.createFile(ffmpegExecUtils, currentFile);
+                    if (videoFile == null ) {
+                        return false;
                     }else {
-                        filterResult = false;
+                        if (!videoFile.isTargetFormat()) {
+                            return false;
+                        }
+                        if (startTime == null && endTime == null) {
+                           return true;
+                        }else if (startTime == null && endTime != null) {
+                            return videoFile.getEndTime().before(endTime)
+                                    || videoFile.getEndTime().equals(endTime)
+                                    || (videoFile.getEndTime().after(endTime) && videoFile.getStartTime().before(endTime));
+                        }else if (startTime != null && endTime == null) {
+                            return videoFile.getStartTime().after(startTime)
+                                    || videoFile.getStartTime().equals(startTime)
+                                    || (videoFile.getStartTime().before(startTime) && videoFile.getEndTime().after(startTime));
+                        }else {
+                            return videoFile.getStartTime().after(startTime)
+                                    || videoFile.getStartTime().equals(startTime)
+                                    || (videoFile.getStartTime().before(startTime) && videoFile.getEndTime().after(startTime))
+                                    || videoFile.getEndTime().before(endTime)
+                                    || videoFile.getEndTime().equals(endTime)
+                                    || (videoFile.getEndTime().after(endTime) && videoFile.getStartTime().before(endTime));
+                        }
+
                     }
-                    return filterResult;
                 });
-
-                List<File> fileList = Arrays.asList(files);
-                result.addAll(fileList);
+                if (files != null && files.length > 0) {
+                    result.addAll(Arrays.asList(files));
+                }
             }
         }
-        if (result.size() > 0) {
+        if (!result.isEmpty()) {
             result.sort((File f1, File f2) -> {
-                int sortResult = 0;
-                String[] timeArray1 = f1.getName().split("-");
-                String[] timeArray2 = f2.getName().split("-");
-                if (timeArray1.length == 3 && timeArray2.length == 3){
-                    File dateFile1 = f1.getParentFile();
-                    File dateFile2 = f2.getParentFile();
-                    String fileStartTimeStr1 = dateFile1.getName() + " " + timeArray1[0];
-                    String fileStartTimeStr2 = dateFile2.getName() + " " + timeArray2[0];
-                    try {
-                        sortResult = formatter.parse(fileStartTimeStr1).compareTo(formatter.parse(fileStartTimeStr2));
-                    } catch (ParseException e) {
-                        e.printStackTrace();
-                    }
+                VideoFile videoFile1 = VideoFileFactory.createFile(ffmpegExecUtils, f1);
+                VideoFile videoFile2 = VideoFileFactory.createFile(ffmpegExecUtils, f2);
+                if (videoFile1 == null || !videoFile1.isTargetFormat() || videoFile2 == null || !videoFile2.isTargetFormat()) {
+                    logger.warn("[根据时间获取视频文件] 排序错误，文件错误： {}/{}", f1.getName(), f2.getName());
+                    return 0;
                 }
-                return sortResult;
+                return videoFile1.getStartTime().compareTo(videoFile2.getStartTime());
             });
         }
         return result;
@@ -333,7 +285,7 @@ public class VideoFileService {
  
     public String mergeOrCut(String app, String stream, Date startTime, Date endTime, String remoteHost) {
         List<File> filesInTime = this.getFilesInTime(app, stream, startTime, endTime);
-        if (filesInTime== null || filesInTime.size() == 0){
+        if (filesInTime== null || filesInTime.isEmpty()){
             logger.info("此时间段未未找到视频文件， {}/{} {}->{}", app, stream,
                     startTime == null? null:DateUtils.getDateTimeStr(startTime),
                     endTime == null? null:DateUtils.getDateTimeStr(endTime));
@@ -457,6 +409,9 @@ public class VideoFileService {
             }
  
         });
+        if (dateFiles == null) {
+            return new ArrayList<>();
+        }
         List<File> dateFileList = Arrays.asList(dateFiles);
         if (sort != null && sort) {
             dateFileList.sort((File f1, File f2)->{
@@ -525,21 +480,6 @@ public class VideoFileService {
         return result;
     }
  
-    public boolean stopTask(String taskId) {
-//        Runnable task = taskList.get(taskId);
-//        boolean result = false;
-//        if (task != null) {
-//            processThreadPool.remove(task);
-//            taskList.remove(taskId);
-//            List<Object> taskCatch = redisUtil.scan(String.format("%S_*_*_%S", keyStr, taskId));
-//            if (taskCatch.size() == 1) {
-//                redisUtil.del((String) taskCatch.get(0));
-//                result = true;
-//            }
-//        }
-        return false;
-    }
-
     public boolean collection(String app, String stream, String type) {
         File streamFile = new File(userSettings.getRecord() + File.separator + app + File.separator + stream);
         boolean result = false;