feat: 使用 Cacheable 优化 API 角色关系缓存

Author: cadecode

framework/src/main/java/top/cadecode/uniboot/framework/controller/SysApiController.java

@@ -6,6 +6,7 @@
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,6 +21,7 @@
 import top.cadecode.uniboot.framework.bean.po.SysApi;
 import top.cadecode.uniboot.framework.bean.vo.SysApiVo.SysApiRolesVo;
 import top.cadecode.uniboot.framework.bean.vo.SysApiVo.SysApiSwaggerVo;
+import top.cadecode.uniboot.framework.consts.KeyPrefix;
 import top.cadecode.uniboot.framework.convert.SysApiConvert;
 import top.cadecode.uniboot.framework.service.SysApiService;
 import top.cadecode.uniboot.framework.service.SysRoleService;
@@ -64,13 +66,15 @@ public PageResult<SysApiRolesVo> pageRolesVo(@RequestBody @Valid SysApiRolesRequ
         return new PageResult<>((int) rolesVoPage.getTotal(), rolesVoPage.getList());
     }
 
+    @CacheEvict(cacheNames = KeyPrefix.API_ROLES, key = "'all'")
     @ApiOperation("更新API")
     @PostMapping("update")
     public boolean update(@RequestBody @Valid SysApiUpdateRequest request) {
         SysApi po = SysApiConvert.INSTANCE.requestToPo(request);
         return sysApiService.updateById(po);
     }
 
+    @CacheEvict(cacheNames = KeyPrefix.API_ROLES, key = "'all'")
     @ApiOperation("添加API")
     @PostMapping("add")
     public boolean add(@RequestBody @Valid SysApiAddRequest request) {

framework/src/main/java/top/cadecode/uniboot/framework/controller/SysRoleController.java

@@ -5,6 +5,7 @@
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,6 +17,7 @@
 import top.cadecode.uniboot.framework.bean.po.SysRole;
 import top.cadecode.uniboot.framework.bean.vo.SysRoleVo.SysRoleListVo;
 import top.cadecode.uniboot.framework.bean.vo.SysRoleVo.SysRoleUnionVo;
+import top.cadecode.uniboot.framework.consts.KeyPrefix;
 import top.cadecode.uniboot.framework.convert.SysRoleConvert;
 import top.cadecode.uniboot.framework.request.SysRoleRequest;
 import top.cadecode.uniboot.framework.request.SysRoleRequest.SysRoleMappingRequest;
@@ -99,13 +101,15 @@ public List<SysRoleUnionVo> listUnionVoByRoleIds(@RequestBody @NotEmpty List<Lon
         return sysRoleService.listUnionVoByRoleIds(roleIds);
     }
 
+    @CacheEvict(cacheNames = KeyPrefix.API_ROLES, key = "'all'")
     @ApiOperation("更新角色")
     @PostMapping("update")
     public boolean update(@RequestBody @Valid SysRoleRequest.SysRoleUpdateRequest request) {
         SysRole po = SysRoleConvert.INSTANCE.requestToPo(request);
         return sysRoleService.updateById(po);
     }
 
+    @CacheEvict(cacheNames = KeyPrefix.API_ROLES, key = "'all'")
     @ApiOperation("添加角色")
     @PostMapping("add")
     public boolean add(@RequestBody @Valid SysRoleRequest.SysRoleAddRequest request) {

framework/src/main/java/top/cadecode/uniboot/framework/serviceimpl/SysApiServiceImpl.java

@@ -1,14 +1,11 @@
 package top.cadecode.uniboot.framework.serviceimpl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
-import top.cadecode.uniboot.common.plugin.cache.util.RedisUtil;
 import top.cadecode.uniboot.framework.bean.po.SysApi;
 import top.cadecode.uniboot.framework.bean.vo.SysApiVo.SysApiRolesVo;
 import top.cadecode.uniboot.framework.consts.KeyPrefix;
@@ -17,7 +14,6 @@
 import top.cadecode.uniboot.framework.service.SysApiService;
 
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 系统接口服务实现
@@ -31,23 +27,10 @@ public class SysApiServiceImpl extends ServiceImpl<SysApiMapper, SysApi> impleme
 
     private final SysApiMapper sysApiMapper;
 
-    @Cacheable(cacheNames = KeyPrefix.API_ROLES, cacheManager = "caffeine5s")
+    @Cacheable(cacheNames = KeyPrefix.API_ROLES, key = "'all'")
     @Override
     public List<SysApiRolesVo> listRolesVo() {
-        List<SysApiRolesVo> sysApiRolesVos = RedisUtil.get(KeyPrefix.API_ROLES, new TypeReference<List<SysApiRolesVo>>() {});
-        if (ObjectUtil.isNotNull(sysApiRolesVos)) {
-            return sysApiRolesVos;
-        }
-        synchronized (this) {
-            sysApiRolesVos = RedisUtil.get(KeyPrefix.API_ROLES, new TypeReference<List<SysApiRolesVo>>() {});
-            if (ObjectUtil.isNotNull(sysApiRolesVos)) {
-                return sysApiRolesVos;
-            }
-            List<SysApiRolesVo> voList = sysApiMapper.selectRolesVo(null);
-            // 每 5 分钟刷新一次
-            RedisUtil.set(KeyPrefix.API_ROLES, voList, 5, TimeUnit.MINUTES);
-            return voList;
-        }
+        return sysApiMapper.selectRolesVo(null);
     }
 
     @Override

framework/src/main/java/top/cadecode/uniboot/framework/serviceimpl/SysRoleServiceImpl.java

@@ -4,9 +4,11 @@
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import top.cadecode.uniboot.framework.bean.po.SysRole;
 import top.cadecode.uniboot.framework.bean.vo.SysRoleVo.SysRoleUnionVo;
+import top.cadecode.uniboot.framework.consts.KeyPrefix;
 import top.cadecode.uniboot.framework.mapper.SysRoleMapper;
 import top.cadecode.uniboot.framework.request.SysRoleRequest.SysRoleMappingRequest;
 import top.cadecode.uniboot.framework.request.SysRoleRequest.SysRoleUnionRequest;
@@ -61,11 +63,13 @@ public int removeRoleMenuByRoleIds(List<Long> roleIds) {
         return sysRoleMapper.deleteRoleMenuByRoleIds(roleIds);
     }
 
+    @CacheEvict(cacheNames = KeyPrefix.API_ROLES, key = "'all'")
     @Override
     public int removeRoleApiByApiIds(List<Long> apiIds) {
         return sysRoleMapper.deleteRoleApiByApiIds(apiIds);
     }
 
+    @CacheEvict(cacheNames = KeyPrefix.API_ROLES, key = "'all'")
     @Override
     public int removeRoleApiByRoleIds(List<Long> roleIds) {
         return sysRoleMapper.deleteRoleApiByRoleIds(roleIds);
@@ -81,6 +85,7 @@ public int removeRoleMenu(List<SysRoleMappingRequest> list) {
         return sysRoleMapper.deleteRoleMenu(list);
     }
 
+    @CacheEvict(cacheNames = KeyPrefix.API_ROLES, key = "'all'")
     @Override
     public int removeRoleApi(List<SysRoleMappingRequest> list) {
         return sysRoleMapper.deleteRoleApi(list);
@@ -96,6 +101,7 @@ public int addRoleMenu(List<SysRoleMappingRequest> list) {
         return sysRoleMapper.insertRoleMenu(list);
     }
 
+    @CacheEvict(cacheNames = KeyPrefix.API_ROLES, key = "'all'")
     @Override
     public int addRoleApi(List<SysRoleMappingRequest> list) {
         return sysRoleMapper.insertRoleApi(list);