From 678539bd793f71b2a7248de31f25db8ad8c68ddd Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 5 Jan 2023 22:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java | 2 +- .../com/ibeetl/admin/core/service/CorePlatformService.java | 3 +-- .../com/ibeetl/jlw/service/UniversityFacultyService.java | 2 ++ web/src/main/java/com/ibeetl/jlw/web/BaseController.java | 3 +++ .../java/com/ibeetl/jlw/web/UniversityFacultyController.java | 5 ++++- .../java/com/ibeetl/jlw/web/UniversitySystemController.java | 3 ++- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java index a8c36905..200d1abe 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java @@ -34,7 +34,7 @@ public interface CoreDictDao extends BaseMapper { List> findComment (String tableName,String columnNames); //动态表名、字段名查询并包装成coreDict实体 - @Cacheable(value = "coreDictDao:findALlListByTable", key = "#idName+#filedName+#tableCode+#tableName+#params") +// @Cacheable(value = "coreDictDao:findALlListByTable", key = "#idName+#filedName+#tableCode+#tableName+#params") List findALlListByTable (String idName,String filedName,String tableCode,String tableName,String[] params); /** 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 e2ea38c3..fea4e6ae 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 @@ -405,8 +405,7 @@ public class CorePlatformService { } @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) + CorePlatformService.DICT_CACHE_TYPE,CorePlatformService.DICT_CACHE_VALUE, "coreDictDao.findPkAndValue"}, allEntries = true) public void clearDictCache() { log.info("clearDictCache..."); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java index 05cdc13c..3ac657d2 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java @@ -55,12 +55,14 @@ public class UniversityFacultyService extends CoreBaseService } if(StringUtils.isNotBlank(ids)){ universityFacultyDao.deleteByIds(ids); + corePlatformService.clearDictCache(); } } public void deleteUniversityFaculty(String ids){ try { universityFacultyDao.deleteUniversityFacultyByIds(ids); + corePlatformService.clearDictCache(); } catch (Exception e) { throw new PlatformException("批量删除院系管理失败", e); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/BaseController.java b/web/src/main/java/com/ibeetl/jlw/web/BaseController.java index 2097b25f..f4d4e8e5 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/BaseController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/BaseController.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.web; +import com.ibeetl.admin.core.service.CorePlatformService; import org.springframework.beans.factory.annotation.Autowired; import javax.servlet.http.HttpServletRequest; @@ -24,6 +25,8 @@ public class BaseController { @Autowired protected HttpServletRequest request; + @Autowired + protected CorePlatformService corePlatformService; protected void setExcelResponse(@NotBlank String filename) throws UnsupportedEncodingException { response.setCharacterEncoding("utf-8"); diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java index 3813b7eb..53b38f2d 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java @@ -30,7 +30,7 @@ import java.util.List; */ @Controller -public class UniversityFacultyController{ +public class UniversityFacultyController extends BaseController { private final Log log = LogFactory.getLog(this.getClass()); private static final String MODEL = "/jlw/universityFaculty"; @@ -145,6 +145,7 @@ public class UniversityFacultyController{ universityFacultyQuery.setOrgId(coreUser.getOrgId()); String msg = universityFacultyService.addAll(universityFacultyQuery); if (StringUtils.isBlank(msg)) { + corePlatformService.clearDictCache(); return JsonResult.success(); } else { return JsonResult.failMessage("新增失败,"+msg); @@ -161,6 +162,7 @@ public class UniversityFacultyController{ }else{ universityFacultyQuery.setUserId(coreUser.getId()); universityFacultyQuery.setOrgId(coreUser.getOrgId()); + corePlatformService.clearDictCache(); return universityFacultyService.add(universityFacultyQuery); } } @@ -176,6 +178,7 @@ public class UniversityFacultyController{ universityFacultyQuery.setOrgId(null); String msg = universityFacultyService.edit(universityFacultyQuery); if (StringUtils.isBlank(msg)) { + corePlatformService.clearDictCache(); return JsonResult.success(); } else { return JsonResult.failMessage("更新失败,"+msg); diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitySystemController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitySystemController.java index ec922c6a..f2161793 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitySystemController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitySystemController.java @@ -32,7 +32,7 @@ import java.util.List; */ @Controller -public class UniversitySystemController{ +public class UniversitySystemController extends BaseController { private final Log log = LogFactory.getLog(this.getClass()); private static final String MODEL = "/jlw/universitySystem"; @@ -220,6 +220,7 @@ public class UniversitySystemController{ @ResponseBody public JsonResult delete(String ids) { universitySystemService.deleteUniversitySystem(ids); + corePlatformService.clearDictCache(); return JsonResult.success(); }