解封场景

src/main/java/com/fdkankan/manage/config/SaTokenConfigure.java

@@ -48,7 +48,6 @@ public class SaTokenConfigure {
                 .addInclude("/**").addExclude("/**/reMyselfPassword","/**/test/**","/**/inner/**")
                 // 认证函数: 每次请求执行
                 .setAuth(obj -> {
-                    log.info("---------- 进入Sa-Token全局认证 -----------");
                     // 登录认证 -- 拦截所有路由，并排除/user/doLogin 用于开放登录
                     SaRouter.match("/**", "/service/manage/login", r ->checkLogin() );
                     String menu = redisUtil.get(RedisKey.MANAGE_MENU);
@@ -75,7 +74,6 @@ public class SaTokenConfigure {
 
                 // 异常处理函数：每次认证函数发生异常时执行此函数
                 .setError(e -> {
-                    System.out.println("---------- 进入Sa-Token异常处理 -----------");
                     SaHolder.getResponse().setHeader("Content-Type", "application/json;charset=UTF-8");
                     ResultData aj ;
                     if (e instanceof NotLoginException) {	// 如果是未登录异常

src/main/java/com/fdkankan/manage/exception/GlobalExceptionHandler.java

@@ -33,7 +33,7 @@ public class GlobalExceptionHandler {
     @ResponseBody
     @ExceptionHandler(value = BusinessException.class)
     public ResultData businessExceptionHandler(BusinessException e) {
-        log.info("业务异常code:{},message:{}", e.getCode(), e.getMessage());
+        log.error("业务异常code:{},message:{}", e.getCode(), e.getMessage());
         return ResultData.error(e.getCode(), e.getMessage());
     }
     /**
@@ -42,7 +42,7 @@ public class GlobalExceptionHandler {
     @ResponseBody
     @ExceptionHandler(value = com.fdkankan.common.exception.BusinessException.class)
     public ResultData businessExceptionHandler(com.fdkankan.common.exception.BusinessException e) {
-        log.info("业务异常code:{},message:{}", e.getCode(), e.getMessage());
+        log.error("业务异常code:{},message:{}", e.getCode(), e.getMessage());
         return ResultData.error(e.getCode(), e.getMessage());
     }
     /**

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

@@ -133,6 +133,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
      */
     @Override
     public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus) {
+        if(cameraDetail == null){
+            cameraDetail = cameraDetailService.getByCameraId(cameraId);
+        }
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<ScenePlus> plusWr = new LambdaQueryWrapper<>();
         Long totalSpace = cameraDetail.getTotalSpace();
@@ -176,7 +179,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         List<Long> lockedIds = new ArrayList<>();
 
-        if(totalSpace == -1 && payStatus == 1){
+        if(totalSpace == -1){
             List<Long> collect = list.stream().map(ScenePro::getId).collect(Collectors.toList());
             List<Long> collect2 = plusList.stream().map(ScenePlus::getId).collect(Collectors.toList());
             lockedIds.addAll(collect);
@@ -188,7 +191,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         Long beyondSpace =  0L;
         Long accumulateSpace = 0L;
         if(payStatus == 1){
-            beyondSpace =  totalSpace - cameraDetail.getTotalSpace();
+            beyondSpace =  totalSpace - cameraDetail.getUsedSpace();
             getScenePlusLockedIds(lockedIds, plusList, beyondSpace, accumulateSpace);
             getSceneLockedIds(lockedIds,list,beyondSpace,accumulateSpace);
         }else {
@@ -550,8 +553,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Override
     public void deleteByNum(String num) {
         Integer sceneSource = null;
+        Long cameraId = null;
         ScenePro scenePro = this.getByNum(num);
         if(scenePro!=null){
+            cameraId = scenePro.getCameraId();
             sceneSource = scenePro.getSceneSource();
             this.removeById(scenePro.getId());
         }
@@ -561,12 +566,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         ScenePlus scenePlus = scenePlusService.getByNum(num);
         if(scenePlus!=null){
+            cameraId = scenePlus.getCameraId();
             sceneSource = scenePlus.getSceneSource();
             scenePlusService.removeById(scenePlus.getId());
             scenePlusExtService.delByPlus(scenePlus.getId());
         }
         if(sceneSource != null && sceneSource == 4){
             laserService.delete(num);
+        }else if(cameraId != null){
+            lockOrUnLockBySpace(null,cameraId,1);
         }
     }