From 9e159392c6457508cadb80cb7559e4db32fd9056 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Sun, 1 Jan 2023 12:20:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=B8=85=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ibeetl/admin/core/service/CoreDictService.java | 2 +- .../ibeetl/admin/core/service/CorePlatformService.java | 8 +++++++- .../jlw/service/UniversitiesCollegesService.java | 7 +++++++ .../ibeetl/jlw/service/UniversityFacultyService.java | 9 +++++++++ .../ibeetl/jlw/service/UniversitySystemService.java | 10 ++++++++++ 5 files changed, 34 insertions(+), 2 deletions(-) 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 0b4b70b6..269bf5a5 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 @@ -98,7 +98,7 @@ public class CoreDictService extends CoreBaseService { } } - @Cacheable(value = "core.coreDict.findCoreDictByTable", key="#type+\"_\"+#value") +// @Cacheable(value = "core.coreDict.findCoreDictByTable", key="#type+\"_\"+#value") public CoreDict findCoreDictByTable(String type,String value) { List list = findAllByTable(type); if(list==null) { 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 c1842a69..e2ea38c3 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 @@ -394,20 +394,26 @@ public class CorePlatformService { USER_FUNCTION_ACCESS_CACHE, USER_FUNCTION_CHIDREN_CACHE, USER_DATA_ACCESS_CACHE,/*功能点相关权限缓存*/}, allEntries = true) public void clearFunctionCache() { //没有做任何事情，交给spring cache来处理了 + log.info("clearFunctionCache..."); } @CacheEvict(cacheNames = {CorePlatformService.MENU_TREE_CACHE, CorePlatformService.USER_MENU_CACHE}, allEntries = true) public void clearMenuCache() { //没有做任何事情，交给spring cache来处理了 + log.info("clearMenuCache..."); } - @CacheEvict(cacheNames = {CorePlatformService.DICT_CACHE_CHILDREN,CorePlatformService.DICT_CACHE_SAME_LEVEL,CorePlatformService.DICT_CACHE_TYPE,CorePlatformService.DICT_CACHE_VALUE}, allEntries = true) + @CacheEvict(cacheNames = {CorePlatformService.DICT_CACHE_CHILDREN,CorePlatformService.DICT_CACHE_SAME_LEVEL, + CorePlatformService.DICT_CACHE_TYPE,CorePlatformService.DICT_CACHE_VALUE + , "coreDictDao:findALlListByTable", "coreDictDao.findPkAndValue"}, allEntries = true) public void clearDictCache() { + log.info("clearDictCache..."); } @CacheEvict(cacheNames = {CorePlatformService.ORG_TREE_CACHE}, allEntries = true) public void clearOrgCache() { + log.info("clearOrgCache..."); } /** diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java index e6d23443..03542f82 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java @@ -10,6 +10,7 @@ import com.ibeetl.admin.console.service.OrgConsoleService; import com.ibeetl.admin.core.entity.CoreOrg; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CoreBaseService; +import com.ibeetl.admin.core.service.CorePlatformService; import com.ibeetl.admin.core.service.CoreUserService; import com.ibeetl.jlw.dao.UniversitiesCollegesDao; import com.ibeetl.jlw.entity.*; @@ -49,6 +50,7 @@ public class UniversitiesCollegesService extends CoreBaseService{ @Autowired private UniversityFacultyDao universityFacultyDao; + @Autowired private CorePlatformService corePlatformService; public PageQueryqueryByCondition(PageQuery query){ PageQuery ret = universityFacultyDao.queryByCondition(query); @@ -83,6 +85,8 @@ public class UniversityFacultyService extends CoreBaseService } insertBatch(universityFacultyList); } + + corePlatformService.clearDictCache(); return msg; } @@ -97,6 +101,8 @@ public class UniversityFacultyService extends CoreBaseService jsonResult.setData(universityFaculty.getUniversityFacultyId());//自增的ID丢进去 jsonResult.setCode(JsonReturnCode.SUCCESS.getCode()); jsonResult.setMsg(msg); + + corePlatformService.clearDictCache(); return jsonResult; } @@ -104,6 +110,7 @@ public class UniversityFacultyService extends CoreBaseService String msg = ""; UniversityFaculty universityFaculty = universityFacultyQuery.pojo(); universityFacultyDao.updateTemplateById(universityFaculty); + corePlatformService.clearDictCache(); return msg; } @@ -117,6 +124,8 @@ public class UniversityFacultyService extends CoreBaseService }else{ msg = "指定参数为空"; } + + corePlatformService.clearDictCache(); return msg; } diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java index d52f2575..20c97877 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java @@ -4,6 +4,7 @@ import cn.jlw.util.ToolUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.ibeetl.admin.core.service.CoreBaseService; +import com.ibeetl.admin.core.service.CorePlatformService; import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonReturnCode; @@ -32,6 +33,7 @@ import java.util.List; public class UniversitySystemService extends CoreBaseService{ @Autowired private UniversitySystemDao universitySystemDao; + @Autowired private CorePlatformService corePlatformService; public PageQueryqueryByCondition(PageQuery query){ PageQuery ret = universitySystemDao.queryByCondition(query); @@ -83,6 +85,8 @@ public class UniversitySystemService extends CoreBaseService{ } insertBatch(universitySystemList); } + + corePlatformService.clearDictCache(); return msg; } @@ -97,6 +101,8 @@ public class UniversitySystemService extends CoreBaseService{ jsonResult.setData(universitySystem.getUniversitySystemId());//自增的ID丢进去 jsonResult.setCode(JsonReturnCode.SUCCESS.getCode()); jsonResult.setMsg(msg); + + corePlatformService.clearDictCache(); return jsonResult; } @@ -104,6 +110,8 @@ public class UniversitySystemService extends CoreBaseService{ String msg = ""; UniversitySystem universitySystem = universitySystemQuery.pojo(); universitySystemDao.updateTemplateById(universitySystem); + + corePlatformService.clearDictCache(); return msg; } @@ -117,6 +125,8 @@ public class UniversitySystemService extends CoreBaseService{ }else{ msg = "指定参数为空"; } + + corePlatformService.clearDictCache(); return msg; }