From 25da9cbdc672fa3732e2ced1057e918f84530f72 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Thu, 2 Nov 2023 21:33:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/cache/CacheObjNames.java | 33 +++++++++++++++++++ .../BasicdataWarehouseController.java | 16 ++++++--- .../impl/BasicdataWarehouseServiceImpl.java | 14 +++----- 3 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/cache/CacheObjNames.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/cache/CacheObjNames.java b/blade-biz-common/src/main/java/org/springblade/common/cache/CacheObjNames.java new file mode 100644 index 000000000..960924ddd --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/cache/CacheObjNames.java @@ -0,0 +1,33 @@ +package org.springblade.common.cache; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; + +/** + * 系统查询缓存名称定义 + */ +@AllArgsConstructor +@Getter +public enum CacheObjNames { + + /** + * 基础数据模块 当前登陆人操作仓库的缓存 + */ + basic_data_warehourse_list("getMyWarehouseList","basicdataWarehouseList"); + + + /** + * 缓存名称 + */ + final String cacheName; + + + /** + * 缓存前缀 + */ + final String keyPrefix; + + + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java index 6d6bbfd1f..dfa8f2ad6 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java @@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springblade.common.cache.CacheObjNames; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.excel.util.ExcelUtil; @@ -40,6 +41,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; @@ -182,8 +184,9 @@ public class BasicdataWarehouseController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入warehouseWarehouse") public R save(@Valid @RequestBody BasicdataWarehouseEntity warehouseWarehouse) { + BladeUser user = AuthUtil.getUser(); + CacheUtil.evict(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(),user.getUserId()); warehouseWarehouse.setEnableStatus("2"); - CacheUtil.evict("getMyWarehouseList","basicdata","WarehouseList"); return R.status(warehouseService.save(warehouseWarehouse)); } @@ -204,7 +207,8 @@ public class BasicdataWarehouseController extends BladeController { @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入warehouseWarehouse") public R submit(@Valid @RequestBody BasicdataWarehouseEntity warehouseWarehouse) { - CacheUtil.evict("getMyWarehouseList","basicdata","WarehouseList"); + BladeUser user = AuthUtil.getUser(); + CacheUtil.evict(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(),user.getUserId()); return R.status(warehouseService.saveOrUpdate(warehouseWarehouse)); } @@ -218,8 +222,9 @@ public class BasicdataWarehouseController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + BladeUser user = AuthUtil.getUser(); - CacheUtil.evict("getMyWarehouseList","basicdata","WarehouseList"); + CacheUtil.evict(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(),user.getUserId()); boolean result = warehouseService.removeWarehouse(ids); if (result) { @@ -285,11 +290,12 @@ public class BasicdataWarehouseController extends BladeController { @ApiOperationSupport(order = 3) public R> getMyWarehouseList() { - List basicdataGoodsShelfVOList = CacheUtil.get("getMyWarehouseList", "basicdata", "WarehouseList",List.class); + BladeUser user = AuthUtil.getUser(); + List basicdataGoodsShelfVOList = CacheUtil.get(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(), user.getUserId(),List.class); if(ObjectUtils.isNull(basicdataGoodsShelfVOList)){ basicdataGoodsShelfVOList = warehouseService.getMyWarehouseList(); - CacheUtil.put("getMyWarehouseList","basicdata","WarehouseList",basicdataGoodsShelfVOList); + CacheUtil.put(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(),user.getUserId(),basicdataGoodsShelfVOList); } return R.data(basicdataGoodsShelfVOList); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java index 631c1500b..13d5fe7b5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java @@ -179,16 +179,10 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl warehouseEntityList = baseMapper.selectList(Wrappers.query().lambda().in(BasicdataWarehouseEntity::getDepartment, deptIds)); -// String json = redis.get(CacheNames.tenantKeyObj(user.getTenantId(), CacheNames.USER_WAREHOUSE_KEY, user.getUserId())); -// if (warehouseEntityList.size() <= 1) { -// redis.setEx(CacheNames.tenantKeyObj(user.getTenantId(), CacheNames.USER_WAREHOUSE_KEY, user.getUserId()), warehouseEntityList.get(0), 30 * 24 * 60 * 60L); -// } - return warehouseEntityList; + if(deptIds.isEmpty()){ + return null; + } + return baseMapper.selectList(Wrappers.query().lambda().in(BasicdataWarehouseEntity::getDepartment, deptIds)); } @Override