修复定时任务封存场景

src/main/java/com/fdkankan/ucenter/controller/TestController.java

@@ -3,6 +3,7 @@ package com.fdkankan.ucenter.controller;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.JwtUtil;
@@ -12,10 +13,7 @@ import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.sms.SmsService;
 import com.fdkankan.ucenter.common.*;
-import com.fdkankan.ucenter.entity.ScenePlus;
-import com.fdkankan.ucenter.entity.ScenePlusExt;
-import com.fdkankan.ucenter.entity.ScenePro;
-import com.fdkankan.ucenter.entity.SceneProRe;
+import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +44,8 @@ public class TestController extends BaseController {
     IScenePlusExtService scenePlusExtService;
     @Autowired
     ISceneProReService sceneProReService;
+    @Autowired
+    IUserIncrementService userIncrementService;
 
     @RequestMapping("/_updateViewCount_test")
     public Result updateViewCount() throws Exception {
@@ -65,8 +65,17 @@ public class TestController extends BaseController {
         return Result.success( );
     }
 
+    @GetMapping("checkIncrement")
+    public Result checkIncrement() throws Exception {
+        LambdaQueryWrapper<UserIncrement> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(UserIncrement::getIsExpired,1);
+        List<UserIncrement> list = userIncrementService.list();
+        userIncrementService.lockScene(list);
+        return Result.success();
+    }
+
 
-    @RequestMapping("/sendMail")
+        @RequestMapping("/sendMail")
     public Result sendMail() throws Exception {
         return Result.success( );
     }

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

@@ -35,6 +35,7 @@ public interface IUserIncrementService extends IService<UserIncrement> {
     void unbindCamera(IncrementParam param);
 
     void incrementExpire();
+    void lockScene(List<UserIncrement> list);
 
     void incrementExpireSendSms() throws Exception;
 

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

@@ -27,6 +27,7 @@ import com.fdkankan.ucenter.util.DateUserUtil;
 import com.fdkankan.ucenter.vo.request.IncrementParam;
 import com.fdkankan.ucenter.vo.response.UserIncrementVo;
 import jodd.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -244,14 +245,22 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         wrapper.eq(UserIncrement::getIsExpired,0);
         wrapper.lt(UserIncrement::getIncrementEndTime,DateUserUtil.getDate(new Date()));
         List<UserIncrement> list = this.list(wrapper);
+        lockScene(list);
+    }
+
+    public void lockScene(List<UserIncrement> list){
         for (UserIncrement userIncrement : list) {
             userIncrement.setIsExpired(1);
             userIncrement.setUpdateTime(null);
             this.updateById(userIncrement);
             //解除相机权益
-            IncrementParam incrementParam = new IncrementParam();
-            incrementParam.setId(userIncrement.getId());
-            this.unbindCamera(incrementParam);
+            CameraDetail cameraDetail = cameraDetailService.getByCameraId(userIncrement.getCameraId());
+            if(cameraDetail == null){
+                continue;
+            }
+            if(cameraDetail.getType() !=10){
+                sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),-2);
+            }
         }
     }
 

src/main/java/com/fdkankan/ucenter/task/TaskService.java

@@ -59,7 +59,7 @@ public class TaskService {
             delFile(files);
             delFile(files1);
             delFile(files2);
-            log.info("delLoginQrCode:结束定时清理本地登录二维码:耗时{}秒",(new Date().getTime() - startTime)/1000 );
+            //log.info("delLoginQrCode:结束定时清理本地登录二维码:耗时{}秒",(new Date().getTime() - startTime)/1000 );
             this.updateSceneViewCount();
         }catch (Exception e){
             log.error("delLoginQrCode错误",e);
@@ -74,7 +74,7 @@ public class TaskService {
         String redisKey = RedisKeyUtil.V4_SCENE_VISIT_CNT;
         Map<String,String> hmget = redisUtil.hmget(redisKey);
         for (String key : hmget.keySet()) {
-            log.info("定时更新场景viewCount--num:{},viewCount:{}",key,hmget.get(key));
+            //log.info("定时更新场景viewCount--num:{},viewCount:{}",key,hmget.get(key));
             sceneProService.updateDbViewCount(key,hmget.get(key));
         }
     }
@@ -92,7 +92,7 @@ public class TaskService {
             }
             String name = f.getName().substring(0,f.getName().lastIndexOf("."));
             if(!redisUtil.hasKey(RedisKeyUtil.QRCODE + name)){
-                log.info("删除文件:{}",f.getPath());
+                //log.info("删除文件:{}",f.getPath());
                 FileUtils.delFile(f.getPath());
             }
         }