From c30d7a4b920112c2f25aa52a8e5e38280ae9b998 Mon Sep 17 00:00:00 2001
From: fst1996 <2411194573@qq.com>
Date: Wed, 6 Dec 2023 19:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=9B=B4=E6=A0=8F=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/server/utils/CarFenceMonitor.java    | 20 ++++++-------------
 .../src/main/resources/mapper/CarMapper.xml   |  2 --
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/car-base-server/src/main/java/com/god/base/server/utils/CarFenceMonitor.java b/car-base-server/src/main/java/com/god/base/server/utils/CarFenceMonitor.java
index caa55c0..298bfd1 100644
--- a/car-base-server/src/main/java/com/god/base/server/utils/CarFenceMonitor.java
+++ b/car-base-server/src/main/java/com/god/base/server/utils/CarFenceMonitor.java
@@ -14,10 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * 监控车辆围栏实时数据
@@ -50,10 +47,10 @@ public class CarFenceMonitor {
         if (dataCar.size() <= 0) {
             throw new RuntimeException("查无管理车辆");
         }
-
+        //新建map集合存储车辆围栏
+        Map<String, Set<Fence>> map = new HashMap<>();
         for (Car car : dataCar) {
             //单线程获取车辆围栏信息
-            new Thread(() -> {
                 FenceQueryRequest fenceQueryRequest = new FenceQueryRequest();
 
                 fenceQueryRequest.setPage(1);
@@ -62,25 +59,20 @@ public class CarFenceMonitor {
                 //获取车辆围栏信息
                 TableDataInfo<Fence> fenceTableDataInfo = fenceService.fenceListAndPage(fenceQueryRequest);
                 List<Fence> rows = fenceTableDataInfo.getRows();
-
                 if (rows.size() <= 0) {
                     throw new RuntimeException("该车辆未绑定围栏");
                 }
-
                 //围栏对象集合
                 Set<Fence> fences = new HashSet<>();
 
                 for (Fence row : rows) {
                     fences.add(row);
                 }
-                //存储redis
-                redisService.setCacheSet("Fence"+car.getCarVinId(),fences);
-            }).start();
+                map.put(car.getCarVinId(), fences);
         }
 
-
-
-
+        //存储redis
+        redisService.setCacheMap("FENCE", map);
 
     }
 }
diff --git a/car-base-server/src/main/resources/mapper/CarMapper.xml b/car-base-server/src/main/resources/mapper/CarMapper.xml
index 76e715d..08dfde4 100644
--- a/car-base-server/src/main/resources/mapper/CarMapper.xml
+++ b/car-base-server/src/main/resources/mapper/CarMapper.xml
@@ -72,7 +72,6 @@
         SELECt
             t_car.car_vin_id  ,
             t_car_type.car_type_name ,
-            t_fence.fence_name  ,
             t_car.battery_manufacturer ,
             t_car.motor_manufacturer  ,
             t_car.motor_number  ,
@@ -80,7 +79,6 @@
             t_car.status
         FROM
             t_car
-                JOIN t_fence ON t_car.fence_id = t_fence.fence_id
                 JOIN t_car_type ON t_car.car_type_id = t_car_type.id
         <where>
             <if test="userId != null">