diff --git a/JavaSample-tcp111231501461883/.lck b/JavaSample-tcp111231501461883/.lck
deleted file mode 100644
index e69de29..0000000
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFaultCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFaultCacheService.java
index 66efe2b..c3b63dd 100644
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFaultCacheService.java
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFaultCacheService.java
@@ -13,11 +13,11 @@ public class AllFaultCacheService extends CacheAbsBacis {
 
     @Override
     public String keyPre() {
-        return "Allfault:info:";
+        return "AllFault:info:";
     }
 
     @Override
     public String decode(String key) {
-        return key.replace("Allfault:info:", "");
+        return key.replace("AllFault:info:", "");
     }
 }
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceCahceService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceCahceService.java
index df19f0c..2ae2429 100644
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceCahceService.java
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceCahceService.java
@@ -16,12 +16,12 @@ public class AllFenceCahceService extends CacheAbsBacis<String, FenceResp> {
 
     @Override
     public String keyPre() {
-        return "Allfence:info:";
+        return "AllFence:info:";
     }
 
     @Override
     public String decode(String key) {
-        return key.replace("Allfence:info:", "");
+        return key.replace("AllFence:info:", "");
     }
 
 }
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java
index 21a5a55..4d80094 100644
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java
@@ -19,11 +19,11 @@ public class AllMessageValueCacheService extends CacheAbsBacis<String, MessageVa
 
     @Override
     public String keyPre() {
-        return "Allmessagevalue:info:";
+        return "AllMessagevalue:info:";
     }
 
     @Override
     public String decode(String key) {
-        return key.replace("Allmessagevalue:info:", "");
+        return key.replace("AllMessagevalue:info:", "");
     }
 }
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleCacheService.java
index 5da3875..7de077d 100644
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleCacheService.java
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleCacheService.java
@@ -25,12 +25,12 @@ public class AllVehicleCacheService extends CacheAbsBacis<String, VehicleManageR
      */
     @Override
     public String keyPre() {
-        return "allvehicle:info:";
+        return "AllVehicle:info:";
     }
 
     @Override
     public String decode(String key) {
-        return key.replace("allvehicle:info:", "");
+        return key.replace("AllVehicle:info:", "");
     }
 
 }
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleTypeCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleTypeCacheService.java
index 130776c..09a59e5 100644
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleTypeCacheService.java
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleTypeCacheService.java
@@ -14,11 +14,11 @@ public class AllVehicleTypeCacheService extends CacheAbsBacis<String, VehicleTyp
 
     @Override
     public String keyPre() {
-        return "vehicleType:info:";
+        return "AllVehicleType:info:";
     }
 
     @Override
     public String decode(String key) {
-        return key.replace("vehicleType:info:", "");
+        return key.replace("AllVehicleType:info:", "");
     }
 }
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllWarnRuleCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllWarnRuleCacheService.java
new file mode 100644
index 0000000..57890cd
--- /dev/null
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllWarnRuleCacheService.java
@@ -0,0 +1,24 @@
+package com.muyu.enterprise.cache;
+
+import com.muyu.common.cache.CacheAbsBacis;
+import com.muyu.domain.WarnRule;
+
+/**
+ * 预警规则缓存服务
+ */
+public class AllWarnRuleCacheService extends CacheAbsBacis<String, WarnRule> {
+    @Override
+    public void clear() {
+
+    }
+
+    @Override
+    public String keyPre() {
+        return "AllWarnRule:info:";
+    }
+
+    @Override
+    public String decode(String key) {
+        return key.replace("AllWarnRule:info:", "");
+    }
+}
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllWarnStrategyCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllWarnStrategyCacheService.java
new file mode 100644
index 0000000..f001997
--- /dev/null
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllWarnStrategyCacheService.java
@@ -0,0 +1,24 @@
+package com.muyu.enterprise.cache;
+
+import com.muyu.common.cache.CacheAbsBacis;
+import com.muyu.domain.WarnStrategy;
+
+/**
+ * 预警策略缓存服务
+ */
+public class AllWarnStrategyCacheService extends CacheAbsBacis<String, WarnStrategy> {
+    @Override
+    public void clear() {
+
+    }
+
+    @Override
+    public String keyPre() {
+        return "AllWarnStrategy:info:";
+    }
+
+    @Override
+    public String decode(String key) {
+        return key.replace("AllWarnStrategy:info:", "");
+    }
+}
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index c2d5f8e..b2cefc8 100644
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -3,6 +3,8 @@ com.muyu.enterprise.cache.AllFenceCahceService
 com.muyu.enterprise.cache.AllMessageValueCacheService
 com.muyu.enterprise.cache.AllVehicleCacheService
 com.muyu.enterprise.cache.AllVehicleTypeCacheService
+com.muyu.enterprise.cache.AllWarnRuleCacheService
+com.muyu.enterprise.cache.AllWarnStrategyCacheService
 com.muyu.enterprise.cache.FaultCacheService
 com.muyu.enterprise.cache.FenceCahceService
 com.muyu.enterprise.cache.MessageTemplateCacheService
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/HaveFence.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/HaveFence.java
deleted file mode 100644
index dd4fef0..0000000
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/HaveFence.java
+++ /dev/null
@@ -1,55 +0,0 @@
-//package com.muyu.domain.req;
-//
-//import com.baomidou.mybatisplus.annotation.IdType;
-//import com.baomidou.mybatisplus.annotation.TableId;
-//import com.muyu.domain.Fence;
-//import io.swagger.v3.oas.annotations.media.Schema;
-//import io.swagger.v3.oas.annotations.tags.Tag;
-//import lombok.AllArgsConstructor;
-//import lombok.Builder;
-//import lombok.Data;
-//import lombok.NoArgsConstructor;
-//
-//import java.util.List;
-//
-//@Data
-//@Builder
-//@AllArgsConstructor
-//@NoArgsConstructor
-//@Tag(name = "查看绑定的围栏信息")
-//public class HaveFence {
-//
-//    /**
-//     * 主键
-//     */
-//    @Schema(type = "Long",description = "主键")
-//    @TableId(value = "id",type = IdType.AUTO)
-//    private Long id;
-//
-//    /**
-//     * 围栏名称
-//     */
-//    @Schema(type = "String",description = "围栏名称")
-//    private String fenceName;
-//
-//    /**
-//     * 坐标
-//     */
-//    @Schema(type = "String",description = "坐标")
-//    private String coordinates;
-//
-//    /**
-//     * 描述
-//     */
-//    @Schema(type = "String",description = "描述")
-//    private String description;
-//
-//    /**
-//     * 电子围栏列表
-//     */
-//    @Schema(type = "List<Fence>",description = "电子围栏列表")
-//    List<Fence> fenceList;
-//
-//
-//
-//}
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java
index 395707f..8e62d0f 100644
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java
@@ -148,7 +148,7 @@ public class ElectController extends BaseController {
     @DeleteMapping("/delMoreFence")
     @Operation(description = "批量删除电子围栏")
     public Result delMore(@RequestBody List<Long> fenceIds){
-//        electService.delMoreFence(fenceIds);
+        //批量删除内容存到Redis
         electService.removeBatchByIds(fenceIds);
         return Result.success(null,"操作成功");
     }
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java
index a3ce787..6738f62 100644
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java
@@ -156,7 +156,7 @@ public class VehicleController extends BaseController {
     /**
      * 车辆绑定围栏组
      */
-    @GetMapping("/addBoundFenceGroup")
+    @PostMapping("/addBoundFenceGroup")
     @Operation(description = "车辆绑定围栏组")
     public Result boundFenceGroup(
             @Validated @RequestBody BoundFenceGroupReq boundFenceGroupReq){
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java
index 6867691..5361a73 100644
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java
@@ -4,6 +4,7 @@ import com.muyu.common.core.domain.Result;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.LoginUser;
 import com.muyu.domain.WarnRule;
+import com.muyu.enterprise.cache.AllWarnRuleCacheService;
 import com.muyu.enterprise.cache.WarnRuleCacheService;
 import com.muyu.enterprise.service.WarnRuleService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -22,6 +23,10 @@ public class WarnRuleController {
     @Autowired
     private WarnRuleCacheService warnRuleCacheService;
 
+    //存列表
+    @Autowired
+    private AllWarnRuleCacheService allWarnRuleCacheServicel;
+
     /**
      * 规则列表
      * @return
@@ -29,7 +34,11 @@ public class WarnRuleController {
     @RequestMapping(path = "/ruleList",method = RequestMethod.POST)
     @Operation(summary = "规则列表", description = "获取所有规则列表")
     public Result<List<WarnRule>> ruleList(){
-        return Result.success(warnRuleService.list());
+        List<WarnRule> list = warnRuleService.list();
+        for (WarnRule warnRule : list) {
+            allWarnRuleCacheServicel.put(warnRule.getRuleName(),warnRule);
+        }
+        return Result.success(list);
     }
 
     /**
diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java
index 4071bf0..413c4b4 100644
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java
@@ -4,6 +4,7 @@ import com.muyu.common.core.domain.Result;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.LoginUser;
 import com.muyu.domain.WarnStrategy;
+import com.muyu.enterprise.cache.AllWarnStrategyCacheService;
 import com.muyu.enterprise.cache.WarnStrategyCacheService;
 import com.muyu.enterprise.service.WarnStrategyService;
 import com.muyu.domain.req.WarnVehicleReq;
@@ -26,6 +27,10 @@ public class WarnStrategyController {
     @Autowired
     private WarnStrategyCacheService warnStrategyCacheService;
 
+    //列表
+    @Autowired
+    private AllWarnStrategyCacheService allWarnStrategyCacheService;
+
     /**
      * 策略列表
      * @return
@@ -33,7 +38,12 @@ public class WarnStrategyController {
     @RequestMapping(path = "/strategyList",method = RequestMethod.POST)
     @Operation(summary = "策略列表", description = "获取所有策略列表")
     public Result<List<WarnStrategy>> strategyList() {
-        return Result.success(warnStrategyService.list());
+        List<WarnStrategy> list = warnStrategyService.list();
+        //存进Redis
+        for (WarnStrategy warnStrategy : list) {
+            allWarnStrategyCacheService.put(String.valueOf(warnStrategy.getWarnStrategyId()),warnStrategy);
+        }
+        return Result.success(list);
     }
 
     /**