1

src/main/java/com/fdkankan/manage/service/impl/CameraDetailServiceImpl.java

@@ -264,7 +264,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
 
     @Override
     public Boolean checkSpace(CameraDetail detailEntity, Long space) {
-        if("aws".equals(CacheUtil.uploadType) && (detailEntity.getType() == 10 || detailEntity.getType() == 11)){
+        if(!"aws".equals(CacheUtil.uploadType) && (detailEntity.getType() == 10 || detailEntity.getType() == 11)){
             return true;
         }
         UserIncrement userIncrement = userIncrementService.getByCameraId(detailEntity.getCameraId());

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -397,10 +397,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         cameraDetailService.initSpace(oldCameraDetail);
         cameraDetailService.initSpace(cameraDetail);
 
-        if(oldCameraDetail.getType() != 11 && oldCameraDetail.getType() != 10 && subSpace >0){           //有剩余容量解封容量内场景
+        if(!"aws".equals(CacheUtil.uploadType) && oldCameraDetail.getType() != 11 && oldCameraDetail.getType() != 10 && subSpace >0){           //有剩余容量解封容量内场景
             this.lockOrUnLockBySpace(oldCameraDetail.getCameraId());
         }
-        if(cameraDetail.getType() != 11 && cameraDetail.getType() != 10){           //有剩余容量解封容量内场景
+        if(!"aws".equals(CacheUtil.uploadType) && cameraDetail.getType() != 11 && cameraDetail.getType() != 10){           //有剩余容量解封容量内场景
             this.lockOrUnLockBySpace(cameraDetail.getCameraId());
         }
         sceneMoveLogService.saveLog(scenePro,scenePlus,camera.getSnCode(),oldCamera.getSnCode(),dataSource,dataSource, null);