From b8e55b8d169a1c689cf9c0e265a70fd6770d80ab Mon Sep 17 00:00:00 2001
From: yawu_bear <yawu_bear@163.com>
Date: Fri, 10 Aug 2018 17:16:59 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BC=93=E5=AD=98=E5=88=B7=E6=96=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a743ce4
---
 .../com/ruoyi/common/utils/DictUtils.java     | 33 -------------------
 .../dict/service/DictDataServiceImpl.java     | 24 ++++++++------
 2 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/utils/DictUtils.java b/src/main/java/com/ruoyi/common/utils/DictUtils.java
index bf656203c..5a76d2ac8 100644
--- a/src/main/java/com/ruoyi/common/utils/DictUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/DictUtils.java
@@ -55,37 +55,4 @@ public class DictUtils {
         }
         return dictList;
     }
-
-    /**
-     * 增删改字典缓存刷新
-     *
-     * @param dictType
-     * @param row
-     */
-    public static void flushDictList(String dictType, int row) {
-        if (row > 0) {
-            // 增删改成功修改缓存信息
-            List<DictData> dictList = dictDataMapper.selectDictDataByType(dictType);
-            CacheUtils.remove(DictUtils.DICT_CACHE, DictUtils.DICT_CACHE_TYPE + dictType);
-            CacheUtils.put(DictUtils.DICT_CACHE, DictUtils.DICT_CACHE_TYPE + dictType, dictList);
-        }
-    }
-
-    /**
-     * 缓存重置
-     *
-     * @param row
-     */
-    public static void restAllDictList(int row) {
-        if (row > 0) {
-            // 增删改成功修改缓存信息
-            List<DictData> dictList = dictDataMapper.selectDictDataList(new DictData());
-            if (StringUtils.isNotEmpty(dictList)) {
-                for (DictData dictData : dictList) {
-                    CacheUtils.removeAll(DictUtils.DICT_CACHE);
-                    CacheUtils.put(DictUtils.DICT_CACHE, DictUtils.DICT_CACHE_TYPE + dictData.getDictType(), dictList);
-                }
-            }
-        }
-    }
 }
diff --git a/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java b/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java
index 789ef8bf8..ea4b42e7e 100644
--- a/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java
@@ -82,11 +82,7 @@ public class DictDataServiceImpl implements IDictDataService
     @Override
     public int deleteDictDataById(Long dictCode)
     {
-        DictData dictData = dictDataMapper.selectDictDataById(dictCode);
-        String dictType = dictData.getDictType();
-        int row = dictDataMapper.deleteDictDataById(dictCode);
-        DictUtils.flushDictList(dictType, row);
-        return row;
+        return dictDataMapper.deleteDictDataById(dictCode);
     }
 
     /**
@@ -98,9 +94,7 @@ public class DictDataServiceImpl implements IDictDataService
     @Override
     public int deleteDictDataByIds(String ids)
     {
-        int row = dictDataMapper.deleteDictDataByIds(Convert.toStrArray(ids));
-        DictUtils.restAllDictList(row);
-        return row;
+        return dictDataMapper.deleteDictDataByIds(Convert.toStrArray(ids));
     }
 
     /**
@@ -115,7 +109,12 @@ public class DictDataServiceImpl implements IDictDataService
         dictData.setCreateBy(ShiroUtils.getLoginName());
         String dictType = dictData.getDictType();
         int row = dictDataMapper.insertDictData(dictData);
-        DictUtils.flushDictList(dictType, row);
+        if(row > 0) {
+            // 新增成功修改缓存信息
+            List<DictData> dictList = dictDataMapper.selectDictDataByType(dictType);
+            CacheUtils.remove(DictUtils.DICT_CACHE, DictUtils.DICT_CACHE_TYPE + dictType);
+            CacheUtils.put(DictUtils.DICT_CACHE, DictUtils.DICT_CACHE_TYPE + dictType, dictList);
+        }
         return row;
     }
 
@@ -131,7 +130,12 @@ public class DictDataServiceImpl implements IDictDataService
         dictData.setUpdateBy(ShiroUtils.getLoginName());
         String dictType = dictData.getDictType();
         int row = dictDataMapper.updateDictData(dictData);
-        DictUtils.flushDictList(dictType, row);
+        if(row > 0) {
+            List<DictData> dictList = dictDataMapper.selectDictDataByType(dictType);
+            // 修改成功更新缓存信息
+            CacheUtils.remove(DictUtils.DICT_CACHE, DictUtils.DICT_CACHE_TYPE + dictType);
+            CacheUtils.put(DictUtils.DICT_CACHE, DictUtils.DICT_CACHE_TYPE + dictType, dictList);
+        }
         return row;
     }