修复合并功能

648540858
1 parent 841e314f
Showing 4 changed files with 109 additions and 11 deletions
src/main/java/top/panll/assist/controller/RecordController.java
src/main/java/top/panll/assist/dto/MergeOrCutTaskInfo.java
src/main/java/top/panll/assist/dto/VideoTaskInfo.java
src/main/java/top/panll/assist/service/VideoFileService.java
@@ -266,7 +266,7 @@ public class RecordController {
         if (videoTaskInfo.getFilePathList() == null || videoTaskInfo.getFilePathList().isEmpty()) {
             throw new ControllerException(ErrorCode.ERROR100.getCode(), "视频文件列表不可为空");
         }
-        String id = videoFileService.mergeOrCut(videoTaskInfo.getFilePathList(), videoTaskInfo.getRemoteHost());
+        String id = videoFileService.mergeOrCut(videoTaskInfo);
         if (id== null) {
             throw new ControllerException(ErrorCode.ERROR100.getCode(), "可能未找到视频文件");
         }
@@ -12,6 +12,12 @@ public class MergeOrCutTaskInfo {
  
     private String playFile;
  
+    private String app;
+    private String stream;
+    private String startTime;
+    private String endTime;
+    private String callId;
+
     public String getId() {
         return id;
     }
@@ -59,4 +65,44 @@ public class MergeOrCutTaskInfo {
     public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
+
+    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 getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getCallId() {
+        return callId;
+    }
+
+    public void setCallId(String callId) {
+        this.callId = callId;
+    }
 }
@@ -8,6 +8,13 @@ import java.util.List;
 @Schema(description = "视频合并任务的信息")
 public class VideoTaskInfo {
  
+    private String app;
+    private String stream;
+    private String startTime;
+    private String endTime;
+    private String callId;
+
+
     @Schema(description = "视频文件路径列表")
     private List<String> filePathList;
  
@@ -29,4 +36,44 @@ public class VideoTaskInfo {
     public void setRemoteHost(String remoteHost) {
         this.remoteHost = remoteHost;
     }
+
+    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 getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getCallId() {
+        return callId;
+    }
+
+    public void setCallId(String callId) {
+        this.callId = callId;
+    }
 }
@@ -207,13 +207,13 @@ public class VideoFileService {
     }
  
  
-    public String mergeOrCut(List<String> filePathList, String remoteHost) {
-        assert filePathList != null;
-        assert !filePathList.isEmpty();
+    public String mergeOrCut(VideoTaskInfo videoTaskInfo) {
+        assert videoTaskInfo.getFilePathList() != null;
+        assert !videoTaskInfo.getFilePathList().isEmpty();
         String taskId = DigestUtils.md5DigestAsHex(String.valueOf(System.currentTimeMillis()).getBytes());
         logger.info("[录像合并] 开始合并， 任务ID：{}: ", taskId);
         List<File> fileList = new ArrayList<>();
-        for (String filePath : filePathList) {
+        for (String filePath : videoTaskInfo.getFilePathList()) {
             File file = new File(filePath);
             if (!file.exists()) {
                 logger.info("[录像合并] 失败， 任务ID：{}, 文件不存在: {}", taskId, filePath);
@@ -226,6 +226,11 @@ public class VideoFileService {
         File recordFile = new File(userSettings.getRecord() );
         MergeOrCutTaskInfo mergeOrCutTaskInfo = new MergeOrCutTaskInfo();
         mergeOrCutTaskInfo.setId(taskId);
+        mergeOrCutTaskInfo.setApp(videoTaskInfo.getApp());
+        mergeOrCutTaskInfo.setStream(videoTaskInfo.getStream());
+        mergeOrCutTaskInfo.setCallId(videoTaskInfo.getCallId());
+        mergeOrCutTaskInfo.setStartTime(videoTaskInfo.getStartTime());
+        mergeOrCutTaskInfo.setEndTime(videoTaskInfo.getEndTime());
         mergeOrCutTaskInfo.setCreateTime(simpleDateFormatForTime.format(System.currentTimeMillis()));
         if (fileList.size() == 1) {
  
@@ -241,9 +246,9 @@ public class VideoFileService {
                 throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
             }
             mergeOrCutTaskInfo.setRecordFile("/download/" + relativize.toString());
-            if (remoteHost != null) {
-                mergeOrCutTaskInfo.setDownloadFile(remoteHost + "/download.html?url=download/" + relativize);
-                mergeOrCutTaskInfo.setPlayFile(remoteHost + "/download/" + relativize);
+            if (videoTaskInfo.getRemoteHost() != null) {
+                mergeOrCutTaskInfo.setDownloadFile(videoTaskInfo.getRemoteHost() + "/download.html?url=download/" + relativize);
+                mergeOrCutTaskInfo.setPlayFile(videoTaskInfo.getRemoteHost() + "/download/" + relativize);
             }
             String key = String.format("%S_%S_%S", AssistConstants.MERGEORCUT , userSettings.getId(), mergeOrCutTaskInfo.getId());
             redisUtil.set(key, mergeOrCutTaskInfo);
@@ -257,9 +262,9 @@ public class VideoFileService {
                     // 处理文件路径
                     Path relativize = Paths.get(userSettings.getRecord()).relativize(Paths.get(result));
                     mergeOrCutTaskInfo.setRecordFile(relativize.toString());
-                    if (remoteHost != null) {
-                        mergeOrCutTaskInfo.setDownloadFile(remoteHost + "/download.html?url=download/" + relativize);
-                        mergeOrCutTaskInfo.setPlayFile(remoteHost + "/download/" + relativize);
+                    if (videoTaskInfo.getRemoteHost() != null) {
+                        mergeOrCutTaskInfo.setDownloadFile(videoTaskInfo.getRemoteHost() + "/download.html?url=download/" + relativize);
+                        mergeOrCutTaskInfo.setPlayFile(videoTaskInfo.getRemoteHost() + "/download/" + relativize);
                     }
                     logger.info("[录像合并] 成功， 任务ID：{}", taskId);
                 }else {