检测uploadjson是否存在，改为动态配置

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -95,6 +95,11 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     private String bucket;
     @Value("${main.url}")
     private String mainUrl;
+    @Value("${ecs.checkFile.maxTimes:5}")
+    private int maxCheckTimes;
+    @Value("${ecs.checkFile.waitTime:5000}")
+    private int waitTime;
+
     @Autowired
     private ISceneEditControlsService sceneEditControlsService;
     @Autowired
@@ -836,7 +841,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         String uploadJsonPath= target + File.separator + "results" +File.separator+"upload.json";
         Thread.sleep(2000);
-        boolean exist = ComputerUtil.checkComputeCompleted(uploadJsonPath, 3, 5000);
+        boolean exist = ComputerUtil.checkComputeCompleted(uploadJsonPath, maxCheckTimes, waitTime);
         if(!exist){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5042);
         }
@@ -1250,7 +1255,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             String uploadJsonPath = target + File.separator + "results" + File.separator + "upload.json";
             log.info("uploadJsonPath=" + uploadJsonPath);
             //因为共享目录有延迟，这里循环检测算法是否计算完毕3次，每次隔五秒
-            boolean exist = ComputerUtil.checkComputeCompleted(uploadJsonPath, 3, 5000);
+            boolean exist = ComputerUtil.checkComputeCompleted(uploadJsonPath, maxCheckTimes, waitTime);
             if(!exist){
                 throw new BusinessException(ErrorCode.FAILURE_CODE_5042);
             }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -92,6 +92,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Value("${scene.pro.new.url}")
     private String sceneProNewUrl;
 
+    @Value("${ecs.checkFile.maxTimes:5}")
+    private int maxCheckTimes;
+
+    @Value("${ecs.checkFile.waitTime:5000}")
+    private int waitTime;
+
     @Autowired
     @Qualifier("uploadToOssUtil")
     UploadToOssUtil uploadToOssUtil;
@@ -3505,7 +3511,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     private void uploadFileofterRebuildPanoram(String path, String sceneNum) throws Exception {
         //因为共享目录有延迟，这里循环检测算法是否计算完毕3次，每次隔五秒
         String uploadJsonPath = path + File.separator + "results" +File.separator+"upload.json";
-        boolean exist = ComputerUtil.checkComputeCompleted(uploadJsonPath, 5, 5000);
+        boolean exist = ComputerUtil.checkComputeCompleted(uploadJsonPath, maxCheckTimes, waitTime);
         if(!exist){
             throw new BusinessException(ErrorCode.FAILURE_CODE_7013);
         }