From 7c4c0f9dd7977377b9c538752d7b7821143663af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sun, 28 Apr 2019 18:35:27 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E9=81=97=E6=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=AF=BC=E8=87=B4=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E8=8F=9C=E5=8D=95=E4=B8=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/core/constant/CacheConstants.java | 5 +++++ .../pig4cloud/pigx/admin/controller/DictController.java | 9 +++++---- .../pigx/admin/service/impl/SysDictServiceImpl.java | 3 ++- .../pigx/admin/service/impl/SysMenuServiceImpl.java | 2 +- .../pigx/admin/service/impl/SysRoleMenuServiceImpl.java | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java index 7436b23c3..7d43ea736 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java @@ -34,4 +34,9 @@ public interface CacheConstants { */ String ROUTE_KEY = "gateway_route_key"; + /** + * 字典缓存 + */ + String DICT_DETAILS = "dict_details"; + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java index f9d4520e9..208bcefd6 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java @@ -27,6 +27,7 @@ import com.pig4cloud.pigx.admin.api.entity.SysDict; import com.pig4cloud.pigx.admin.api.entity.SysDictItem; import com.pig4cloud.pigx.admin.service.SysDictItemService; import com.pig4cloud.pigx.admin.service.SysDictService; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; import io.swagger.annotations.Api; @@ -83,7 +84,7 @@ public class DictController { * @return 同类型字典 */ @GetMapping("/type/{type}") - @Cacheable(value = "dict_details", key = "#type") + @Cacheable(value = CacheConstants.DICT_DETAILS, key = "#type", unless = "#result == null") public R getDictByType(@PathVariable String type) { return new R<>(sysDictItemService.list(Wrappers .query().lambda() @@ -161,7 +162,7 @@ public class DictController { */ @SysLog("新增字典项") @PostMapping("/item") - @CacheEvict(value = "dict_details", allEntries = true) + @CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true) public R save(@RequestBody SysDictItem sysDictItem) { return new R<>(sysDictItemService.save(sysDictItem)); } @@ -174,7 +175,7 @@ public class DictController { */ @SysLog("修改字典项") @PutMapping("/item") - @CacheEvict(value = "dict_details", allEntries = true) + @CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true) public R updateById(@RequestBody SysDictItem sysDictItem) { return new R<>(sysDictItemService.updateById(sysDictItem)); } @@ -187,7 +188,7 @@ public class DictController { */ @SysLog("删除字典项") @DeleteMapping("/item/{id}") - @CacheEvict(value = "dict_details", allEntries = true) + @CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true) public R removeDictItemById(@PathVariable Integer id) { return new R<>(sysDictItemService.removeById(id)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java index bad753575..5b53f8ad6 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java @@ -23,6 +23,7 @@ import com.pig4cloud.pigx.admin.api.entity.SysDictItem; import com.pig4cloud.pigx.admin.mapper.SysDictItemMapper; import com.pig4cloud.pigx.admin.mapper.SysDictMapper; import com.pig4cloud.pigx.admin.service.SysDictService; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import lombok.AllArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; @@ -46,7 +47,7 @@ public class SysDictServiceImpl extends ServiceImpl impl * @return */ @Override - @CacheEvict(value = "dict_details", allEntries = true) + @CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true) @Transactional(rollbackFor = Exception.class) public Boolean removeDict(Integer id) { baseMapper.deleteById(id); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index 2f53b5878..963d8043d 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -53,7 +53,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl private final SysRoleMenuMapper sysRoleMenuMapper; @Override - @Cacheable(value = CacheConstants.MENU_DETAILS, key = "#roleId + '_menu'") + @Cacheable(value = CacheConstants.MENU_DETAILS, key = "#roleId + '_menu'", unless = "#result == null") public List findMenuByRoleId(Integer roleId) { return baseMapper.listMenusByRoleId(roleId); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java index 1001b2603..0ed0d4a4b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java @@ -57,7 +57,7 @@ public class SysRoleMenuServiceImpl extends ServiceImplquery().lambda() .eq(SysRoleMenu::getRoleId, roleId));