删除场景 解封容量

src/main/java/com/fdkankan/ucenter/pay/strategy/impl/ExpansionOrderImpl.java

@@ -52,7 +52,7 @@ public class ExpansionOrderImpl implements OrderStrategy {
             CameraDetail detailEntity = cameraDetailService.getByCameraId(expansionOrder.getCameraId());
             detailEntity.setTotalSpace(cameraSpaceEntity.getSpace());
             cameraDetailService.updateById(detailEntity);
-            sceneProService.lockOrUnLockBySpace(detailEntity,detailEntity.getCameraId() ,1);
+            sceneProService.lockOrUnLockBySpace(detailEntity,detailEntity.getCameraId() ,1,null);
         }else {
             cameraSpaceEntity = cameraSpaceService.getById(spaceId);
             DateTime date = null;

src/main/java/com/fdkankan/ucenter/pay/strategy/impl/IncrementOrderImpl.java

@@ -86,7 +86,7 @@ public class IncrementOrderImpl implements OrderStrategy {
             //解封所有场景
             if(userIncrementEntity.getUserId() != null && userIncrementEntity.getCameraId() != null){
                 CameraDetail cameraDetail = cameraDetailService.getByCameraId(userIncrementEntity.getCameraId());
-                sceneProService.lockOrUnLockBySpace(cameraDetail, userIncrementEntity.getCameraId(),1);
+                sceneProService.lockOrUnLockBySpace(cameraDetail, userIncrementEntity.getCameraId(),1,null);
             }
         }
 

src/main/java/com/fdkankan/ucenter/service/ISceneProService.java

@@ -33,7 +33,8 @@ public interface ISceneProService extends IService<ScenePro> {
 
     HashMap<Long, GroupByCount> findSceneNumByCameraIds(List<Long> cameraIdList);
 
-    void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus);
+
+    void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus,Long subSpace);
 
     List<ScenePro> getListByCameraId(Long cameraId);
 

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

@@ -111,7 +111,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
             this.update(wrapper);
             cameraDetail.setTotalSpace(Long.parseLong(Constant.EXPANSION_SPACE_VALUE_1G ) * 10L);
             if(!"local".equals(NacosProperty.uploadType) && cameraDetail.getType()!=10){
-                sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),-2);     //封存场景
+                sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),-2,null);     //封存场景
             }
             if(cameraDetail.getType() == 10){
                 fdkkLaserService.toBind(false,cameraMap.get(cameraDetail.getCameraId()).getSnCode(),null,null);
@@ -165,7 +165,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
             long usedSpace = cameraDetail.getUsedSpace() - subSpace ;
             cameraDetail.setUsedSpace(usedSpace < 0 ? 0L :usedSpace);
             //解封封存场景
-            sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),1);
+            sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),1,usedSpace);
         }
         this.updateBatchById(list);
     }

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

@@ -231,7 +231,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
      * @param payStatus -2 封存，为 1 解封
      */
     @Override
-    public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus) {
+    public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus,Long subSapce) {
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
         wrapper.eq(ScenePro::getStatus,-2);
@@ -289,7 +289,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         Long beyondSpace =  0L;
         Long accumulateSpace = 0L;
         if(payStatus == 1){
-            beyondSpace =  totalSpace - cameraDetail.getUsedSpace();
+            if(subSapce !=null){
+                beyondSpace = subSapce;
+            }else {
+                beyondSpace =  totalSpace - cameraDetail.getUsedSpace();
+            }
             getScenePlusLockedIds(lockedIds, plusList, beyondSpace, accumulateSpace);
             getSceneLockedIds(lockedIds,list,beyondSpace,accumulateSpace);
         }else {

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

@@ -204,7 +204,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         userIncrement.setUpdateTime(DateUserUtil.getDate(new Date()));
         this.updateById(userIncrement);
         cameraIncrementLogService.saveLog(cameraEntity.getId(),userIncrement.getId(),user.getId(),0);
-        sceneProService.lockOrUnLockBySpace(cameraDetailEntity,cameraEntity.getId(),1);
+        sceneProService.lockOrUnLockBySpace(cameraDetailEntity,cameraEntity.getId(),1,null);
     }
 
     @Override
@@ -233,7 +233,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         wrapper.set(UserIncrement::getCameraId,null);
         this.update(wrapper);
         if(cameraDetail.getType() !=10){
-            sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),-2);
+            sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),-2,null);
         }
     }