wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update 优化参数&字典缓存操作

This commit is contained in:
疯狂的狮子li 2021-05-28 10:30:11 +08:00
parent 8d6c9e116d
commit 7779cbca4d
4 changed files with 454 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
View File

@ -1,8 +1,11 @@
package com.ruoyi.system.mapper; package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.BaseMapperPlus; import com.ruoyi.common.core.page.BaseMapperPlus;
import java.util.List;
/** /**
* 字典表 数据层 * 字典表 数据层
* *
@ -10,4 +13,11 @@ import com.ruoyi.common.core.page.BaseMapperPlus;
*/ */
public interface SysDictDataMapper extends BaseMapperPlus<SysDictData> { public interface SysDictDataMapper extends BaseMapperPlus<SysDictData> {
default List<SysDictData> selectDictDataByType(String dictType) {
return selectList(
new LambdaQueryWrapper<SysDictData>()
.eq(SysDictData::getStatus, "0")
.eq(SysDictData::getDictType, dictType)
.orderByAsc(SysDictData::getDictSort));
}
} }

17
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
View File

@ -20,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -161,7 +160,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
if (StrUtil.equals(UserConstants.YES, config.getConfigType())) { if (StrUtil.equals(UserConstants.YES, config.getConfigType())) {
throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey())); throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
} }
configMapper.deleteConfigById(configId); configMapper.deleteById(configId);
redisCache.deleteObject(getCacheKey(config.getConfigKey())); redisCache.deleteObject(getCacheKey(config.getConfigKey()));
} }
} }
@ -170,11 +169,9 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
* 加载参数缓存数据 * 加载参数缓存数据
*/ */
@Override @Override
public void loadingConfigCache() public void loadingConfigCache() {
{ List<SysConfig> configsList = selectConfigList(new SysConfig());
List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig()); for (SysConfig config : configsList) {
for (SysConfig config : configsList)
{
redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
} }
} }
@ -183,8 +180,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
* 清空参数缓存数据 * 清空参数缓存数据
*/ */
@Override @Override
public void clearConfigCache() public void clearConfigCache() {
{
Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*"); Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
redisCache.deleteObject(keys); redisCache.deleteObject(keys);
} }
@ -193,8 +189,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
* 重置参数缓存数据 * 重置参数缓存数据
*/ */
@Override @Override
public void resetConfigCache() public void resetConfigCache() {
{
clearConfigCache(); clearConfigCache();
loadingConfigCache(); loadingConfigCache();
} }

30
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
View File

@ -11,7 +11,6 @@ import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictDataService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
@ -22,9 +21,6 @@ import java.util.List;
@Service @Service
public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService { public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService {
@Autowired
private SysDictDataMapper dictDataMapper;
@Override @Override
public TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData) { public TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData) {
LambdaQueryWrapper<SysDictData> lqw = new LambdaQueryWrapper<SysDictData>() LambdaQueryWrapper<SysDictData> lqw = new LambdaQueryWrapper<SysDictData>()
@ -84,13 +80,11 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
* @return 结果 * @return 结果
*/ */
@Override @Override
public void deleteDictDataByIds(Long[] dictCodes) public void deleteDictDataByIds(Long[] dictCodes) {
{ for (Long dictCode : dictCodes) {
for (Long dictCode : dictCodes)
{
SysDictData data = selectDictDataById(dictCode); SysDictData data = selectDictDataById(dictCode);
dictDataMapper.deleteDictDataById(dictCode); baseMapper.deleteById(dictCode);
List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType());
DictUtils.setDictCache(data.getDictType(), dictDatas); DictUtils.setDictCache(data.getDictType(), dictDatas);
} }
} }
@ -102,12 +96,10 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertDictData(SysDictData data) public int insertDictData(SysDictData data) {
{
int row = baseMapper.insert(data); int row = baseMapper.insert(data);
if (row > 0) if (row > 0) {
{ List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType());
List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
DictUtils.setDictCache(data.getDictType(), dictDatas); DictUtils.setDictCache(data.getDictType(), dictDatas);
} }
return row; return row;
@ -120,12 +112,10 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateDictData(SysDictData data) public int updateDictData(SysDictData data) {
{
int row = baseMapper.updateById(data); int row = baseMapper.updateById(data);
if (row > 0) if (row > 0) {
{ List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType());
List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
DictUtils.setDictCache(data.getDictType(), dictDatas); DictUtils.setDictCache(data.getDictType(), dictDatas);
} }
return row; return row;

32
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
View File

@ -21,7 +21,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -106,10 +105,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
if (CollUtil.isNotEmpty(dictDatas)) { if (CollUtil.isNotEmpty(dictDatas)) {
return dictDatas; return dictDatas;
} }
dictDatas = dictDataMapper.selectList(new LambdaQueryWrapper<SysDictData>() dictDatas = dictDataMapper.selectDictDataByType(dictType);
.eq(SysDictData::getStatus, 0)
.eq(SysDictData::getDictType, dictType)
.orderByAsc(SysDictData::getDictSort));
if (CollUtil.isNotEmpty(dictDatas)) { if (CollUtil.isNotEmpty(dictDatas)) {
DictUtils.setDictCache(dictType, dictDatas); DictUtils.setDictCache(dictType, dictDatas);
return dictDatas; return dictDatas;
@ -153,7 +149,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
.eq(SysDictData::getDictType, dictType.getDictType())) > 0) { .eq(SysDictData::getDictType, dictType.getDictType())) > 0) {
throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName())); throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
} }
dictTypeMapper.deleteDictTypeById(dictId); dictTypeMapper.deleteById(dictId);
DictUtils.removeDictCache(dictType.getDictType()); DictUtils.removeDictCache(dictType.getDictType());
} }
} }
@ -161,11 +157,10 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
/** /**
* 加载字典缓存数据 * 加载字典缓存数据
*/ */
public void loadingDictCache() @Override
{ public void loadingDictCache() {
List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll(); List<SysDictType> dictTypeList = list();
for (SysDictType dictType : dictTypeList) for (SysDictType dictType : dictTypeList) {
{
List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType()); List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
DictUtils.setDictCache(dictType.getDictType(), dictDatas); DictUtils.setDictCache(dictType.getDictType(), dictDatas);
} }
@ -174,16 +169,16 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
/** /**
* 清空字典缓存数据 * 清空字典缓存数据
*/ */
public void clearDictCache() @Override
{ public void clearDictCache() {
DictUtils.clearDictCache(); DictUtils.clearDictCache();
} }
/** /**
* 重置字典缓存数据 * 重置字典缓存数据
*/ */
public void resetDictCache() @Override
{ public void resetDictCache() {
clearDictCache(); clearDictCache();
loadingDictCache(); loadingDictCache();
} }
@ -205,20 +200,19 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
/** /**
* 修改保存字典类型信息 * 修改保存字典类型信息
*
* @param dict 字典类型信息 * @param dict 字典类型信息
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int updateDictType(SysDictType dict) public int updateDictType(SysDictType dict) {
{
SysDictType oldDict = getById(dict.getDictId()); SysDictType oldDict = getById(dict.getDictId());
dictDataMapper.update(null, new LambdaUpdateWrapper<SysDictData>() dictDataMapper.update(null, new LambdaUpdateWrapper<SysDictData>()
.set(SysDictData::getDictType, dict.getDictType()) .set(SysDictData::getDictType, dict.getDictType())
.eq(SysDictData::getDictType, oldDict.getDictType())); .eq(SysDictData::getDictType, oldDict.getDictType()));
int row = baseMapper.updateById(dict); int row = baseMapper.updateById(dict);
if (row > 0) if (row > 0) {
{
List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType()); List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
DictUtils.setDictCache(dict.getDictType(), dictDatas); DictUtils.setDictCache(dict.getDictType(), dictDatas);
} }