代码合并

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1227,26 +1227,26 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             cameraId = scenePro.getCameraId();
         }
 
-        //查询场景是否处于冻结状态，如果已冻结，不允许重算
-        SceneColdStorage sceneColdStorage = sceneColdStorageService.getOne(new LambdaQueryWrapper<SceneColdStorage>().eq(SceneColdStorage::getNum, num).eq(SceneColdStorage::getState, 1));
-        if(Objects.nonNull(sceneColdStorage)){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5074);
-        }
-
-        //查询最后一次计算时间后是否有删除过目录，如果有，则不支持重算
-        List<SceneCleanOrig> sceneCleanOrigs = sceneCleanOrigService.lisByNumAfterLastCall(num, laseCallTime);
-        if(CollUtil.isNotEmpty(sceneCleanOrigs)){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5072);
-        }
+//        //查询场景是否处于冻结状态，如果已冻结，不允许重算
+//        SceneColdStorage sceneColdStorage = sceneColdStorageService.getOne(new LambdaQueryWrapper<SceneColdStorage>().eq(SceneColdStorage::getNum, num).eq(SceneColdStorage::getState, 1));
+//        if(Objects.nonNull(sceneColdStorage)){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_5074);
+//        }
+//
+//        //查询最后一次计算时间后是否有删除过目录，如果有，则不支持重算
+//        List<SceneCleanOrig> sceneCleanOrigs = sceneCleanOrigService.lisByNumAfterLastCall(num, laseCallTime);
+//        if(CollUtil.isNotEmpty(sceneCleanOrigs)){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_5072);
+//        }
 
 
         //激光场景校验是否能够计算
         this.checkJgCanBuild(scenePro);
 
-        if(Objects.nonNull(scenePro) && (Objects.isNull(scenePro.getIsUpgrade())
-                || scenePro.getIsUpgrade() != CommonStatus.YES.code().intValue())){
+//        if(Objects.nonNull(scenePro) && (Objects.isNull(scenePro.getIsUpgrade())
+//                || scenePro.getIsUpgrade() != CommonStatus.YES.code().intValue())){
 //            return rebuildV3Scene(scenePro,num,force);
-        }
+//        }
 
         if(Objects.isNull(scenePlus)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);