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 b899371..df19f0c 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 @@ -3,11 +3,12 @@ package com.muyu.enterprise.cache; import com.muyu.common.cache.CacheAbsBacis; import com.muyu.domain.Fence; import com.muyu.domain.req.FenceReq; +import com.muyu.domain.resp.FenceResp; /** * 所有电子围栏缓存 */ -public class AllFenceCahceService extends CacheAbsBacis { +public class AllFenceCahceService extends CacheAbsBacis { @Override public void clear() { 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 f17d968..21a5a55 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 @@ -4,11 +4,12 @@ import com.muyu.common.cache.CacheAbsBacis; import com.muyu.domain.MessageTemplate; import com.muyu.domain.MessageValue; import com.muyu.domain.req.MessageValueReq; +import com.muyu.domain.resp.MessageValueListResp; /** * 报文模版缓存 */ -public class AllMessageValueCacheService extends CacheAbsBacis { +public class AllMessageValueCacheService extends CacheAbsBacis { @Override diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java index 56abbf7..8aa9405 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java @@ -53,6 +53,12 @@ public class MessageValueListResp { @Schema(type = "Integer",title = "起始下标") private Integer messageStartIndex; + /** + * 报文模版外键 + */ + @Schema(type = "Long",description = "报文模版主键") + private Long messageTemplateId; + /** * 终止下标 */ 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 f812425..395707f 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 @@ -3,6 +3,7 @@ package com.muyu.enterprise.controller; import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; +import com.muyu.enterprise.cache.AllFenceCahceService; import com.muyu.enterprise.cache.FenceCahceService; import com.muyu.enterprise.cache.VehicleCacheService; import com.muyu.enterprise.service.ElectService; @@ -45,6 +46,8 @@ public class ElectController extends BaseController { @Autowired private FenceCahceService fenceCahceService; + @Autowired + private AllFenceCahceService allFenceCahceService; /** @@ -57,6 +60,9 @@ public class ElectController extends BaseController { startPage(); List list = electService.selectFenceList(req); //将列表存到Redis + for (FenceResp fenceResp : list) { + allFenceCahceService.put(fenceResp.getCoordinates(),fenceResp); + } return getDataTable(list); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageTemplateController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageTemplateController.java index 3390337..8da6fd8 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageTemplateController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageTemplateController.java @@ -37,6 +37,7 @@ public class MessageTemplateController { @Autowired private MessageTemplateCacheService templateCacheService; + /** * 报文模版列表查询 *1 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageValueController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageValueController.java index 62f376e..bf394ca 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageValueController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageValueController.java @@ -1,5 +1,6 @@ package com.muyu.enterprise.controller; +import com.muyu.enterprise.cache.AllMessageValueCacheService; import com.muyu.enterprise.service.MessageValueService; import com.muyu.common.core.domain.Result; import com.muyu.domain.MessageValue; @@ -32,6 +33,11 @@ public class MessageValueController { @Autowired private MessageValueService messageValueService; + //存Redis + @Autowired + private AllMessageValueCacheService allMessageValueCacheService; + + /** * 报文数据列表查询 * @@ -42,6 +48,9 @@ public class MessageValueController { @Operation(summary = "报文数据列表", description = "根据报文类别, 报文模版筛选报文数据") public Result> findAll(@RequestBody MessageValueReq messageValueReq) { List list = messageValueService.findAll(messageValueReq); + for (MessageValueListResp messageValueListResp : list) { + allMessageValueCacheService.put(String.valueOf(messageValueListResp.getMessageTemplateId()), messageValueListResp); + } return Result.success(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 dd16cc7..3518600 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 @@ -6,6 +6,7 @@ import com.muyu.domain.MessageValue; import com.muyu.domain.VehicleType; import com.muyu.domain.req.MessageValueAddReq; import com.muyu.domain.req.VehicleAddReq; +import com.muyu.enterprise.cache.AllVehicleTypeCacheService; import com.muyu.enterprise.cache.VehicleCacheService; import com.muyu.enterprise.cache.VehicleTypeCacheService; import com.muyu.enterprise.service.VehicleTypeService; @@ -38,6 +39,11 @@ public class VehicleTypeController { @Autowired private VehicleTypeCacheService vehicleTypeCacheService; + //存缓存 + @Autowired + private AllVehicleTypeCacheService allVehicleTypeCacheService; + + /** * 查询所有车辆类型 * @return @@ -45,7 +51,11 @@ public class VehicleTypeController { @RequestMapping(path = "/", method = RequestMethod.POST) @Operation(summary = "车辆类型列表",description = "车辆类型列表") public Result> findAll(){ - return Result.success(vehicleTypeService.list()); + List list = vehicleTypeService.list(); + for (VehicleType vehicleType : list) { + allVehicleTypeCacheService.put(String.valueOf(vehicleType.getVehicleTypeId()),vehicleType); + } + return Result.success(); } /**