1

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

@@ -254,7 +254,7 @@ public class CaseDownService {
         }
 
         String jsonString = JSON.toJSONString(jsonObject);
-        FileUtil.writeString(jsonString, FilePath.OFFLINE_PACKAGE_PATH_CASE+caseId+"/www/package/"+jsonDataName,"UTF-8");
+        FileUtil.writeString(jsonString, casePath+"/package/"+jsonDataName,"UTF-8");
 
     }
 

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

@@ -6,10 +6,12 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.deepoove.poi.XWPFTemplate;
 import com.fdkankan.fusion.common.FilePath;
+import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.util.*;
 import com.fdkankan.fusion.config.CacheUtil;
 import com.fdkankan.fusion.entity.*;
+import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.httpClient.LaserService;
 import com.fdkankan.fusion.httpClient.response.FdkkResponse;
 import com.fdkankan.fusion.request.CaseParam;
@@ -344,15 +346,19 @@ public class FusionDownService {
                DownVo down = downService.down(num, isObj,"offline");
                if(down.getDownloadStatus() == 1){
                    DownloadProcessVo downloadProcessVo = downService.downloadProcess(num, isObj);
-                   while (downloadProcessVo.getStatus() != 1002 ){
+                   while (downloadProcessVo.getStatus() == 1000 || downloadProcessVo.getStatus() == 1001 ){
                        downloadProcessVo =  downService.downloadProcess(num, isObj);
                        Thread.sleep(2000L);
                    }
+                   if(downloadProcessVo.getStatus() == 1003 && StringUtils.isBlank(downVo.getDownloadUrl())){
+                       throw new BusinessException(ResultCode.SCENE_DOWN_ERROR);
+                   }
                    downZip(type,downloadProcessVo.getUrl(),swkkZipPath,swkkPath,swssZipPath,swssPath);
                }
            }
        }catch (Exception e){
            log.info("下载场景离线包失败：{}",num,e);
+           throw new BusinessException(ResultCode.SCENE_DOWN_ERROR);
        }
 
    }