|
@@ -50,7 +50,7 @@ public class DownService implements IDownService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public DownVo checkDownLoad(String sceneNum) {
|
|
|
|
|
|
+ public DownVo checkDownLoad(String sceneNum,Integer isObj) {
|
|
if(StringUtils.isEmpty(sceneNum)){
|
|
if(StringUtils.isEmpty(sceneNum)){
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
|
|
}
|
|
}
|
|
@@ -60,7 +60,6 @@ public class DownService implements IDownService {
|
|
throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
|
|
throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
|
|
}
|
|
}
|
|
Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : plus.getSceneSource();
|
|
Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : plus.getSceneSource();
|
|
- Integer isObj = scenePro !=null ? scenePro.getIsObj() : scenePlusExtService.getByPlusId(plus.getId()).getIsObj();
|
|
|
|
|
|
|
|
log.info("checkDownLoad--sceneType:{},isObj:{}",sceneType,isObj);
|
|
log.info("checkDownLoad--sceneType:{},isObj:{}",sceneType,isObj);
|
|
if(sceneType == 4 && isObj !=1){ //深时场景
|
|
if(sceneType == 4 && isObj !=1){ //深时场景
|
|
@@ -120,7 +119,7 @@ public class DownService implements IDownService {
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public DownVo down(String sceneNum,String userName) {
|
|
|
|
|
|
+ public DownVo down(String sceneNum,String userName,Integer isObj) {
|
|
if(StringUtils.isEmpty(sceneNum) || StringUtils.isEmpty(userName)){
|
|
if(StringUtils.isEmpty(sceneNum) || StringUtils.isEmpty(userName)){
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
|
|
}
|
|
}
|
|
@@ -131,7 +130,6 @@ public class DownService implements IDownService {
|
|
}
|
|
}
|
|
Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : scenePlus.getSceneSource();
|
|
Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : scenePlus.getSceneSource();
|
|
|
|
|
|
- Integer isObj = scenePro !=null ? scenePro.getIsObj() : scenePlusExtService.getByPlusId(scenePlus.getId()).getIsObj();
|
|
|
|
|
|
|
|
log.info("down--sceneType:{},isObj:{}",sceneType,isObj);
|
|
log.info("down--sceneType:{},isObj:{}",sceneType,isObj);
|
|
if(sceneType == 4 && isObj !=1){ //深时场景
|
|
if(sceneType == 4 && isObj !=1){ //深时场景
|
|
@@ -196,7 +194,7 @@ public class DownService implements IDownService {
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public DownloadProcessVo downloadProcess(Long userId, String sceneNum) {
|
|
|
|
|
|
+ public DownloadProcessVo downloadProcess(Long userId, String sceneNum,Integer isObj) {
|
|
if (StringUtils.isEmpty(sceneNum)) {
|
|
if (StringUtils.isEmpty(sceneNum)) {
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
|
|
throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
|
|
}
|
|
}
|
|
@@ -207,7 +205,6 @@ public class DownService implements IDownService {
|
|
}
|
|
}
|
|
Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : scenePlus.getSceneSource();
|
|
Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : scenePlus.getSceneSource();
|
|
|
|
|
|
- Integer isObj = scenePro !=null ? scenePro.getIsObj() : scenePlusExtService.getByPlusId(scenePlus.getId()).getIsObj();
|
|
|
|
|
|
|
|
log.info("downloadProcess--sceneType:{},isObj:{}",sceneType,isObj);
|
|
log.info("downloadProcess--sceneType:{},isObj:{}",sceneType,isObj);
|
|
if(sceneType == 4 && isObj !=1){ //深时场景
|
|
if(sceneType == 4 && isObj !=1){ //深时场景
|