dict缓存

admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java

@@ -204,9 +204,9 @@ public class CacheConfig extends CachingConfigurerSupport {
 			} else {
 				// 二级缓存取
 				wrapper = redisCache.get(key);
-				if (wrapper != null) {
-					local.put(key, wrapper);
-				}
+//				if (wrapper != null) {
+//					local.put(key, wrapper);
+//				}
 
 				return wrapper;
 			}

admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java

@@ -424,8 +424,8 @@ public class CorePlatformService {
         log.info("clearMenuCache...");
     }
 
-    @CacheEvict(cacheNames = {DICT_CACHE_CHILDREN,DICT_CACHE_SAME_LEVEL, DICT_CACHE_TYPE,
-            DICT_CACHE_VALUE, DICT_CACHE_FIND_PK_AND_VALUE, DICT_CACHE_FIND_ALL_LIST_BY_TABLE}, allEntries = true )
+    @CacheEvict(cacheNames = { DICT_CACHE_CHILDREN, DICT_CACHE_SAME_LEVEL, DICT_CACHE_TYPE,
+            DICT_CACHE_VALUE, DICT_CACHE_FIND_PK_AND_VALUE, DICT_CACHE_FIND_ALL_LIST_BY_TABLE }, allEntries = true )
     public void clearDictCache() {
         log.info("clearDictCache...");
     }

admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/DictQueryFunction.java

@@ -1,15 +1,20 @@
 package com.ibeetl.admin.core.util.beetl;
 
-import cn.hutool.extra.spring.SpringUtil;
 import com.ibeetl.admin.core.entity.CoreDict;
 import com.ibeetl.admin.core.service.CoreDictService;
+import com.ibeetl.admin.core.service.CorePlatformService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 @Component
 public class DictQueryFunction  {
 
-	CoreDictService dictService = SpringUtil.getBean(CoreDictService.class);
+	@Autowired
+	CorePlatformService platformService;
+	@Autowired
+	CoreDictService dictService;
+
 	public List<CoreDict> dictDownQuery(String type) {
 		if(type.contains(".")){
 			return dictService.findAllByTable(type);
@@ -17,7 +22,18 @@ public class DictQueryFunction  {
 			return dictService.findAllByType(type);
 		}
 	}
-	
+	public List<CoreDict> dictDownQuery(String type, boolean forceClearCache) {
+		if (forceClearCache) {
+			platformService.clearDictCache();
+		}
+
+		if(type.contains(".")){
+			return dictService.findAllByTable(type);
+		}else {
+			return dictService.findAllByType(type);
+		}
+	}
+
 	
 	public List<CoreDict> dictListByValue(String group,String value){
 	    

admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html

@@ -10,7 +10,7 @@ if(has(readonly)){
 	var dicts = [];
 	var selectedDict = null;
 	if(isNotEmpty(type)){
-		dicts = dict.dictDownQuery(type);
+		dicts = dict.dictDownQuery(type, !isNotEmpty(forceClear) ? true : @java.lang.Boolean.parseBoolean(forceClear));
 	}else if(isNotEmpty(group)&&isNotEmpty(value)){
 		//级联选择
 		dicts = dict.dictListByValue(group,value);
@@ -32,7 +32,7 @@ if(has(readonly)){
 	<!--# 
 		var dicts = [];
 		if(isNotEmpty(type)){
-			dicts = dict.dictDownQuery(type);
+			dicts = dict.dictDownQuery(type, !isNotEmpty(forceClear) ? true : @java.lang.Boolean.parseBoolean(forceClear));
 		}else if(isNotEmpty(group)&&isNotEmpty(value)){
 			//级联选择
 			dicts = dict.dictListByValue(group,value);