1

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

@@ -24,7 +24,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     void unbindCamera(Long cameraId);
 
-    void lockOrUnLockBySpace(CameraDetail cameraDetail,Long cameraId,Integer payStatus);
+    void lockOrUnLockBySpace(CameraDetail cameraDetail);
     void lockOrUnLockBySpace(Long cameraId);
     void lockOrUnLockBySpace(ScenePro scenePro, ScenePlus scenePlus,Integer payStatus);
 

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

@@ -82,8 +82,8 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         //恢复10G基本容量
         this.update(wrapper);
 
-        if(!"local".equals(CacheUtil.uploadType) && cameraDetail.getType() !=10){
-            sceneProService.lockOrUnLockBySpace(cameraDetail,cameraId,-2);     //封存场景
+        if(!"local".equals(CacheUtil.uploadType) && cameraDetail.getType() !=10 && cameraDetail.getType() !=11){
+            sceneProService.lockOrUnLockBySpace(cameraDetail);     //封存场景
         }
         //解绑删除相机。文件夹与场景绑定关系
         folderSceneService.delByCameraId(cameraId);
@@ -228,8 +228,8 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         long usedSpace = cameraDetail.getUsedSpace() - space ;
         cameraDetail.setUsedSpace(usedSpace < 0 ? 0L :usedSpace);
         //解封封存场景
-        if(cameraDetail.getType() != 10){
-            sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),1);
+        if(cameraDetail.getType() != 10 && cameraDetail.getType() !=11){
+            sceneProService.lockOrUnLockBySpace(cameraDetail);
         }
         this.updateById(cameraDetail);
     }

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

@@ -157,8 +157,10 @@ 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) {
+        if(cameraDetail == null || cameraDetail.getType() ==10 || cameraDetail.getType() == 11){
+            return;
+        }
         ScenePayStatusVo scenePayStatusVo = new ScenePayStatusVo(cameraDetail.getCameraId());
         Map<String, Object> map = BeanUtil.beanToMap(scenePayStatusVo);
         rabbitMqProducer.sendByWorkQueue(MqQueueUtil.ucenterScenePayStatusQueue, map);
@@ -166,9 +168,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public void lockOrUnLockBySpace(Long cameraId) {
-        ScenePayStatusVo scenePayStatusVo = new ScenePayStatusVo(cameraId);
-        Map<String, Object> map = BeanUtil.beanToMap(scenePayStatusVo);
-        rabbitMqProducer.sendByWorkQueue(MqQueueUtil.ucenterScenePayStatusQueue, map);
+        CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
+        this.lockOrUnLockBySpace(cameraDetail);
     }
 
     @Override

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

@@ -171,7 +171,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
 
         agentNewLogService.addByUserIncrement(userIncrement);
         if(userIncrement.getCameraId() != null){
-            sceneProService.lockOrUnLockBySpace(null,userIncrement.getCameraId(),1);
+            sceneProService.lockOrUnLockBySpace(userIncrement.getCameraId());
         }
     }