收藏添加类型

648540858
1 parent 8a50a02d
Showing 3 changed files with 20 additions and 11 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
@@ -295,16 +295,18 @@ public class RecordController {
      */
     @ApiOperation("收藏录像（被收藏的录像不会被清理任务清理）")
     @ApiImplicitParams({
+            @ApiImplicitParam(name="type", value = "类型", required = true, dataTypeClass = String.class),
             @ApiImplicitParam(name="app", value = "应用名", required = true, dataTypeClass = String.class),
             @ApiImplicitParam(name="stream", value = "流ID", required = true, dataTypeClass = String.class),
     })
     @GetMapping(value = "/file/collection/add")
     @ResponseBody
     public WVPResult<String> collection(
+            @RequestParam(required = true) String type,
             @RequestParam(required = true) String app,
             @RequestParam(required = true) String stream){
-        boolean collectionResult = videoFileService.collection(app, stream);
+        boolean collectionResult = videoFileService.collection(app, stream, type);
         WVPResult<String> result = new WVPResult<>();
         result.setCode(0);
         result.setMsg(collectionResult ?"success":"error");
@@ -316,16 +318,18 @@ public class RecordController {
      */
     @ApiOperation("移除收藏录像")
     @ApiImplicitParams({
+            @ApiImplicitParam(name="type", value = "类型", required = true, dataTypeClass = String.class),
             @ApiImplicitParam(name="app", value = "应用名", required = true, dataTypeClass = String.class),
             @ApiImplicitParam(name="stream", value = "流ID", required = true, dataTypeClass = String.class),
     })
     @GetMapping(value = "/file/collection/remove")
     @ResponseBody
     public WVPResult<String> removeCollection(
+            @RequestParam(required = true) String type,
             @RequestParam(required = true) String app,
             @RequestParam(required = true) String stream){
-        boolean collectionResult = videoFileService.removeCollection(app, stream);
+        boolean collectionResult = videoFileService.removeCollection(app, stream, type);
         WVPResult<String> result = new WVPResult<>();
         result.setCode(0);
         result.setMsg(collectionResult ?"success":"error");
@@ -337,16 +341,18 @@ public class RecordController {
      */
     @ApiOperation("收藏录像列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name="type", value = "类型", required = true, dataTypeClass = String.class),
             @ApiImplicitParam(name="app", value = "应用名", required = false, dataTypeClass = String.class),
             @ApiImplicitParam(name="stream", value = "流ID", required = false, dataTypeClass = String.class),
     })
     @GetMapping(value = "/file/collection/list")
     @ResponseBody
     public WVPResult<List<SignInfo>> collectionList(
+            @RequestParam(required = false) String type,
             @RequestParam(required = false) String app,
             @RequestParam(required = false) String stream){
-        List<SignInfo> signInfos = videoFileService.getCollectionList(app, stream);
+        List<SignInfo> signInfos = videoFileService.getCollectionList(app, stream, type);
         WVPResult<List<SignInfo>> result = new WVPResult<>();
         result.setCode(0);
         result.setMsg(signInfos != null ?"success":"error");
@@ -59,8 +59,11 @@ public class FileManagerTimer {
                     if (streamList != null && streamList.size() > 0) {
                         for (File streamFile : streamList) {
                             // 带有sig标记文件的为收藏文件，不被自动清理任务移除
-                            File signFile = new File(streamFile.getAbsolutePath() + File.separator + "sign");
-                            if (signFile.exists()) {
+                            File[] signFiles = streamFile.listFiles((File dir, String name) -> {
+                                File currentFile = new File(dir.getAbsolutePath() + File.separator + name);
+                                return currentFile.isFile() && name.endsWith(".sign");
+                            });
+                            if (signFiles != null && signFiles.length > 0) {
                                 continue;
                             }
                             List<File> dateList = videoFileService.getDateList(streamFile, null, null, false);
@@ -533,11 +533,11 @@ public class VideoFileService {
         return false;
     }
-    public boolean collection(String app, String stream) {
+    public boolean collection(String app, String stream, String type) {
         File streamFile = new File(userSettings.getRecord() + File.separator + app + File.separator + stream);
         boolean result = false;
         if (streamFile.exists() && streamFile.isDirectory() && streamFile.canWrite()) {
-            File signFile = new File(streamFile.getAbsolutePath() + File.separator + "sign");
+            File signFile = new File(streamFile.getAbsolutePath() + File.separator + type + ".sign");
             try {
                 result = signFile.createNewFile();
             } catch (IOException e) {
@@ -547,8 +547,8 @@ public class VideoFileService {
         return result;
     }
-    public boolean removeCollection(String app, String stream) {
-        File signFile = new File(userSettings.getRecord() + File.separator + app + File.separator + stream + File.separator + "sign");
+    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");
         boolean result = false;
         if (signFile.exists() && signFile.isFile()) {
             result = signFile.delete();
@@ -556,7 +556,7 @@ public class VideoFileService {
         return result;
     }
-    public List<SignInfo> getCollectionList(String app, String stream) {
+    public List<SignInfo> getCollectionList(String app, String stream, String type) {
         List<File> appList = this.getAppList(true);
         List<SignInfo> result = new ArrayList<>();
         if (appList.size() > 0) {
@@ -574,7 +574,7 @@ public class VideoFileService {
                                 continue;
                             }
                         }
-                        File signFile = new File(streamFile.getAbsolutePath() + File.separator + "sign");
+                        File signFile = new File(streamFile.getAbsolutePath() + File.separator + type + ".sign");
                         if (signFile.exists()) {
                             SignInfo signInfo = new SignInfo();
                             signInfo.setApp(appFile.getName());