1

src/main/java/com/fdkankan/fusion/common/util/FileWriterUtil.java

@@ -4,6 +4,8 @@ import java.io.*;
 import java.math.BigDecimal;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.List;
 
 import static cn.hutool.core.util.ClassUtil.getClassLoader;
 
@@ -53,27 +55,6 @@ public class FileWriterUtil {
         }
     }
 
-    public static File getObjLasPlyFile(File objPathFile) {
-        if(objPathFile.isDirectory()){
-            File[] file = objPathFile.listFiles();
-            if(file == null || file.length <=0){
-                return null;
-            }
-            for (File file1 : file) {
-                if(file1 == null){
-                    continue;
-                }
-                if(file1.isDirectory()){
-                    return getObjLasPlyFile(file1);
-                }
-                if(file1.getName().contains("obj") || file1.getName().contains("ply") || file1.getName().contains("las")){
-                    return file1;
-                }
-
-            }
-        }
-        return null;
-    }
 
     public static String setFileSize(Long length) {
         BigDecimal decimal = new BigDecimal(length);
@@ -84,4 +65,21 @@ public class FileWriterUtil {
 
         return decimal.divide(size).setScale(2,BigDecimal.ROUND_HALF_UP).toString() +"KB";
     }
+
+    public static void getCanRunList(List<File> fileList,File objPathFile) {
+        File[] files = objPathFile.listFiles();
+        for (File file1 : files) {
+            if(file1.isFile()){
+                if(file1.getName().contains("obj") || file1.getName().contains("las") || file1.getName().contains("ply")){
+                    fileList.add(file1);
+                }
+            }else {
+                getCanRunList(fileList,file1);
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+
+    }
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseVideoServiceImpl.java

@@ -121,14 +121,14 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
                 if(videoList.size() <=0){
                     return;
                 }
-                if(videoList.size() ==1){
-                    updateCaseVideoStatus(videoFolder.getVideoFolderId(),1);
-                    videoFolder.setVideoMergeUrl(videoList.get(0).getVideoPath());
-                    videoFolder.setVideoFolderCover(videoList.get(0).getVideoCover());
-                    videoFolderService.updateById(videoFolder);
-                    redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"100");
-                    return;
-                }
+//                if(videoList.size() ==1){
+//                    updateCaseVideoStatus(videoFolder.getVideoFolderId(),1);
+//                    videoFolder.setVideoMergeUrl(videoList.get(0).getVideoPath());
+//                    videoFolder.setVideoFolderCover(videoList.get(0).getVideoCover());
+//                    videoFolderService.updateById(videoFolder);
+//                    redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"100");
+//                    return;
+//                }
                 redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"20");
                 if(StringUtils.isNotBlank(mergeVideoUrl)){
                     filePathSet.add(mergeVideoUrl);

src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -115,17 +115,13 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
             if(!objPathFile.isDirectory()){
                 throw new BusinessException(ResultCode.UPLOAD_FILE_TYPE_ERROR);
             }
-            File[] files = objPathFile.listFiles();
-            List<String> canRunList = new ArrayList<>();
-            for (File file1 : files) {
-                if(file1.getName().contains("obj") || file1.getName().contains("las") || file1.getName().contains("ply")){
-                    canRunList.add(file1.getName());
-                }
-            }
-            if(canRunList.size() != 1){
+            List<File> fileList = new ArrayList<>();
+            FileWriterUtil.getCanRunList(fileList,objPathFile);
+
+            if(fileList.size() != 1){
                 throw new BusinessException(ResultCode.UPLOAD_FILE_TYPE_ERROR);
             }
-            File file1 = FileWriterUtil.getObjLasPlyFile(objPathFile);
+            File file1 = fileList.get(0);
             if(file1 == null){
                 throw new BusinessException(ResultCode.UPLOAD_FILE_TYPE_ERROR);
             }