From 10ff4ce838b950df42994de4dbd2af20ff254949 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sun, 30 Jun 2024 12:31:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=9B=B4=E6=96=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/system/service/impl/MenuServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java index 0100c0142..670bb81a6 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java @@ -18,8 +18,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; -import com.alicp.jetcache.anno.CacheInvalidate; -import com.alicp.jetcache.anno.CacheType; import com.alicp.jetcache.anno.Cached; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -33,6 +31,8 @@ import top.continew.admin.system.model.req.MenuReq; import top.continew.admin.system.model.resp.MenuResp; import top.continew.admin.system.service.MenuService; +import top.continew.starter.cache.redisson.util.RedisUtils; +import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.util.validate.CheckUtils; import top.continew.starter.extension.crud.service.impl.BaseServiceImpl; @@ -50,7 +50,6 @@ public class MenuServiceImpl extends BaseServiceImpl implements MenuService { @Override - @CacheInvalidate(key = "'ALL'", name = CacheConstants.MENU_KEY_PREFIX) public Long add(MenuReq req) { String title = req.getTitle(); CheckUtils.throwIf(this.isNameExists(title, req.getParentId(), null), "新增失败,[{}] 已存在", title); @@ -58,29 +57,30 @@ public Long add(MenuReq req) { if (MenuTypeEnum.DIR.equals(req.getType())) { req.setComponent(StrUtil.blankToDefault(req.getComponent(), "Layout")); } + RedisUtils.deleteByPattern(CacheConstants.MENU_KEY_PREFIX + StringConstants.ASTERISK); return super.add(req); } @Override - @CacheInvalidate(key = "'ALL'", name = CacheConstants.MENU_KEY_PREFIX) public void update(MenuReq req, Long id) { String title = req.getTitle(); CheckUtils.throwIf(this.isNameExists(title, req.getParentId(), id), "修改失败,[{}] 已存在", title); MenuDO oldMenu = super.getById(id); CheckUtils.throwIfNotEqual(req.getType(), oldMenu.getType(), "不允许修改菜单类型"); super.update(req, id); + RedisUtils.deleteByPattern(CacheConstants.MENU_KEY_PREFIX + StringConstants.ASTERISK); } @Override @Transactional(rollbackFor = Exception.class) - @CacheInvalidate(key = "'ALL'", name = CacheConstants.MENU_KEY_PREFIX) public void delete(List ids) { baseMapper.lambdaUpdate().in(MenuDO::getParentId, ids).remove(); super.delete(ids); + RedisUtils.deleteByPattern(CacheConstants.MENU_KEY_PREFIX + StringConstants.ASTERISK); } @Override - @Cached(key = "'ALL'", name = CacheConstants.MENU_KEY_PREFIX, cacheType = CacheType.BOTH, syncLocal = true) + @Cached(key = "'ALL'", name = CacheConstants.MENU_KEY_PREFIX) public List listAll() { return super.list(new MenuQuery(DisEnableStatusEnum.ENABLE.getValue()), null); }