From 0d343fed34295e0e95c94f01d0dd904bb81a99be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Thu, 16 Apr 2020 10:23:58 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E9=87=8D?= =?UTF-8?q?=E6=9E=84@Cacheable=20unless=20=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/common/security/service/PigxUser.java | 6 +++++- .../pig4cloud/pigx/admin/controller/SysDictController.java | 2 +- .../pigx/admin/service/impl/SysMenuServiceImpl.java | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java index c23546035..74590d23e 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java @@ -20,16 +20,20 @@ package com.pig4cloud.pigx.common.security.service; import lombok.Getter; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.SpringSecurityCoreVersion; import org.springframework.security.core.userdetails.User; import java.util.Collection; /** * @author lengleng - * @date 2018/8/20 + * @date 2020/4/16 * 扩展用户信息 */ public class PigxUser extends User { + + private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + /** * 用户ID */ diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java index dcd6cfaf2..92608c884 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java @@ -84,7 +84,7 @@ public class SysDictController { * @return 同类型字典 */ @GetMapping("/type/{type}") - @Cacheable(value = CacheConstants.DICT_DETAILS, key = "#type", unless = "#result.data.size() == 0") + @Cacheable(value = CacheConstants.DICT_DETAILS, key = "#type", unless = "#result.data.isEmpty()") public R getDictByType(@PathVariable String type) { return R.ok(sysDictItemService.list(Wrappers .query().lambda() 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 910b15f9a..afac06805 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 @@ -60,7 +60,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.isEmpty()") public List findMenuByRoleId(Integer roleId) { return baseMapper.listMenusByRoleId(roleId); } @@ -114,8 +114,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl /** * 查询菜单 * - * @param all 全部菜单 - * @param type 类型 + * @param all 全部菜单 + * @param type 类型 * @param parentId 父节点ID * @return */