|
@@ -89,11 +89,14 @@ public class SceneDownLoadServiceImpl implements ISceneDownLoadService {
|
|
|
return null;
|
|
|
}
|
|
|
DownLoadTaskBean downLoadTaskBean = JSONUtil.toBean(downloadTask, DownLoadTaskBean.class);
|
|
|
- if(downLoadTaskBean == null || StrUtil.isEmpty(downLoadTaskBean.getNum()) || !"local".equals(downLoadTaskBean.getType())){
|
|
|
+ String num = downLoadTaskBean.getNum();
|
|
|
+ if("v3".equals(version)){
|
|
|
+ num = downLoadTaskBean.getSceneNum();
|
|
|
+ }
|
|
|
+ if(downLoadTaskBean == null || StrUtil.isEmpty(num) || !"local".equals(downLoadTaskBean.getType())){
|
|
|
throw new Exception("下载任务数据不正确,downloadTask:" + downloadTask);
|
|
|
}
|
|
|
//如果场景正在下载中,就直接丢弃
|
|
|
- String num = downLoadTaskBean.getNum();
|
|
|
if(CurrentDownloadNumUtil.containSceneNum(num, version)){
|
|
|
return null;
|
|
|
}
|