检测json文件

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

@@ -1,17 +1,10 @@
 package com.fdkankan.fusion.common.util;
 
-import cn.hutool.core.io.FileUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
 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 java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import static cn.hutool.core.util.ClassUtil.getClassLoader;
 
@@ -87,16 +80,14 @@ public class FileWriterUtil {
     }
 
     public static String checkB3dmTileset(File objPathFile) {
-        if(objPathFile.isDirectory()){
-            File[] files = objPathFile.listFiles();
-            for (File file : files) {
-                if(file.isFile()){
-                    if(file.getName().endsWith(".json")){
-                        return file.getPath();
-                    }
-                }else {
-                    checkB3dmTileset(file);
+        File[] files = objPathFile.listFiles();
+        for (File file : files) {
+            if(file.isFile()){
+                if(file.getName().endsWith(".json")){
+                    return file.getPath();
                 }
+            }else {
+                 return checkB3dmTileset(file);
             }
         }
         return null;

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

@@ -207,7 +207,8 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                         redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"60");
                         String localPath = OBJToGLBUtil.OsgbToB3dm(objPathFile);
 
-                        String jsonPath = FileWriterUtil.checkB3dmTileset(objPathFile);
+                        String jsonPath = null;
+                        jsonPath =  FileWriterUtil.checkB3dmTileset(objPathFile);
                         if(jsonPath == null){
                             throw new BusinessException(-1,"缺少tileset.json文件");