From 83baa8992d9df3fe24d6d29abc0094d6c49e60e6 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 27 Oct 2022 01:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibeetl/admin/console/service/FunctionConsoleService.java | 5 +++++ .../java/com/ibeetl/admin/core/service/CoreDictService.java | 2 +- .../com/ibeetl/admin/core/service/CorePlatformService.java | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java b/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java index bf69a677..07f5abcf 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java @@ -16,12 +16,16 @@ import com.ibeetl.admin.core.util.PlatformException; import org.apache.commons.collections4.CollectionUtils; import org.beetl.sql.core.engine.PageQuery; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; + +import static com.ibeetl.admin.core.service.CorePlatformService.USER_FUNCTION_TREE_CACHE; + /** * @author TLT * @@ -120,6 +124,7 @@ public class FunctionConsoleService extends CoreBaseService { * @param userId * @return */ + @Cacheable(value=USER_FUNCTION_TREE_CACHE, key="userId") public String getFunctionIdByUser(Long userId){ return this.roleFunctionConsoleDao.getFunctionIdByUser(userId); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java index dc5df4ce..631c2837 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java @@ -42,7 +42,7 @@ public class CoreDictService extends CoreBaseService { * @param type 字典类型， * @return List */ - @Cacheable(value = CorePlatformService.DICT_CACHE_TYPE) + @Cacheable(value = CorePlatformService.DICT_CACHE_TYPE, unless="#result == null || #result.size() == 0") public List findAllByType(String type) { return dictDao.findAllList(type); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java index 51eb9f73..ba4ecd1f 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java @@ -41,6 +41,7 @@ public class CorePlatformService { public static final String MENU_TREE_CACHE = "cache:core:menuTree"; public static final String ORG_TREE_CACHE = "cache:core:orgTree"; public static final String FUNCTION_TREE_CACHE = "cache:core:functionTree"; + public static final String USER_FUNCTION_TREE_CACHE = "cache:core:userFunction"; //字典列表 public static final String DICT_CACHE_TYPE = "cache:core:dictType"; public static final String DICT_CACHE_VALUE = "cache:core:dictValue";