Browse Source

复制场景深时场景无限容量

lyhzzz 2 years ago
parent
commit
bc64ae22d3

+ 9 - 0
src/main/java/com/fdkankan/ucenter/service/impl/CameraDetailServiceImpl.java

@@ -278,11 +278,17 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         if(cameraDetail == null){
         if(cameraDetail == null){
             return false;
             return false;
         }
         }
+        if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11){
+            return true;
+        }
         return checkSpace(cameraDetail,space);
         return checkSpace(cameraDetail,space);
     }
     }
 
 
     @Override
     @Override
     public Boolean checkSpace(CameraDetail detailEntity, Long space) {
     public Boolean checkSpace(CameraDetail detailEntity, Long space) {
+        if(detailEntity.getType() == 10 || detailEntity.getType() == 11){
+            return true;
+        }
         UserIncrement userIncrement = userIncrementService.getByCameraId(detailEntity.getCameraId());
         UserIncrement userIncrement = userIncrementService.getByCameraId(detailEntity.getCameraId());
         if(userIncrement == null || userIncrement.getIsExpired() == 1){
         if(userIncrement == null || userIncrement.getIsExpired() == 1){
             return checkSpace(detailEntity,null,space);
             return checkSpace(detailEntity,null,space);
@@ -294,6 +300,9 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     @Override
     @Override
     public Boolean checkSpace(CameraDetail detailEntity, IncrementType incrementType, Long space) {
     public Boolean checkSpace(CameraDetail detailEntity, IncrementType incrementType, Long space) {
         Long totalSpace = 0L;
         Long totalSpace = 0L;
+        if(detailEntity.getType() == 10 || detailEntity.getType() == 11){
+            return true;
+        }
         if("SP".equals(detailEntity.getUnit())){
         if("SP".equals(detailEntity.getUnit())){
             if(incrementType!=null && incrementType.getCameraSpace() == -1){
             if(incrementType!=null && incrementType.getCameraSpace() == -1){
                 return true;
                 return true;