1

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

@@ -74,11 +74,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();
+    public static void getCanRunListObj(List<File> fileList, File unZipFile) {
+        File[] files = unZipFile.listFiles();
         for (File file1 : files) {
             if(file1.isFile()){
-                if(file1.getName().endsWith(".obj") || file1.getName().endsWith(".las") || file1.getName().endsWith(".ply")
+                if( file1.getName().endsWith(".obj")){
+                    fileList.add(file1);
+                }
+            }
+        }
+    }
+    public static void getCanRunList(List<File> fileList,File unZipFile) {
+        File[] files = unZipFile.listFiles();
+        for (File file1 : files) {
+            if(file1.isFile()){
+                if( file1.getName().endsWith(".las") || file1.getName().endsWith(".ply")
                 || file1.getName().endsWith(".osgb") || file1.getName().endsWith(".b3dm") || file1.getName().endsWith(".laz")){
                     fileList.add(file1);
                 }
@@ -129,4 +139,5 @@ public class FileWriterUtil {
             throw new BusinessException(ResultCode.SPACE_ERROR);
         }
     }
+
 }

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

@@ -123,9 +123,12 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
             throw new BusinessException(ResultCode.UNZIP_ERROR);
         }
         List<File> fileList = new ArrayList<>();
-        FileWriterUtil.getCanRunList(fileList,unZipFile);
+        FileWriterUtil.getCanRunListObj(fileList,unZipFile);
         if(fileList.size() <=0){
-            throw new BusinessException(ResultCode.UPLOAD_FILE_ERROR);
+            FileWriterUtil.getCanRunList(fileList,unZipFile);
+            if(fileList.size() <=0){
+                throw new BusinessException(ResultCode.UPLOAD_FILE_ERROR);
+            }
         }
         File modelFile = fileList.get(0);