只保留录像合并功能

648540858
1 parent 858ae0f0
Showing 6 changed files with 24 additions and 106 deletions
src/main/java/top/panll/assist/config/StartConfig.java
src/main/java/top/panll/assist/config/WebMvcConfig.java
src/main/java/top/panll/assist/dto/UserSettings.java
src/main/java/top/panll/assist/service/FileManagerTimer.java
src/main/java/top/panll/assist/service/VideoFileService.java
src/main/resources/all-application.yml
-package top.panll.assist.config;
-
-import net.bramp.ffmpeg.FFmpeg;
-import net.bramp.ffmpeg.FFprobe;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import top.panll.assist.dto.UserSettings;
-import top.panll.assist.service.FFmpegExecUtils;
-import top.panll.assist.service.VideoFileService;
-
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-
-/**
- * 用于启动检查环境
- */
-@Component
-@Order(value=1)
-public class StartConfig implements CommandLineRunner {
-
-    private final static Logger logger = LoggerFactory.getLogger(StartConfig.class);
-
-    @Value("${server.port}")
-    private String port;
-
-    @Autowired
-    private UserSettings userSettings;
-
-    @Autowired
-    private VideoFileService videoFileService;
-
-
-    @Override
-    public void run(String... args) {
-        String record = userSettings.getRecord();
-        if (!record.endsWith(File.separator)) {
-            userSettings.setRecord(userSettings.getRecord() + File.separator);
-        }
-
-        File recordFile = new File(record);
-        if (!recordFile.exists()){
-            logger.warn("[userSettings.record]路径不存在，开始创建");
-            boolean mkResult = recordFile.mkdirs();
-            if (!mkResult) {
-                logger.info("[userSettings.record]目录创建失败");
-                System.exit(1);
-            }
-        }else {
-            if ( !recordFile.isDirectory()) {
-                logger.warn("[userSettings.record]路径是文件，请修改为目录");
-                System.exit(1);
-            }
-            if (!recordFile.canRead()) {
-                logger.error("[userSettings.record]路径无法读取");
-                System.exit(1);
-            }
-            if (!recordFile.canWrite()) {
-                logger.error("[userSettings.record]路径无法写入");
-                System.exit(1);
-            }
-        }
-    }
-}
@@ -17,7 +17,7 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter {
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        File file = new File(userSettings.getRecord());
+        File file = new File(userSettings.getRecordTempPath());
         registry.addResourceHandler("/download/**").addResourceLocations("file://" + file.getAbsolutePath() + "/");
         super.addResourceHandlers(registry);
     }
@@ -13,12 +13,9 @@ public class UserSettings {
     private String id;
     @Value("${userSettings.record}")
-    private String record;
+    private String recordTempPath = "./recordTemp";
-    @Value("${userSettings.recordDay:7}")
-    private int recordDay;
-
-    @Value("${userSettings.recordTempDay:-1}")
+    @Value("${userSettings.recordTempDay:7}")
     private int recordTempDay;
     @Value("${userSettings.ffmpeg}")
@@ -38,14 +35,6 @@ public class UserSettings {
         this.id = id;
     }
-    public String getRecord() {
-        return record;
-    }
-
-    public void setRecord(String record) {
-        this.record = record;
-    }
-
     public String getFfmpeg() {
         return ffmpeg;
     }
@@ -62,20 +51,9 @@ public class UserSettings {
         this.ffprobe = ffprobe;
     }
-    public int getRecordDay() {
-        return recordDay;
-    }
-
-    public void setRecordDay(int recordDay) {
-        this.recordDay = recordDay;
-    }
     public int getRecordTempDay() {
-        if (recordTempDay == -1) {
-            return recordDay;
-        }else {
-            return recordTempDay;
-        }
+        return recordTempDay;
     }
     public void setRecordTempDay(int recordTempDay) {
@@ -89,4 +67,12 @@ public class UserSettings {
     public void setThreads(int threads) {
         this.threads = threads;
     }
+
+    public String getRecordTempPath() {
+        return recordTempPath;
+    }
+
+    public void setRecordTempPath(String recordTempPath) {
+        this.recordTempPath = recordTempPath;
+    }
 }
@@ -39,7 +39,7 @@ public class FileManagerTimer {
 //    @Scheduled(fixedDelay = 2000)   //测试 20秒执行一次
     @Scheduled(cron = "0 0 0 * * ?")   //每天的0点执行
     public void execute(){
-        if (userSettings.getRecord() == null) {
+        if (userSettings.getRecordTempPath() == null) {
             return;
         }
@@ -51,7 +51,7 @@ public class FileManagerTimer {
         lastTempCalendar.add(Calendar.DAY_OF_MONTH, -recordTempDay);
         lastTempDate = lastTempCalendar.getTime();
         logger.info("[录像巡查]移除合并任务临时文件 {} 之前的文件", formatter.format(lastTempDate));
-        File recordTempFile = new File(userSettings.getRecord());
+        File recordTempFile = new File(userSettings.getRecordTempPath());
         if (recordTempFile.exists() && recordTempFile.isDirectory() && recordTempFile.canWrite()) {
             File[] tempFiles = recordTempFile.listFiles();
             if (tempFiles != null) {
@@ -46,7 +46,7 @@ public class VideoFileService {
     private final SimpleDateFormat simpleDateFormatForTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     public List<File> getAppList(Boolean sort) {
-        File recordFile = new File(userSettings.getRecord());
+        File recordFile = new File(userSettings.getRecordTempPath());
         if (recordFile.isDirectory()) {
             File[] files = recordFile.listFiles((File dir, String name) -> {
                 File currentFile = new File(dir.getAbsolutePath() + File.separator + name);
@@ -63,7 +63,7 @@ public class VideoFileService {
     }
     public SpaceInfo getSpaceInfo(){
-        File recordFile = new File(userSettings.getRecord());
+        File recordFile = new File(userSettings.getRecordTempPath());
         SpaceInfo spaceInfo = new SpaceInfo();
         spaceInfo.setFree(recordFile.getFreeSpace());
         spaceInfo.setTotal(recordFile.getTotalSpace());
@@ -116,7 +116,7 @@ public class VideoFileService {
         logger.debug("获取[app: {}, stream: {}, statime: {}, endTime: {}]的视频", app, stream,
                 startTimeStr, endTimeStr);
-        File recordFile = new File(userSettings.getRecord());
+        File recordFile = new File(userSettings.getRecordTempPath());
         File streamFile = new File(recordFile.getAbsolutePath() + File.separator + app + File.separator + stream + File.separator);
         if (!streamFile.exists()) {
             logger.warn("获取[app: {}, stream: {}, statime: {}, endTime: {}]的视频时未找到目录： {}", app, stream,
@@ -223,7 +223,7 @@ public class VideoFileService {
             fileList.add(file);
         }
-        File recordFile = new File(userSettings.getRecord() );
+        File recordFile = new File(userSettings.getRecordTempPath() );
         MergeOrCutTaskInfo mergeOrCutTaskInfo = new MergeOrCutTaskInfo();
         mergeOrCutTaskInfo.setId(taskId);
         mergeOrCutTaskInfo.setApp(videoTaskInfo.getApp());
@@ -238,7 +238,7 @@ public class VideoFileService {
             mergeOrCutTaskInfo.setPercentage("1");
             // 处理文件路径
             String recordFileResultPath = recordFile.getAbsolutePath() + File.separator + taskId + ".mp4";
-            Path relativize = Paths.get(userSettings.getRecord()).relativize(Paths.get(recordFileResultPath));
+            Path relativize = Paths.get(userSettings.getRecordTempPath()).relativize(Paths.get(recordFileResultPath));
             try {
                 Files.copy(fileList.get(0).toPath(), Paths.get(recordFileResultPath));
             } catch (IOException e) {
@@ -260,7 +260,7 @@ public class VideoFileService {
                     mergeOrCutTaskInfo.setPercentage("1");
                     // 处理文件路径
-                    Path relativize = Paths.get(userSettings.getRecord()).relativize(Paths.get(result));
+                    Path relativize = Paths.get(userSettings.getRecordTempPath()).relativize(Paths.get(result));
                     mergeOrCutTaskInfo.setRecordFile(relativize.toString());
                     if (videoTaskInfo.getRemoteHost() != null) {
                         mergeOrCutTaskInfo.setDownloadFile(videoTaskInfo.getRemoteHost() + "/download.html?url=download/" + relativize);
@@ -376,7 +376,7 @@ public class VideoFileService {
     }
     public boolean collection(String app, String stream, String type) {
-        File streamFile = new File(userSettings.getRecord() + File.separator + app + File.separator + stream);
+        File streamFile = new File(userSettings.getRecordTempPath() + File.separator + app + File.separator + stream);
         boolean result = false;
         if (streamFile.exists() && streamFile.isDirectory() && streamFile.canWrite()) {
             File signFile = new File(streamFile.getAbsolutePath() + File.separator + type + ".sign");
@@ -390,7 +390,7 @@ public class VideoFileService {
     }
     public boolean removeCollection(String app, String stream, String type) {
-        File signFile = new File(userSettings.getRecord() + File.separator + app + File.separator + stream + File.separator + type + ".sign");
+        File signFile = new File(userSettings.getRecordTempPath() + File.separator + app + File.separator + stream + File.separator + type + ".sign");
         boolean result = false;
         if (signFile.exists() && signFile.isFile()) {
             result = signFile.delete();
@@ -29,9 +29,9 @@ server:
 # [根据业务需求配置]
 user-settings:
     # [可选 ] zlm配置的录像路径，不配置则使用当前目录下的record目录 即： ./record
-    record: /media/lin/Server/ZLMediaKit/dev/ZLMediaKit/release/linux/Debug/www/record
+    record-temp-path: ./recordTemp
     # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理, 不配置则不删除
-    recordDay: 7
+    record-temp-day: 7
     # [可选 ] 录像下载合成临时文件保存时长， 不配置默认取值recordDay（单位： 天）每天晚12点自动对过期文件执行清理
     # recordTempDay: 7
     # [必选 ] ffmpeg路径