From e9f4c16a6ad5fd2c3e334bb435669bb68823fa7b Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Mon, 27 May 2024 21:58:06 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ConfigReloadController.java      | 17 +++++++++++++----
 .../car/service/impl/CarInfoServiceImpl.java    |  2 ++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/ammeter/controller/ConfigReloadController.java b/src/main/java/com/zhgd/xmgl/modules/ammeter/controller/ConfigReloadController.java
index 22863ef5c..1556df7f6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/ammeter/controller/ConfigReloadController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/ammeter/controller/ConfigReloadController.java
@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.ammeter.controller;
 
 import com.zhgd.jeecg.common.api.vo.Result;
+import com.zhgd.xmgl.task.CarInfoTask;
 import com.zhgd.xmgl.task.VideoItemTask;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
@@ -18,23 +19,31 @@ import java.util.Map;
 @Api(tags = "配置重载控制器")
 public class ConfigReloadController {
     @Autowired
-    VideoItemTask videoItemTask;
+    VideoItemTask videoItmTask;
+    @Autowired
+    CarInfoTask carInfoTask;
 
     @RequestMapping(value = "/addVqdForHikvision")
     public Result addVqdForHikvision(@ApiIgnore @RequestBody Map<String, Object> param) throws Exception {
-        videoItemTask.addVqdForHikvision();
+        videoItmTask.addVqdForHikvision();
         return Result.ok();
     }
 
     @RequestMapping(value = "/saveXzHikvisionVideoFull")
     public Result saveXzHikvisionVideoFull(@ApiIgnore @RequestBody Map<String, Object> param) throws Exception {
-        videoItemTask.doSaveXzHikvisionVideoFull(param);
+        videoItmTask.doSaveXzHikvisionVideoFull(param);
         return Result.ok();
     }
 
     @RequestMapping(value = "/saveDeviceState")
     public Result saveDeviceState(@ApiIgnore @RequestBody Map<String, Object> param) throws Exception {
-        videoItemTask.saveDeviceState();
+        videoItmTask.saveDeviceState();
+        return Result.ok();
+    }
+
+    @RequestMapping(value = "/deleteOrUpdateExpiredCar")
+    public Result deleteOrUpdateExpiredCar(@ApiIgnore @RequestBody Map<String, Object> param) throws Exception {
+        carInfoTask.deleteOrUpdateExpiredCar();
         return Result.ok();
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
index 7399e8817..6e757b83a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
+import com.zhgd.redis.lock.redisson.DistributedLock;
 import com.zhgd.xmgl.async.AsyncHikvision;
 import com.zhgd.xmgl.async.AsyncWorker;
 import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl;
@@ -81,6 +82,7 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
     }
 
     @Override
+    @DistributedLock(keyPrefix = "car_info:", key = "#c.carNumber", tryLok = true, lockTime = 0)
     public void addCarInfo(CarInfo c) {
         checkTime(c);
         QueryWrapper<CarInfo> queryWrapper = new QueryWrapper<>();