ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "批量删除字典缓存刷新" 

This reverts commit a743ce4
This commit is contained in:
yawu_bear 2018-08-10 17:16:59 +08:00
parent a743ce4bfb
commit b8e55b8d16
2 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/ruoyi/common/utils/DictUtils.java
View File

@ -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);
}
}
}
}
}

24
src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java
View File

@ -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;
}