update 优化 字典转换实现 去除字符串查找拼接优化效率

This commit is contained in:
疯狂的狮子li 2022-11-24 10:38:24 +08:00
parent fe8db721d7
commit 5d043078b2

View File

@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl; package com.ruoyi.system.service.impl;
import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.SaHolder;
import cn.hutool.core.collection.CollStreamUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -29,6 +30,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* 字典 业务层处理 * 字典 业务层处理
@ -236,7 +238,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
@SuppressWarnings("unchecked cast") @SuppressWarnings("unchecked cast")
@Override @Override
public String getDictLabel(String dictType, String dictValue, String separator) { public String getDictLabel(String dictType, String dictValue, String separator) {
StringBuilder propertyString = new StringBuilder();
// 优先从本地缓存获取 // 优先从本地缓存获取
List<SysDictData> datas = (List<SysDictData>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType); List<SysDictData> datas = (List<SysDictData>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
if (ObjectUtil.isNull(datas)) { if (ObjectUtil.isNull(datas)) {
@ -244,24 +245,15 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas); SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas);
} }
if (StringUtils.containsAny(dictValue, separator) && CollUtil.isNotEmpty(datas)) { Map<String, String> map = CollStreamUtil.toMap(datas, SysDictData::getDictValue, SysDictData::getDictLabel);
for (SysDictData dict : datas) { if (StringUtils.containsAny(dictValue, separator)) {
for (String value : dictValue.split(separator)) { return Arrays.stream(dictValue.split(separator))
if (value.equals(dict.getDictValue())) { .map(v -> map.getOrDefault(v, StringUtils.EMPTY))
propertyString.append(dict.getDictLabel()).append(separator); .collect(Collectors.joining(separator));
break;
}
}
}
} else { } else {
for (SysDictData dict : datas) { return map.getOrDefault(dictValue, StringUtils.EMPTY);
if (dictValue.equals(dict.getDictValue())) {
return dict.getDictLabel();
} }
} }
}
return StringUtils.stripEnd(propertyString.toString(), separator);
}
/** /**
* 根据字典类型和字典标签获取字典值 * 根据字典类型和字典标签获取字典值
@ -274,7 +266,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
@SuppressWarnings("unchecked cast") @SuppressWarnings("unchecked cast")
@Override @Override
public String getDictValue(String dictType, String dictLabel, String separator) { public String getDictValue(String dictType, String dictLabel, String separator) {
StringBuilder propertyString = new StringBuilder();
// 优先从本地缓存获取 // 优先从本地缓存获取
List<SysDictData> datas = (List<SysDictData>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType); List<SysDictData> datas = (List<SysDictData>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
if (ObjectUtil.isNull(datas)) { if (ObjectUtil.isNull(datas)) {
@ -282,23 +273,14 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas); SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas);
} }
if (StringUtils.containsAny(dictLabel, separator) && CollUtil.isNotEmpty(datas)) { Map<String, String> map = CollStreamUtil.toMap(datas, SysDictData::getDictLabel, SysDictData::getDictValue);
for (SysDictData dict : datas) { if (StringUtils.containsAny(dictLabel, separator)) {
for (String label : dictLabel.split(separator)) { return Arrays.stream(dictLabel.split(separator))
if (label.equals(dict.getDictLabel())) { .map(l -> map.getOrDefault(l, StringUtils.EMPTY))
propertyString.append(dict.getDictValue()).append(separator); .collect(Collectors.joining(separator));
break;
}
}
}
} else { } else {
for (SysDictData dict : datas) { return map.getOrDefault(dictLabel, StringUtils.EMPTY);
if (dictLabel.equals(dict.getDictLabel())) {
return dict.getDictValue();
} }
} }
}
return StringUtils.stripEnd(propertyString.toString(), separator);
}
} }