diff --git a/JavaSample-tcp111231501461883/.lck b/JavaSample-tcp111231501461883/.lck new file mode 100644 index 0000000..e69de29 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 new file mode 100644 index 0000000..66efe2b --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFaultCacheService.java @@ -0,0 +1,23 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; + +/** + * 所有故障缓存服务 + */ +public class AllFaultCacheService extends CacheAbsBacis { + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "Allfault:info:"; + } + + @Override + public String decode(String key) { + 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 new file mode 100644 index 0000000..b899371 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceCahceService.java @@ -0,0 +1,26 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.Fence; +import com.muyu.domain.req.FenceReq; + +/** + * 所有电子围栏缓存 + */ +public class AllFenceCahceService extends CacheAbsBacis { + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "Allfence:info:"; + } + + @Override + public String decode(String key) { + 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 new file mode 100644 index 0000000..f17d968 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java @@ -0,0 +1,28 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.MessageTemplate; +import com.muyu.domain.MessageValue; +import com.muyu.domain.req.MessageValueReq; + +/** + * 报文模版缓存 + */ +public class AllMessageValueCacheService extends CacheAbsBacis { + + + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "Allmessagevalue:info:"; + } + + @Override + public String decode(String key) { + 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 new file mode 100644 index 0000000..5da3875 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleCacheService.java @@ -0,0 +1,36 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.Vehicle; +import com.muyu.domain.req.VehicleAddReq; +import com.muyu.domain.req.VehicleManageReq; +import com.muyu.domain.resp.VehicleManageResp; + +import java.util.List; + +/** + * 所有车辆缓存 + */ +public class AllVehicleCacheService extends CacheAbsBacis { + + + @Override + public void clear() { + + } + + /** + * 缓存key前缀 + * @return + */ + @Override + public String keyPre() { + return "allvehicle:info:"; + } + + @Override + public String decode(String key) { + 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 new file mode 100644 index 0000000..130776c --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleTypeCacheService.java @@ -0,0 +1,24 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.VehicleType; + +/** + * 所有车辆类型缓存 + */ +public class AllVehicleTypeCacheService extends CacheAbsBacis { + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "vehicleType:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicleType:info:", ""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java new file mode 100644 index 0000000..956a360 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java @@ -0,0 +1,26 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.MessageValue; + +/** + * 报文模版缓存 + */ +public class MessageValueCacheService extends CacheAbsBacis { + + + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "messagevalue:info:"; + } + + @Override + public String decode(String key) { + return key.replace("messagevalue:info:", ""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java index 052fa9d..dfeebd3 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java @@ -4,7 +4,7 @@ import com.muyu.common.cache.CacheAbsBacis; import com.muyu.domain.Vehicle; /** - * 车辆缓存 + * 添加车辆缓存 */ public class VehicleCacheService extends CacheAbsBacis { 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 faeca69..c2d5f8e 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 @@ -1,7 +1,15 @@ -com.muyu.enterprise.cache.VehicleCacheService +com.muyu.enterprise.cache.AllFaultCacheService +com.muyu.enterprise.cache.AllFenceCahceService +com.muyu.enterprise.cache.AllMessageValueCacheService +com.muyu.enterprise.cache.AllVehicleCacheService +com.muyu.enterprise.cache.AllVehicleTypeCacheService com.muyu.enterprise.cache.FaultCacheService com.muyu.enterprise.cache.FenceCahceService +com.muyu.enterprise.cache.MessageTemplateCacheService +com.muyu.enterprise.cache.MessageValueCacheService +com.muyu.enterprise.cache.VehicleCacheService +com.muyu.enterprise.cache.VehicleTypeCacheService com.muyu.enterprise.cache.WarnRuleCacheService com.muyu.enterprise.cache.WarnStrategyCacheService -com.muyu.enterprise.cache.MessageTemplateCacheService -com.muyu.enterprise.cache.VehicleTypeCacheService + + 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 70e093f..f812425 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 @@ -28,7 +28,9 @@ import java.security.Security; import java.util.List; import java.util.concurrent.TimeUnit; - +/** + * 电子围栏信息 + */ @RequestMapping("/elect") @RestController @Log4j2 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 7639027..a3ce787 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 @@ -3,6 +3,7 @@ package com.muyu.enterprise.controller; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.domain.req.BoundFenceGroupReq; +import com.muyu.enterprise.cache.AllVehicleCacheService; import com.muyu.enterprise.cache.VehicleCacheService; import com.muyu.enterprise.service.VehicleService; import com.muyu.common.core.domain.Result; @@ -20,9 +21,11 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Collections; import java.util.List; /** @@ -42,9 +45,15 @@ public class VehicleController extends BaseController { @Autowired private VehicleService vehicleService; - //车辆缓存 + //添加车辆缓存 @Autowired private VehicleCacheService vehicleCacheService; + //车辆信息 + @Autowired + private AllVehicleCacheService allVehicleCacheService; + + @Autowired + private RedisTemplate redisTemplate; /** @@ -57,6 +66,10 @@ public class VehicleController extends BaseController { public Result> getVehicleList(@RequestBody VehicleManageReq vehicleManageReq) { startPage(); List list = vehicleService.getVehicleList(vehicleManageReq); +// 将车辆信息存到Redis + for (VehicleManageResp resp : list) { + allVehicleCacheService.put(resp.getVehicleVin(), resp); + } return getDataTable(list); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java index c0a6cd4..dd16cc7 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java @@ -57,12 +57,13 @@ public class VehicleTypeController { @Operation(summary = "添加报文数据", description = "新增报文数据") public Result save(@RequestBody VehicleType vehicleType) { boolean save = vehicleTypeService.save(vehicleType); - //获取用户信息 - LoginUser loginUser = SecurityUtils.getLoginUser(); - //获取租户唯一标识 - String databaseName = loginUser.getSysUser().getDatabaseName(); +// //获取用户信息 +// LoginUser loginUser = SecurityUtils.getLoginUser(); +// //获取租户唯一标识 +// String databaseName = loginUser.getSysUser().getDatabaseName(); //存到redis - vehicleTypeCacheService.put(databaseName+vehicleType.getVehicleTypeId(),vehicleType); +// vehicleTypeCacheService.put(databaseName+vehicleType.getVehicleTypeId(),vehicleType); + vehicleTypeCacheService.put(String.valueOf(vehicleType.getVehicleTypeId()),vehicleType); return Result.success(save? "添加成功" : "添加失败"); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java index 37bd6f2..d0ca10e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java @@ -8,6 +8,7 @@ import com.muyu.domain.VehicleType; import com.muyu.domain.req.BoundFenceGroupReq; import com.muyu.domain.req.VehicleManageReq; import com.muyu.domain.resp.VehicleManageResp; +import com.muyu.enterprise.cache.AllVehicleCacheService; import com.muyu.enterprise.mapper.VehicleMapper; import com.muyu.enterprise.service.VehicleService; import org.springframework.beans.factory.annotation.Autowired;