1111

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -1160,16 +1160,16 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         String ossResultPath = String.format(UploadFilePath.scene_result_data_path, num);
         fYunFileService.downloadFile(bucket, ossResultPath + "data.json", target + File.separator+"data.json");
-        fYunFileService.downloadFile(bucket, ossResultPath + "project.json", target + File.separator+"project.json");
+//        fYunFileService.downloadFile(bucket, ossResultPath + "project.json", target + File.separator+"project.json");
 
         //data.json增加extras为执行重建算法
-        String data = FileUtils.readFile(target + File.separator+"data.json");
-        if(data != null){
+//        String data = FileUtils.readFile(target + File.separator+"data.json");
+//        if(data != null){
             JSONObject floorplanJson = new JSONObject();
             floorplanJson.put("has_source_images", true);
             floorplanJson.put("has_vision_txt", true);
 
-            JSONObject dataJson = JSONObject.parseObject(data);
+            JSONObject dataJson = new JSONObject();
             dataJson.put("extras", floorplanJson);
             dataJson.put("split_type", "SPLIT_V8");
             //V5表示不需要生成high，low文件
@@ -1187,7 +1187,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             }
             dataJson.put("skybox_type", skyboxType);
             FileUtils.writeFile(target + File.separator+"data.json", new String(dataJson.toString().getBytes(), "UTF-8"));
-        }
+//        }
         if(new File(target + File.separator + "capture").exists()){
             new File(target + File.separator + "capture").delete();
         }
@@ -1195,7 +1195,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             FileUtils.delAllFile(target + File.separator + "results");
         }
 
-        fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/data.fdage");
+//        fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/data.fdage");
 
         //如果部分成功，则需要返回成功数量和失败列表
         if(CollUtil.isNotEmpty(notExistFileList)){

src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -1040,7 +1040,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
 
             if(data.getName().endsWith(".jpg") || data.getName().endsWith(".png")){
-                if(!FileUtils.checkFileSizeIsLimit(data.length(), 1.5, "M")){
+                if(!FileUtils.checkFileSizeIsLimit(data.length(), 5, "M")){
                     throw new BusinessException(ErrorCode.FAILURE_CODE_5020);
                 }
             }