From 7b3ff5b7c7bc669a3da292728c3a647de4fdac4f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 21 一月 2025 14:46:34 +0800
Subject: [PATCH] 修改流程 增加字典深度翻译 增加List翻译
---
lxzn-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java | 65 ++++++--------------------------
1 files changed, 12 insertions(+), 53 deletions(-)
diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java b/lxzn-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java
index bbf19f1..a4ed593 100644
--- a/lxzn-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java
@@ -94,6 +94,12 @@
private Object parseDictText(Object result) {
if (result instanceof Result) {
if (((Result) result).getResult() instanceof IPage) {
+ List<JSONObject> items = new ArrayList<>();
+
+ //step.1 绛涢�夊嚭鍔犱簡 Dict 娉ㄨВ鐨勫瓧娈靛垪琛�
+ List<Field> dictFieldList = new ArrayList<>();
+ // 瀛楀吀鏁版嵁鍒楄〃锛� key = 瀛楀吀code锛寁alue=鏁版嵁鍒楄〃
+ Map<String, List<String>> dataListMap = new HashMap<>(5);
//鍙栧嚭缁撴灉闆�
List<Object> records=((IPage) ((Result) result).getResult()).getRecords();
//update-begin--Author:zyf -- Date:20220606 ----for锛氥�怴UEN-1230銆� 鍒ゆ柇鏄惁鍚湁瀛楀吀娉ㄨВ,娌℃湁娉ㄨВ杩斿洖-----
@@ -101,58 +107,6 @@
if(!hasDict){
return result;
}
- List<JSONObject> dictText = getDictText(records);
- ((IPage) ((Result) result).getResult()).setRecords(dictText);
- }
- else {
- //鍙栧嚭缁撴灉闆�
- Object object= (Object) ((Result) result).getResult();
- Class<?> aClass = ((Result) result).getResult().getClass();
- if ("java.util.HashMap".equals(aClass.getName())){
- //灏唌ap杞崲涓洪泦鍚堝湪杞崲涓簃ap
- Map<String, Object> mapset = new HashMap<>();
- Map<String,Object> map= (Map<String,Object>) object;
- for (String s : map.keySet()) {
- Object a1 = map.get(s);
- List<Object> records=new ArrayList<>();
- Class<?> aClass1 = a1.getClass();
- if ("java.util.ArrayList".equals(aClass1.getName())){
- records = (ArrayList)map.get(s);
- }else{
- records = oConvertUtils.castList(a1, Object.class);
- }
- Boolean hasDict= checkHasDict(records);
- if(!hasDict){
- return result;
- }
- List<JSONObject> dictText = getDictText(records);
- mapset.put(s,dictText);
- }
- ((Result) result).setResult(mapset);
- }else {
- List<Object> records = oConvertUtils.castList(object, Object.class);
- //update-begin--Author:zyf -- Date:20220606 ----for锛氥�怴UEN-1230銆� 鍒ゆ柇鏄惁鍚湁瀛楀吀娉ㄨВ,娌℃湁娉ㄨВ杩斿洖-----
- Boolean hasDict= checkHasDict(records);
- if(!hasDict){
- return result;
- }
- List<JSONObject> dictText = getDictText(records);
- ((Result) result).setResult(dictText);
- }
- }
- }
- return result;
- }
- /**
- 浼犲叆闆嗗悎 缈昏瘧瀛楀吀鍊�
- **/
- private List<JSONObject> getDictText(List<Object> records){
- List<JSONObject> items = new ArrayList<>();
- //step.1 绛涢�夊嚭鍔犱簡 Dict 娉ㄨВ鐨勫瓧娈靛垪琛�
- List<Field> dictFieldList = new ArrayList<>();
- // 瀛楀吀鏁版嵁鍒楄〃锛� key = 瀛楀吀code锛寁alue=鏁版嵁鍒楄〃
- Map<String, List<String>> dataListMap = new HashMap<>(5);
-
log.debug(" __ 杩涘叆瀛楀吀缈昏瘧鍒囬潰 DictAspect 鈥斺�� " );
//update-end--Author:zyf -- Date:20220606 ----for锛氥�怴UEN-1230銆� 鍒ゆ柇鏄惁鍚湁瀛楀吀娉ㄨВ,娌℃湁娉ㄨВ杩斿洖-----
@@ -242,7 +196,12 @@
}
}
}
- return items;
+
+ ((IPage) ((Result) result).getResult()).setRecords(items);
+ }
+
+ }
+ return result;
}
/**
--
Gitblit v1.9.3