Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

增加字典对Reslt中List的支持 #5962

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

增加字典对Reslt中List的支持 #5962

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void excudeService() {

@Around("excudeService()")
public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
long time1=System.currentTimeMillis();
long time1=System.currentTimeMillis();
Object result = pjp.proceed();
long time2=System.currentTimeMillis();
log.debug("获取JSON数据 耗时："+(time2-time1)+"ms");
Expand Down Expand Up @@ -93,15 +93,22 @@ public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
*/
private Object parseDictText(Object result) {
if (result instanceof Result) {
if (((Result) result).getResult() instanceof IPage) {
if (((Result) result).getResult() instanceof IPage || ((Result) result).getResult() instanceof List) {
List<JSONObject> items = new ArrayList<>();

//step.1 筛选出加了 Dict 注解的字段列表
List<Field> dictFieldList = new ArrayList<>();
// 字典数据列表， key = 字典code，value=数据列表
Map<String, List<String>> dataListMap = new HashMap<>(5);
//取出结果集
List<Object> records=((IPage) ((Result) result).getResult()).getRecords();
List<Object> records= null;

if (((Result) result).getResult() instanceof List) {
records= (List<Object>) ((Result) result).getResult();
} else {
records= ((IPage) ((Result) result).getResult()).getRecords();
}

//update-begin--Author:zyf -- Date:20220606 ----for：【VUEN-1230】 判断是否含有字典注解,没有注解返回-----
Boolean hasDict= checkHasDict(records);
if(!hasDict){
Expand Down Expand Up @@ -206,7 +213,14 @@ private Object parseDictText(Object result) {
}
}

((IPage) ((Result) result).getResult()).setRecords(items);

//List 处理
if (((Result) result).getResult() instanceof List) {
((Result) result).setResult(items);
} else {
((IPage) ((Result) result).getResult()).setRecords(items);
}

}

}
Expand Down Expand Up @@ -293,13 +307,13 @@ private Map<String, List<DictModel>> translateAllDict(Map<String, List<String>>
log.debug("translateDictFromTableByKeys.dictCode:" + dictCode);
log.debug("translateDictFromTableByKeys.values:" + values);
//update-begin---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------

//update-begin---author:wangshuai---date:2024-01-09---for:微服务下为空报错没有参数需要传递空字符串---
if(null == dataSource){
dataSource = "";
}
//update-end---author:wangshuai---date:2024-01-09---for:微服务下为空报错没有参数需要传递空字符串---

List<DictModel> texts = commonApi.translateDictFromTableByKeys(table, text, code, values, dataSource);
//update-end---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------
log.debug("translateDictFromTableByKeys.result:" + texts);
Expand Down Expand Up @@ -386,9 +400,9 @@ private String translDictText(List<DictModel> dictModels, String values) {
*/
@Deprecated
private String translateDictValue(String code, String text, String table, String key) {
if(oConvertUtils.isEmpty(key)) {
return null;
}
if(oConvertUtils.isEmpty(key)) {
return null;
}
StringBuffer textValue=new StringBuffer();
String[] keys = key.split(",");
for (String k : keys) {
Expand All @@ -401,7 +415,7 @@ private String translateDictValue(String code, String text, String table, String
if (!StringUtils.isEmpty(table)){
log.debug("--DictAspect------dicTable="+ table+" ,dicText= "+text+" ,dicCode="+code);
String keyString = String.format("sys:cache:dictTable::SimpleKey [%s,%s,%s,%s]",table,text,code,k.trim());
if (redisTemplate.hasKey(keyString)){
if (redisTemplate.hasKey(keyString)){
try {
tmpValue = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString));
} catch (Exception e) {
Expand All @@ -416,7 +430,7 @@ private String translateDictValue(String code, String text, String table, String
try {
tmpValue = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString));
} catch (Exception e) {
log.warn(e.getMessage());
log.warn(e.getMessage());
}
}else {
tmpValue = commonApi.translateDict(code, k.trim());
Expand Down