Merge branch 'task-lyh-inctype2' into test

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

@@ -167,12 +167,10 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
             if("SP".equals(cameraDetail.getUnit())){
                 subSpace = 1L;
             }
-            long usedSpace = cameraDetail.getUsedSpace() - subSpace ;
-            cameraDetail.setUsedSpace(usedSpace < 0 ? 0L :usedSpace);
             //解封封存场景
             sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId());
+            this.subUsedSpace(cameraDetail,subSpace);
         }
-        this.updateBatchById(list);
     }
 
     @Override
@@ -185,6 +183,15 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         wrapper.setSql("used_space =  used_space + " + space);
         this.update(wrapper);
     }
+    public void subUsedSpace(CameraDetail cameraDetail,Long space) {
+        if("SP".equals(cameraDetail.getUnit())){
+            space = 1L;
+        }
+        LambdaUpdateWrapper<CameraDetail> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CameraDetail::getId,cameraDetail.getId());
+        wrapper.setSql("used_space =  used_space - " + space);
+        this.update(wrapper);
+    }
 
     @Override
     public List<CameraAppVo> getListByUserAndType(Long userId, Integer cameraType) {