录像事件保存时间为0时直接删除

648540858
1 parent a3d583e3
Showing 3 changed files with 15 additions and 5 deletions
src/main/java/top/panll/assist/controller/RecordController.java
src/main/java/top/panll/assist/service/FileManagerTimer.java
src/main/java/top/panll/assist/service/VideoFileService.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -344,10 +345,17 @@ public class RecordController {
         String app = json.getString("app");
         String stream = json.getString("stream");
         logger.debug("ZLM 录制完成，参数：" + file_path);
+
         if (file_path == null) {
             return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
         }
-        videoFileService.handFile(new File(file_path), app, stream);
+        if (userSettings.getRecordDay() <= 0) {
+            logger.info("录像保存事件为{}天，直接删除: {}", userSettings.getRecordDay(), file_path);
+            FileUtils.deleteQuietly(new File(file_path));
+        }else {
+            videoFileService.handFile(new File(file_path), app, stream);
+        }
+
         return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
     }
@@ -42,9 +42,12 @@ public class FileManagerTimer {
         int recordDay = userSettings.getRecordDay();
         Date lastDate=new Date();
         Calendar lastCalendar = Calendar.getInstance();
-        lastCalendar.setTime(lastDate);
-        lastCalendar.add(Calendar.DAY_OF_MONTH, 0 - recordDay);
-        lastDate = lastCalendar.getTime();
+        if (recordDay > 0) {
+            lastCalendar.setTime(lastDate);
+            lastCalendar.add(Calendar.DAY_OF_MONTH, 0 - recordDay);
+            lastDate = lastCalendar.getTime();
+        }
+
         logger.info("[录像巡查]移除 {} 之前的文件", formatter.format(lastDate));
         File recordFileDir = new File(userSettings.getRecord());
         if (recordFileDir.canWrite()) {
@@ -162,7 +162,6 @@ public class VideoFileService {
                 logger.debug("[处理文件] {}", file.getName());
             } catch (IOException e) {
                 logger.warn("文件可能以损坏[{}]", file.getAbsolutePath());
-//                e.printStackTrace();
             } catch (ParseException e) {
                 logger.error("时间格式化失败", e.getMessage());
             }