From 02f4fdb2e5b68ec97cc1d6ef83d145dc6318f89d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 19 十月 2022 09:16:06 +0800
Subject: [PATCH] !241 【轻量级 PR】修正Excel导出字典值转换方法由于内部调用缓存不生效问题 Merge pull request !241 from MichelleChung/dev

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java |   41 +++++++++++++++++++++++++----------------
 1 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
index 87b3c88..1bad680 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
@@ -1,8 +1,8 @@
 package com.ruoyi.system.service;
 
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysDictType;
-import com.ruoyi.common.core.page.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 import java.util.List;
@@ -10,12 +10,12 @@
 /**
  * 瀛楀吀 涓氬姟灞�
  *
- * @author ruoyi
+ * @author Lion Li
  */
-public interface ISysDictTypeService extends IServicePlus<SysDictType> {
+public interface ISysDictTypeService {
 
 
-    TableDataInfo<SysDictType> selectPageDictTypeList(SysDictType dictType);
+    TableDataInfo<SysDictType> selectPageDictTypeList(SysDictType dictType, PageQuery pageQuery);
 
     /**
      * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀绫诲瀷
@@ -23,14 +23,14 @@
      * @param dictType 瀛楀吀绫诲瀷淇℃伅
      * @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅
      */
-    public List<SysDictType> selectDictTypeList(SysDictType dictType);
+    List<SysDictType> selectDictTypeList(SysDictType dictType);
 
     /**
      * 鏍规嵁鎵�鏈夊瓧鍏哥被鍨�
      *
      * @return 瀛楀吀绫诲瀷闆嗗悎淇℃伅
      */
-    public List<SysDictType> selectDictTypeAll();
+    List<SysDictType> selectDictTypeAll();
 
     /**
      * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁
@@ -38,7 +38,7 @@
      * @param dictType 瀛楀吀绫诲瀷
      * @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅
      */
-    public List<SysDictData> selectDictDataByType(String dictType);
+    List<SysDictData> selectDictDataByType(String dictType);
 
     /**
      * 鏍规嵁瀛楀吀绫诲瀷ID鏌ヨ淇℃伅
@@ -46,7 +46,7 @@
      * @param dictId 瀛楀吀绫诲瀷ID
      * @return 瀛楀吀绫诲瀷
      */
-    public SysDictType selectDictTypeById(Long dictId);
+    SysDictType selectDictTypeById(Long dictId);
 
     /**
      * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ淇℃伅
@@ -54,20 +54,29 @@
      * @param dictType 瀛楀吀绫诲瀷
      * @return 瀛楀吀绫诲瀷
      */
-    public SysDictType selectDictTypeByType(String dictType);
+    SysDictType selectDictTypeByType(String dictType);
 
     /**
      * 鎵归噺鍒犻櫎瀛楀吀淇℃伅
      *
      * @param dictIds 闇�瑕佸垹闄ょ殑瀛楀吀ID
-     * @return 缁撴灉
      */
-    public int deleteDictTypeByIds(Long[] dictIds);
+    void deleteDictTypeByIds(Long[] dictIds);
 
     /**
-     * 娓呯┖缂撳瓨鏁版嵁
+     * 鍔犺浇瀛楀吀缂撳瓨鏁版嵁
      */
-    public void clearCache();
+    void loadingDictCache();
+
+    /**
+     * 娓呯┖瀛楀吀缂撳瓨鏁版嵁
+     */
+    void clearDictCache();
+
+    /**
+     * 閲嶇疆瀛楀吀缂撳瓨鏁版嵁
+     */
+    void resetDictCache();
 
     /**
      * 鏂板淇濆瓨瀛楀吀绫诲瀷淇℃伅
@@ -75,7 +84,7 @@
      * @param dictType 瀛楀吀绫诲瀷淇℃伅
      * @return 缁撴灉
      */
-    public int insertDictType(SysDictType dictType);
+    List<SysDictData> insertDictType(SysDictType dictType);
 
     /**
      * 淇敼淇濆瓨瀛楀吀绫诲瀷淇℃伅
@@ -83,7 +92,7 @@
      * @param dictType 瀛楀吀绫诲瀷淇℃伅
      * @return 缁撴灉
      */
-    public int updateDictType(SysDictType dictType);
+    List<SysDictData> updateDictType(SysDictType dictType);
 
     /**
      * 鏍¢獙瀛楀吀绫诲瀷绉版槸鍚﹀敮涓�
@@ -91,5 +100,5 @@
      * @param dictType 瀛楀吀绫诲瀷
      * @return 缁撴灉
      */
-    public String checkDictTypeUnique(SysDictType dictType);
+    String checkDictTypeUnique(SysDictType dictType);
 }

--
Gitblit v1.9.3