1

src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -250,7 +250,7 @@ public class CaseDownService {
             }
         }
         for (FusionAndSceneVo fusionAndSceneVo : fusionList) {
-           downFusion(caseId,fusionAndSceneVo.getFusionId());
+           downFusion(casePath,fusionAndSceneVo.getFusionId());
         }
 
         String jsonString = JSON.toJSONString(jsonObject);
@@ -303,21 +303,28 @@ public class CaseDownService {
    @Autowired
     UploadToOssUtil uploadToOssUtil;
 
-    private void downFusion(Integer caseId,Integer fusionId) {
-        String path = FilePath.OFFLINE_PACKAGE_PATH_CASE+caseId + "/env/www/fusionOffline/"+fusionId;
+    private void downFusion(String casePath,Integer fusionId) {
+        String path = casePath +"/fusionOffline/"+fusionId;
         String zipPath = path +".zip";
         try {
+            log.info("下载多元融合：{},{}",casePath,fusionId);
             fusionDownService.downOffline(fusionId);
             DownloadProcessVo downloadProcessVo = fusionDownService.process(fusionId);
-            while (downloadProcessVo.getStatus() != 1002 ){
+            log.info("下载多元融合-downloadProcessVo：{}",downloadProcessVo);
+            while (downloadProcessVo.getStatus() == 1000 || downloadProcessVo.getStatus() == 1001 ){
                 downloadProcessVo =  fusionDownService.process(fusionId);
+                log.info("下载多元融合-downloadProcessVo：{}",downloadProcessVo);
                 Thread.sleep(2000L);
             }
+            if(downloadProcessVo.getStatus() == 1003){
+                throw new BusinessException(ResultCode.SCENE_DOWN_ERROR);
+            }
             ShellUtil.yunDownload(downloadProcessVo.getUrl().replace(queryPath, ""), path);
             ShellUtil.unZip(zipPath,path);
             FileUtil.del(zipPath);
         }catch (Exception e){
-
+            log.info("下载多元融合失败：{}",fusionId,e);
+            throw new BusinessException(ResultCode.SCENE_DOWN_ERROR);
         }
     }