From d0b21665257834616240a85f90707651f9e03680 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 28 五月 2021 10:07:15 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 80 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
index 87acff4..04e6616 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -33,6 +33,9 @@
@Service
public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService {
+ @Autowired
+ private SysDictTypeMapper dictTypeMapper;
+
@Autowired
private SysDictDataMapper dictDataMapper;
@@ -41,15 +44,7 @@
*/
@PostConstruct
public void init() {
- List<SysDictType> dictTypeList = list();
- for (SysDictType dictType : dictTypeList) {
- List<SysDictData> dictDatas = dictDataMapper.selectList(
- new LambdaQueryWrapper<SysDictData>()
- .eq(SysDictData::getStatus, 0)
- .eq(SysDictData::getDictType, dictType.getDictType())
- .orderByAsc(SysDictData::getDictSort));
- DictUtils.setDictCache(dictType.getDictType(), dictDatas);
- }
+ loadingDictCache();
}
@Override
@@ -151,60 +146,81 @@
* @return 缁撴灉
*/
@Override
- public int deleteDictTypeByIds(Long[] dictIds) {
+ public void deleteDictTypeByIds(Long[] dictIds) {
for (Long dictId : dictIds) {
SysDictType dictType = selectDictTypeById(dictId);
if (dictDataMapper.selectCount(new LambdaQueryWrapper<SysDictData>()
.eq(SysDictData::getDictType, dictType.getDictType())) > 0) {
throw new CustomException(String.format("%1$s宸插垎閰�,涓嶈兘鍒犻櫎", dictType.getDictName()));
}
+ dictTypeMapper.deleteDictTypeById(dictId);
+ DictUtils.removeDictCache(dictType.getDictType());
}
- int count = baseMapper.deleteBatchIds(Arrays.asList(dictIds));
- if (count > 0) {
- DictUtils.clearDictCache();
- }
- return count;
}
/**
- * 娓呯┖缂撳瓨鏁版嵁
+ * 鍔犺浇瀛楀吀缂撳瓨鏁版嵁
*/
- @Override
- public void clearCache() {
+ public void loadingDictCache()
+ {
+ List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll();
+ for (SysDictType dictType : dictTypeList)
+ {
+ List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
+ DictUtils.setDictCache(dictType.getDictType(), dictDatas);
+ }
+ }
+
+ /**
+ * 娓呯┖瀛楀吀缂撳瓨鏁版嵁
+ */
+ public void clearDictCache()
+ {
DictUtils.clearDictCache();
+ }
+
+ /**
+ * 閲嶇疆瀛楀吀缂撳瓨鏁版嵁
+ */
+ public void resetDictCache()
+ {
+ clearDictCache();
+ loadingDictCache();
}
/**
* 鏂板淇濆瓨瀛楀吀绫诲瀷淇℃伅
*
- * @param dictType 瀛楀吀绫诲瀷淇℃伅
+ * @param dict 瀛楀吀绫诲瀷淇℃伅
* @return 缁撴灉
*/
@Override
- public int insertDictType(SysDictType dictType) {
- int row = baseMapper.insert(dictType);
+ public int insertDictType(SysDictType dict) {
+ int row = baseMapper.insert(dict);
if (row > 0) {
- DictUtils.clearDictCache();
+ DictUtils.setDictCache(dict.getDictType(), null);
}
return row;
}
/**
* 淇敼淇濆瓨瀛楀吀绫诲瀷淇℃伅
- *
- * @param dictType 瀛楀吀绫诲瀷淇℃伅
+ * @param dict 瀛楀吀绫诲瀷淇℃伅
* @return 缁撴灉
*/
@Override
@Transactional
- public int updateDictType(SysDictType dictType) {
- SysDictType oldDict = getById(dictType.getDictId());
- dictDataMapper.update(null, new LambdaUpdateWrapper<SysDictData>()
- .set(SysDictData::getDictType, dictType.getDictType())
- .eq(SysDictData::getDictType, oldDict.getDictType()));
- int row = baseMapper.updateById(dictType);
- if (row > 0) {
- DictUtils.clearDictCache();
+ public int updateDictType(SysDictType dict)
+ {
+ SysDictType oldDict = getById(dict.getDictId());
+ dictDataMapper.update(null, new LambdaUpdateWrapper<SysDictData>()
+ .set(SysDictData::getDictType, dict.getDictType())
+ .eq(SysDictData::getDictType, oldDict.getDictType()));
+ int row = baseMapper.updateById(dict);
+ if (row > 0)
+ {
+ List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
+ DictUtils.setDictCache(dict.getDictType(), dictDatas);
}
return row;
}
--
Gitblit v1.9.3