KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】DictAspect文件

Browse Source
This commit is contained in:
梁琦涛
2023-03-09 17:34:44 +08:00
parent e1d72f68c0
commit da8f67f10b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java
+9 -7
View File
@@ -13,6 +13,7 @@ import com.jero.common.constant.CommonConstant;
import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.DictModel;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
@@ -143,8 +144,8 @@ public class DictAspect {
} }
} }
private void addItems(Result result, List<JSONObject> items, List<Field> dictFieldList, Map<String, List<String>> dataListMap) { private void addItems(Result<IPage<T>> result, List<JSONObject> items, List<Field> dictFieldList, Map<String, List<String>> dataListMap) {
for (Object obj : ((IPage) result.getResult()).getRecords()) { for (Object obj : result.getResult().getRecords()) {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
String json="{}"; String json="{}";
try { try {
@@ -155,7 +156,6 @@ public class DictAspect {
} }
JSONObject item = JSON.parseObject(json); JSONObject item = JSON.parseObject(json);
//update-begin--Author:scott -- Date:20190603 ----for：解决继承实体字段无法翻译问题------ //update-begin--Author:scott -- Date:20190603 ----for：解决继承实体字段无法翻译问题------
//for (Field field : record.getClass().getDeclaredFields()) {
// 遍历所有字段，把字典Code取出来，放到 map 里 // 遍历所有字段，把字典Code取出来，放到 map 里
putItem(dictFieldList, dataListMap, obj, item); putItem(dictFieldList, dataListMap, obj, item);
items.add(item); items.add(item);
@@ -215,8 +215,9 @@ public class DictAspect {
// 需要翻译的数据（有些可以从redis缓存中获取，就不走数据库查询） // 需要翻译的数据（有些可以从redis缓存中获取，就不走数据库查询）
List<String> needTranslData = new ArrayList<>(); List<String> needTranslData = new ArrayList<>();
//step.1 先通过redis中获取缓存字典数据 //step.1 先通过redis中获取缓存字典数据
for (String dictCode : dataListMap.keySet()) { for (Map.Entry<String, List<String>> entry : dataListMap.entrySet()) {
List<String> dataList = dataListMap.get(dictCode); String dictCode = entry.getKey();
List<String> dataList = entry.getValue();
if (dataList.isEmpty()) { if (dataList.isEmpty()) {
continue; continue;
} }
@@ -252,9 +253,10 @@ public class DictAspect {
log.info("translateManyDict.values:" + values); log.info("translateManyDict.values:" + values);
Map<String, List<DictModel>> manyDict = commonAPI.translateManyDict(dictCodes, values); Map<String, List<DictModel>> manyDict = commonAPI.translateManyDict(dictCodes, values);
log.info("translateManyDict.result:" + manyDict); log.info("translateManyDict.result:" + manyDict);
for (String dictCode : manyDict.keySet()) { for (Map.Entry<String, List<DictModel>> entry : manyDict.entrySet()) {
String dictCode = entry.getKey();
List<DictModel> list = translText.computeIfAbsent(dictCode, k -> new ArrayList<>()); List<DictModel> list = translText.computeIfAbsent(dictCode, k -> new ArrayList<>());
List<DictModel> newList = manyDict.get(dictCode); List<DictModel> newList = entry.getValue();
list.addAll(newList); list.addAll(newList);
// 做 redis 缓存 // 做 redis 缓存