优化录像收藏列表查询

648540858
1 parent ddad8cf6
Showing 2 changed files with 32 additions and 6 deletions
src/main/java/top/panll/assist/dto/SignInfo.java
src/main/java/top/panll/assist/service/VideoFileService.java
@@ -3,6 +3,7 @@ package top.panll.assist.dto;
 public class SignInfo {
     private String app;
     private String stream;
+    private String type;
     public String getApp() {
         return app;
@@ -19,4 +20,12 @@ public class SignInfo {
     public void setStream(String stream) {
         this.stream = stream;
     }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }
@@ -574,12 +574,29 @@ public class VideoFileService {
                                 continue;
                             }
                         }
-                        File signFile = new File(streamFile.getAbsolutePath() + File.separator + type + ".sign");
-                        if (signFile.exists()) {
-                            SignInfo signInfo = new SignInfo();
-                            signInfo.setApp(appFile.getName());
-                            signInfo.setStream(streamFile.getName());
-                            result.add(signInfo);
+
+                        if (type != null) {
+                            File signFile = new File(streamFile.getAbsolutePath() + File.separator + type + ".sign");
+                            if (signFile.exists()) {
+                                SignInfo signInfo = new SignInfo();
+                                signInfo.setApp(appFile.getName());
+                                signInfo.setStream(streamFile.getName());
+                                signInfo.setType(type);
+                                result.add(signInfo);
+                            }
+                        }else {
+                            streamFile.listFiles((File dir, String name) -> {
+                                File currentFile = new File(dir.getAbsolutePath() + File.separator + name);
+                                if (currentFile.isFile() && name.endsWith(".sign")){
+                                    String currentType = name.substring(0, name.length() - ".sign".length());
+                                    SignInfo signInfo = new SignInfo();
+                                    signInfo.setApp(appFile.getName());
+                                    signInfo.setStream(streamFile.getName());
+                                    signInfo.setType(currentType);
+                                    result.add(signInfo);
+                                }
+                                return false;
+                            });
                         }
                     }
                 }