1

src/main/java/com/fdkankan/ucenter/service/impl/DownService.java

@@ -64,12 +64,9 @@ public class DownService implements IDownService {
         if(scenePro == null && plus == null){
             throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
         }
-        Long cameraId = scenePro !=null ? scenePro.getCameraId() : plus.getCameraId();
-        CameraType cameraType = cameraTypeService.getByCameraId(cameraId);
         isObj = isObj == null ?0 :isObj;
-
-        log.info("checkDownLoad--cameraType:{},isObj:{}",cameraType,isObj);
-        if(cameraType != null && cameraType.getIsLaser() == 1 && isObj !=1){ //深时场景
+        log.info("checkDownLoad--,isObj:{}",isObj);
+        if(isObj !=1){ //深时场景
             return SSCheckDownload(sceneNum);
         }
         SceneDownloadLog sceneDownloadLog;
@@ -142,10 +139,8 @@ public class DownService implements IDownService {
         if(scenePro == null && plus == null){
             throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
         }
-        Long cameraId = scenePro !=null ? scenePro.getCameraId() : plus.getCameraId();
-        CameraType cameraType = cameraTypeService.getByCameraId(cameraId);
-        isObj = isObj == null ?0 :isObj;
 
+        isObj = isObj == null ?0 :isObj;
         DownVo downVo = new DownVo();
         User user = userService.getByUserName(userName);
         if(user == null){
@@ -160,9 +155,8 @@ public class DownService implements IDownService {
             downVo.setDownloadStatus(-1);
             return downVo;
         }
-
-        log.info("down--cameraType:{},isObj:{}",cameraType,isObj);
-        if(cameraType != null && cameraType.getIsLaser() == 1 && isObj !=1){ //深时场景
+        log.info("down-:isObj:{}",isObj);
+        if(isObj !=1){ //深时场景
             return SSDownload(sceneNum,user);
         }
 
@@ -212,13 +206,10 @@ public class DownService implements IDownService {
         if(scenePro == null && plus == null){
             throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
         }
-        Long cameraId = scenePro !=null ? scenePro.getCameraId() : plus.getCameraId();
-        CameraType cameraType = cameraTypeService.getByCameraId(cameraId);
-
-        isObj = isObj == null ?0 :isObj;
 
-        log.info("downloadProcess--cameraType:{},isObj:{}",cameraType,isObj);
-        if(cameraType != null && cameraType.getIsLaser() == 1 && isObj !=1){ //深时场景
+        isObj = isObj == null ? 0 :isObj;
+        log.info("downloadProcess--,isObj:{}",isObj);
+        if( isObj !=1){ //深时场景
             return SSDownloadProcess(sceneNum);
         }
         String redisKey = RedisKey.PREFIX_DOWNLOAD_PROGRESS;