|
@@ -45,7 +45,7 @@ public class ThreadBussService {
|
|
|
log.info("下载mesh场景:{}",sceneCode);
|
|
|
DownVo downVo = downService.checkDownLoad(sceneCode, 1);
|
|
|
if(downVo.getDownloadStatus() == 3 && StringUtils.isNotBlank(downVo.getDownloadUrl())){
|
|
|
- downScene(downVo.getDownloadUrl(),dto.getPath());
|
|
|
+ downScene(downVo.getDownloadUrl(),dto.getPath(),sceneCode);
|
|
|
}else {
|
|
|
DownVo down = downService.down(sceneCode, 1);
|
|
|
if(down.getDownloadStatus() == 1){
|
|
@@ -58,7 +58,7 @@ public class ThreadBussService {
|
|
|
downloadProcessVo = downService.downloadProcess(sceneCode, 1);
|
|
|
Thread.sleep(2000L);
|
|
|
}
|
|
|
- downScene(downloadProcessVo.getUrl(),dto.getPath());
|
|
|
+ downScene(downloadProcessVo.getUrl(),dto.getPath(),sceneCode);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -72,10 +72,10 @@ public class ThreadBussService {
|
|
|
|
|
|
}
|
|
|
|
|
|
- private void downScene(String downloadUrl, String path) {
|
|
|
+ private void downScene(String downloadUrl, String path,String sceneCode) {
|
|
|
if(downloadUrl.contains("?")){
|
|
|
downloadUrl = downloadUrl.split("[?]")[0];
|
|
|
}
|
|
|
- ShellUtil.yunDownload(downloadUrl.replace(fyunConfig.getFyunHost(), ""),path +"/mesh");
|
|
|
+ ShellUtil.yunDownload(downloadUrl.replace(fyunConfig.getFyunHost(), ""),path +"/mesh/"+sceneCode +".zip");
|
|
|
}
|
|
|
}
|