Browse Source

删除资源文件

lyhzzz 2 years ago
parent
commit
70d460ae99

+ 10 - 2
src/main/java/com/fdkankan/fusion/common/util/FileWriterUtil.java

@@ -82,13 +82,21 @@ public class FileWriterUtil {
     public static String checkB3dmTileset(File objPathFile) {
         File[] files = objPathFile.listFiles();
         for (File file : files) {
+            if(file.isDirectory()){
+                for (File file1 : files) {
+                    if(file1.isFile()){
+                        if(file1.getName().endsWith(".json")){
+                            return file1.getPath();
+                        }
+                    }
+                }
+            }
             if(file.isFile()){
                 if(file.getName().endsWith(".json")){
                     return file.getPath();
                 }
-            }else {
-                 return checkB3dmTileset(file);
             }
+
         }
         return null;
     }

+ 3 - 3
src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -235,13 +235,13 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                     log.error("uploadObj--ThreadError-modeId:{},error:{}",model.getModelId(),e);
                 }finally {
                     if(newObjFile!=null){
-                        //FileUtil.del(newObjFile);
+                        FileUtil.del(newObjFile);
                     }
                     if(objPathFile!=null){
-                        //FileUtil.del(objPathFile);
+                        FileUtil.del(objPathFile);
                     }
                     if(mntFile!=null){
-                       //FileUtil.del(mntFile.getParentFile());
+                       FileUtil.del(mntFile.getParentFile());
                     }
                 }
             }, executor).whenComplete((reslut, e) -> {