From 9cbd8c9b66776f427b260902ad5fbb7301794d2c Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 20 一月 2025 11:57:49 +0800
Subject: [PATCH] 新增字典翻译返回值List，新增DictList深度翻译
---
lxzn-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/DictList.java | 16 ++
lxzn-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java | 65 ++++++----
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDocInfoService.java | 2
lxzn-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java | 241 +++++++++++++++++++++++----------------
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java | 4
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java | 5
6 files changed, 202 insertions(+), 131 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 c5c2897..bbf19f1 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
@@ -58,7 +58,7 @@
@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");
@@ -70,7 +70,7 @@
}
/**
- * 鏈柟娉曢拡瀵硅繑鍥炲璞′负Result 鐨処Page鐨勫垎椤靛垪琛ㄦ暟鎹繘琛屽姩鎬佸瓧鍏告敞鍏�
+ * 鏈柟娉曢拡瀵硅繑鍥炲璞′负Result 鐨処Page鐨勫垎椤靛垪琛ㄦ暟鎹�丩ist鏁版嵁锛堥泦鍚堥噷闈㈠張濂椾簡涓�灞傞泦鍚堟槸涓嶆敮鎸侊級杩涜鍔ㄦ�佸瓧鍏告敞鍏�
* 瀛楀吀娉ㄥ叆瀹炵幇 閫氳繃瀵瑰疄浣撶被娣诲姞娉ㄨВ@dict 鏉ユ爣璇嗛渶瑕佺殑瀛楀吀鍐呭,瀛楀吀鍒嗕负鍗曞瓧鍏竎ode鍗冲彲 锛宼able瀛楀吀 code table text閰嶅悎浣跨敤涓庡師鏉eecg鐨勭敤娉曠浉鍚�
* 绀轰緥涓篠ysUser 瀛楁涓簊ex 娣诲姞浜嗘敞瑙Dict(dicCode = "sex") 浼氬湪瀛楀吀鏈嶅姟绔嬮┈鏌ュ嚭鏉ュ搴旂殑text 鐒跺悗鍦ㄨ姹俵ist鐨勬椂鍊欏皢杩欎釜瀛楀吀text锛屽凡瀛楁鍚嶇О鍔燺dictText褰㈠紡杩斿洖鍒板墠绔�
* 渚嬭緭鍏ュ綋鍓嶈繑鍥炲�肩殑灏变細澶氬嚭涓�涓猻ex_dictText瀛楁
@@ -94,12 +94,6 @@
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銆� 鍒ゆ柇鏄惁鍚湁瀛楀吀娉ㄨВ,娌℃湁娉ㄨВ杩斿洖-----
@@ -107,102 +101,149 @@
if(!hasDict){
return result;
}
-
- log.debug(" __ 杩涘叆瀛楀吀缈昏瘧鍒囬潰 DictAspect 鈥斺�� " );
- //update-end--Author:zyf -- Date:20220606 ----for锛氥�怴UEN-1230銆� 鍒ゆ柇鏄惁鍚湁瀛楀吀娉ㄨВ,娌℃湁娉ㄨВ杩斿洖-----
- for (Object record : records) {
- String json="{}";
- try {
- //update-begin--Author:zyf -- Date:20220531 ----for锛氥�恑ssues/#3629銆� DictAspect Jackson搴忓垪鍖栨姤閿�-----
- //瑙ｅ喅@JsonFormat娉ㄨВ瑙ｆ瀽涓嶄簡鐨勯棶棰樿瑙丼ysAnnouncement绫荤殑@JsonFormat
- json = objectMapper.writeValueAsString(record);
- //update-end--Author:zyf -- Date:20220531 ----for锛氥�恑ssues/#3629銆� DictAspect Jackson搴忓垪鍖栨姤閿�-----
- } catch (JsonProcessingException e) {
- log.error("json瑙ｆ瀽澶辫触"+e.getMessage(),e);
- }
- //update-begin--Author:scott -- Date:20211223 ----for锛氥�恑ssues/3303銆憆estcontroller杩斿洖json鏁版嵁鍚巏ey椤哄簭閿欎贡 -----
- JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
- //update-end--Author:scott -- Date:20211223 ----for锛氥�恑ssues/3303銆憆estcontroller杩斿洖json鏁版嵁鍚巏ey椤哄簭閿欎贡 -----
-
- //update-begin--Author:scott -- Date:20190603 ----for锛氳В鍐崇户鎵垮疄浣撳瓧娈垫棤娉曠炕璇戦棶棰�------
- //for (Field field : record.getClass().getDeclaredFields()) {
- // 閬嶅巻鎵�鏈夊瓧娈碉紝鎶婂瓧鍏窩ode鍙栧嚭鏉ワ紝鏀惧埌 map 閲�
- for (Field field : oConvertUtils.getAllFields(record)) {
- String value = item.getString(field.getName());
- if (oConvertUtils.isEmpty(value)) {
- continue;
- }
- //update-end--Author:scott -- Date:20190603 ----for锛氳В鍐崇户鎵垮疄浣撳瓧娈垫棤娉曠炕璇戦棶棰�------
- if (field.getAnnotation(Dict.class) != null) {
- if (!dictFieldList.contains(field)) {
- dictFieldList.add(field);
- }
- String code = field.getAnnotation(Dict.class).dicCode();
- String text = field.getAnnotation(Dict.class).dicText();
- String table = field.getAnnotation(Dict.class).dictTable();
-
- List<String> dataList;
- String dictCode = code;
- if (!StringUtils.isEmpty(table)) {
- dictCode = String.format("%s,%s,%s", table, text, code);
- }
- dataList = dataListMap.computeIfAbsent(dictCode, k -> new ArrayList<>());
- this.listAddAllDeduplicate(dataList, Arrays.asList(value.split(",")));
- }
- //date绫诲瀷榛樿杞崲string鏍煎紡鍖栨棩鏈�
- //update-begin--Author:zyf -- Date:20220531 ----for锛氥�恑ssues/#3629銆� DictAspect Jackson搴忓垪鍖栨姤閿�-----
- //if (JAVA_UTIL_DATE.equals(field.getType().getName())&&field.getAnnotation(JsonFormat.class)==null&&item.get(field.getName())!=null){
- //SimpleDateFormat aDate=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- // item.put(field.getName(), aDate.format(new Date((Long) item.get(field.getName()))));
- //}
- //update-end--Author:zyf -- Date:20220531 ----for锛氥�恑ssues/#3629銆� DictAspect Jackson搴忓垪鍖栨姤閿�-----
- }
- items.add(item);
- }
-
- //step.2 璋冪敤缈昏瘧鏂规硶锛屼竴娆℃�х炕璇�
- Map<String, List<DictModel>> translText = this.translateAllDict(dataListMap);
-
- //step.3 灏嗙炕璇戠粨鏋滃～鍏呭埌杩斿洖缁撴灉閲�
- for (JSONObject record : items) {
- for (Field field : dictFieldList) {
- String code = field.getAnnotation(Dict.class).dicCode();
- String text = field.getAnnotation(Dict.class).dicText();
- String table = field.getAnnotation(Dict.class).dictTable();
-
- String fieldDictCode = code;
- if (!StringUtils.isEmpty(table)) {
- fieldDictCode = String.format("%s,%s,%s", table, text, code);
- }
-
- String value = record.getString(field.getName());
- if (oConvertUtils.isNotEmpty(value)) {
- List<DictModel> dictModels = translText.get(fieldDictCode);
- if(dictModels==null || dictModels.size()==0){
- continue;
- }
-
- String textValue = this.translDictText(dictModels, value);
- log.debug(" 瀛楀吀Val : " + textValue);
- log.debug(" __缈昏瘧瀛楀吀瀛楁__ " + field.getName() + CommonConstant.DICT_TEXT_SUFFIX + "锛� " + textValue);
-
- // TODO-sun 娴嬭瘯杈撳嚭锛屽緟鍒�
- log.debug(" ---- dictCode: " + fieldDictCode);
- log.debug(" ---- value: " + value);
- log.debug(" ----- text: " + textValue);
- log.debug(" ---- dictModels: " + JSON.toJSONString(dictModels));
-
- record.put(field.getName() + CommonConstant.DICT_TEXT_SUFFIX, textValue);
- }
- }
- }
-
- ((IPage) ((Result) result).getResult()).setRecords(items);
+ 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銆� 鍒ゆ柇鏄惁鍚湁瀛楀吀娉ㄨВ,娌℃湁娉ㄨВ杩斿洖-----
+ for (Object record : records) {
+ String json="{}";
+ try {
+ //update-begin--Author:zyf -- Date:20220531 ----for锛氥�恑ssues/#3629銆� DictAspect Jackson搴忓垪鍖栨姤閿�-----
+ //瑙ｅ喅@JsonFormat娉ㄨВ瑙ｆ瀽涓嶄簡鐨勯棶棰樿瑙丼ysAnnouncement绫荤殑@JsonFormat
+ json = objectMapper.writeValueAsString(record);
+ //update-end--Author:zyf -- Date:20220531 ----for锛氥�恑ssues/#3629銆� DictAspect Jackson搴忓垪鍖栨姤閿�-----
+ } catch (JsonProcessingException e) {
+ log.error("json瑙ｆ瀽澶辫触"+e.getMessage(),e);
+ }
+ //update-begin--Author:scott -- Date:20211223 ----for锛氥�恑ssues/3303銆憆estcontroller杩斿洖json鏁版嵁鍚巏ey椤哄簭閿欎贡 -----
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ //update-end--Author:scott -- Date:20211223 ----for锛氥�恑ssues/3303銆憆estcontroller杩斿洖json鏁版嵁鍚巏ey椤哄簭閿欎贡 -----
+
+ //update-begin--Author:scott -- Date:20190603 ----for锛氳В鍐崇户鎵垮疄浣撳瓧娈垫棤娉曠炕璇戦棶棰�------
+ //for (Field field : record.getClass().getDeclaredFields()) {
+ // 閬嶅巻鎵�鏈夊瓧娈碉紝鎶婂瓧鍏窩ode鍙栧嚭鏉ワ紝鏀惧埌 map 閲�
+ for (Field field : oConvertUtils.getAllFields(record)) {
+ String value = item.getString(field.getName());
+ if (oConvertUtils.isEmpty(value)) {
+ continue;
+ }
+ //update-end--Author:scott -- Date:20190603 ----for锛氳В鍐崇户鎵垮疄浣撳瓧娈垫棤娉曠炕璇戦棶棰�------
+ if (field.getAnnotation(Dict.class) != null) {
+ if (!dictFieldList.contains(field)) {
+ dictFieldList.add(field);
+ }
+ String code = field.getAnnotation(Dict.class).dicCode();
+ String text = field.getAnnotation(Dict.class).dicText();
+ String table = field.getAnnotation(Dict.class).dictTable();
+
+ List<String> dataList;
+ String dictCode = code;
+ if (!StringUtils.isEmpty(table)) {
+ dictCode = String.format("%s,%s,%s", table, text, code);
+ }
+ dataList = dataListMap.computeIfAbsent(dictCode, k -> new ArrayList<>());
+ this.listAddAllDeduplicate(dataList, Arrays.asList(value.split(",")));
+ }
+ //date绫诲瀷榛樿杞崲string鏍煎紡鍖栨棩鏈�
+ //update-begin--Author:zyf -- Date:20220531 ----for锛氥�恑ssues/#3629銆� DictAspect Jackson搴忓垪鍖栨姤閿�-----
+ //if (JAVA_UTIL_DATE.equals(field.getType().getName())&&field.getAnnotation(JsonFormat.class)==null&&item.get(field.getName())!=null){
+ //SimpleDateFormat aDate=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ // item.put(field.getName(), aDate.format(new Date((Long) item.get(field.getName()))));
+ //}
+ //update-end--Author:zyf -- Date:20220531 ----for锛氥�恑ssues/#3629銆� DictAspect Jackson搴忓垪鍖栨姤閿�-----
+ }
+ items.add(item);
+ }
+
+ //step.2 璋冪敤缈昏瘧鏂规硶锛屼竴娆℃�х炕璇�
+ Map<String, List<DictModel>> translText = this.translateAllDict(dataListMap);
+
+ //step.3 灏嗙炕璇戠粨鏋滃～鍏呭埌杩斿洖缁撴灉閲�
+ for (JSONObject record : items) {
+ for (Field field : dictFieldList) {
+ String code = field.getAnnotation(Dict.class).dicCode();
+ String text = field.getAnnotation(Dict.class).dicText();
+ String table = field.getAnnotation(Dict.class).dictTable();
+
+ String fieldDictCode = code;
+ if (!StringUtils.isEmpty(table)) {
+ fieldDictCode = String.format("%s,%s,%s", table, text, code);
+ }
+
+ String value = record.getString(field.getName());
+ if (oConvertUtils.isNotEmpty(value)) {
+ List<DictModel> dictModels = translText.get(fieldDictCode);
+ if(dictModels==null || dictModels.size()==0){
+ continue;
+ }
+
+ String textValue = this.translDictText(dictModels, value);
+ log.debug(" 瀛楀吀Val : " + textValue);
+ log.debug(" __缈昏瘧瀛楀吀瀛楁__ " + field.getName() + CommonConstant.DICT_TEXT_SUFFIX + "锛� " + textValue);
+
+ // TODO-sun 娴嬭瘯杈撳嚭锛屽緟鍒�
+ log.debug(" ---- dictCode: " + fieldDictCode);
+ log.debug(" ---- value: " + value);
+ log.debug(" ----- text: " + textValue);
+ log.debug(" ---- dictModels: " + JSON.toJSONString(dictModels));
+
+ record.put(field.getName() + CommonConstant.DICT_TEXT_SUFFIX, textValue);
+ }
+ }
+ }
+ return items;
+ }
/**
* list 鍘婚噸娣诲姞
diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/DictList.java b/lxzn-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/DictList.java
new file mode 100644
index 0000000..33b19d3
--- /dev/null
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/DictList.java
@@ -0,0 +1,16 @@
+package org.jeecg.common.aspect.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 绫绘弿杩�: 娣卞害瀛楀吀缈昏瘧娉ㄨВ
+ * 鍙兘鐢ㄦ潵娉ㄨВList绫诲瀷鐨勫睘鎬�
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DictList {
+
+}
diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java b/lxzn-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
index e970ae7..e4496d7 100644
--- a/lxzn-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
@@ -23,7 +23,7 @@
import java.util.regex.Pattern;
/**
- *
+ *
* @Author 寮犱唬娴�
*
*/
@@ -41,7 +41,7 @@
}
return (false);
}
-
+
public static boolean isNotEmpty(Object object) {
if (object != null && !"".equals(object) && !object.equals(CommonConstant.STRING_NULL)) {
return (true);
@@ -166,7 +166,7 @@
return (defval);
}
}
-
+
public static Integer getInt(Object object) {
if (isEmpty(object)) {
return null;
@@ -210,7 +210,7 @@
/*public static String escapeJava(Object s) {
return StringEscapeUtils.escapeJava(getString(s));
}*/
-
+
public static String getString(Object object) {
if (isEmpty(object)) {
return "";
@@ -266,7 +266,7 @@
/**
* 鍒ゆ柇涓�涓被鏄惁涓哄熀鏈暟鎹被鍨嬨��
- *
+ *
* @param clazz
* 瑕佸垽鏂殑绫汇��
* @return true 琛ㄧず涓哄熀鏈暟鎹被鍨嬨��
@@ -334,7 +334,7 @@
/**
* java鍘婚櫎瀛楃涓蹭腑鐨勭┖鏍笺�佸洖杞︺�佹崲琛岀銆佸埗琛ㄧ
- *
+ *
* @param str
* @return
*/
@@ -352,7 +352,7 @@
/**
* 鍒ゆ柇鍏冪礌鏄惁鍦ㄦ暟缁勫唴
- *
+ *
* @param substring
* @param source
* @return
@@ -379,7 +379,7 @@
/**
* SET杞崲MAP
- *
+ *
* @param str
* @return
*/
@@ -424,12 +424,12 @@
private static boolean isInner(long userIp, long begin, long end) {
return (userIp >= begin) && (userIp <= end);
}
-
+
/**
* 灏嗕笅鍒掔嚎澶у啓鏂瑰紡鍛藉悕鐨勫瓧绗︿覆杞崲涓洪┘宄板紡銆�
* 濡傛灉杞崲鍓嶇殑涓嬪垝绾垮ぇ鍐欐柟寮忓懡鍚嶇殑瀛楃涓蹭负绌猴紝鍒欒繑鍥炵┖瀛楃涓层��</br>
* 渚嬪锛歨ello_world->helloWorld
- *
+ *
* @param name
* 杞崲鍓嶇殑涓嬪垝绾垮ぇ鍐欐柟寮忓懡鍚嶇殑瀛楃涓�
* @return 杞崲鍚庣殑椹煎嘲寮忓懡鍚嶇殑瀛楃涓�
@@ -466,12 +466,12 @@
}
return result.toString();
}
-
+
/**
* 灏嗕笅鍒掔嚎澶у啓鏂瑰紡鍛藉悕鐨勫瓧绗︿覆杞崲涓洪┘宄板紡銆�
* 濡傛灉杞崲鍓嶇殑涓嬪垝绾垮ぇ鍐欐柟寮忓懡鍚嶇殑瀛楃涓蹭负绌猴紝鍒欒繑鍥炵┖瀛楃涓层��</br>
* 渚嬪锛歨ello_world,test_id->helloWorld,testId
- *
+ *
* @param name
* 杞崲鍓嶇殑涓嬪垝绾垮ぇ鍐欐柟寮忓懡鍚嶇殑瀛楃涓�
* @return 杞崲鍚庣殑椹煎嘲寮忓懡鍚嶇殑瀛楃涓�
@@ -489,13 +489,13 @@
String result = sf.toString();
return result.substring(0, result.length() - 1);
}
-
+
//update-begin--Author:zhoujf Date:20180503 for锛歍ASK #2500 銆愪唬鐮佺敓鎴愬櫒銆戜唬鐮佺敓鎴愬櫒寮�鍙戜竴閫氱敤妯℃澘鐢熸垚鍔熻兘
/**
* 灏嗕笅鍒掔嚎澶у啓鏂瑰紡鍛藉悕鐨勫瓧绗︿覆杞崲涓洪┘宄板紡銆�(棣栧瓧姣嶅啓)
* 濡傛灉杞崲鍓嶇殑涓嬪垝绾垮ぇ鍐欐柟寮忓懡鍚嶇殑瀛楃涓蹭负绌猴紝鍒欒繑鍥炵┖瀛楃涓层��</br>
* 渚嬪锛歨ello_world->HelloWorld
- *
+ *
* @param name
* 杞崲鍓嶇殑涓嬪垝绾垮ぇ鍐欐柟寮忓懡鍚嶇殑瀛楃涓�
* @return 杞崲鍚庣殑椹煎嘲寮忓懡鍚嶇殑瀛楃涓�
@@ -524,7 +524,7 @@
return result.toString();
}
//update-end--Author:zhoujf Date:20180503 for锛歍ASK #2500 銆愪唬鐮佺敓鎴愬櫒銆戜唬鐮佺敓鎴愬櫒寮�鍙戜竴閫氱敤妯℃澘鐢熸垚鍔熻兘
-
+
/**
* 灏嗛┘宄板懡鍚嶈浆鍖栨垚涓嬪垝绾�
* @param para
@@ -533,19 +533,19 @@
public static String camelToUnderline(String para){
int length = 3;
if(para.length()<length){
- return para.toLowerCase();
+ return para.toLowerCase();
}
StringBuilder sb=new StringBuilder(para);
//瀹氫綅
int temp=0;
- //浠庣涓変釜瀛楃寮�濮� 閬垮厤鍛藉悕涓嶈鑼�
+ //浠庣涓変釜瀛楃寮�濮� 閬垮厤鍛藉悕涓嶈鑼�
for(int i=2;i<para.length();i++){
if(Character.isUpperCase(para.charAt(i))){
sb.insert(i+temp, "_");
temp+=1;
}
}
- return sb.toString().toLowerCase();
+ return sb.toString().toLowerCase();
}
/**
@@ -561,10 +561,10 @@
}
return sb.toString();
}
-
+
/**
* 鑾峰彇绫荤殑鎵�鏈夊睘鎬э紝鍖呮嫭鐖剁被
- *
+ *
* @param object
* @return
*/
@@ -579,7 +579,7 @@
fieldList.toArray(fields);
return fields;
}
-
+
/**
* 灏唌ap鐨刱ey鍏ㄩ儴杞垚灏忓啓
* @param list
@@ -589,10 +589,10 @@
List<Map<String, Object>> select = new ArrayList<>();
for (Map<String, Object> row : list) {
Map<String, Object> resultMap = new HashMap<>(5);
- Set<String> keySet = row.keySet();
- for (String key : keySet) {
- String newKey = key.toLowerCase();
- resultMap.put(newKey, row.get(key));
+ Set<String> keySet = row.keySet();
+ for (String key : keySet) {
+ String newKey = key.toLowerCase();
+ resultMap.put(newKey, row.get(key));
}
select.add(resultMap);
}
@@ -677,4 +677,19 @@
}
return json;
}
+
+ public static <T> List<T> castList(Object obj, Class<T> clazz)
+ {
+ List<T> result = new ArrayList<T>();
+ if(obj instanceof List<?>)
+ {
+ for (Object o : (List<?>) obj)
+ {
+ result.add(clazz.cast(o));
+ }
+ return result;
+ }
+ return null;
+ }
+
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java
index b245842..1374027 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocInfoController.java
@@ -13,7 +13,6 @@
import org.jeecg.modules.dnc.request.DocInfoUploadRequest;
import org.jeecg.modules.dnc.response.CommonCode;
import org.jeecg.modules.dnc.response.QueryListResponseResult;
-import org.jeecg.modules.dnc.response.QueryPageResponseResult;
import org.jeecg.modules.dnc.response.ResponseResult;
import org.jeecg.modules.dnc.service.IDocInfoService;
import org.jeecg.modules.dnc.utils.ValidateUtil;
@@ -177,7 +176,8 @@
@ApiOperation(value = "鏂囦欢琛�-鏌ヨ鍙寚娲剧殑鏂囨。淇℃伅鍒楄〃", notes = "鏂囦欢琛�-鏌ヨ鍙寚娲剧殑鏂囨。淇℃伅鍒楄〃")
@GetMapping("/find/list")
public Result<?> findList(DocInfoQueryRequest docQuery) {
- return docInfoService.findList(docQuery);
+ List<DocInfo> docInfoList=docInfoService.findList(docQuery);
+ return Result.ok(docInfoList);
}
@AutoLog(value = "鏂囦欢琛�-鎵归噺鍒犻櫎鏂囨。鎺ュ彛")
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDocInfoService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDocInfoService.java
index a1d8f0f..f74e4de 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDocInfoService.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDocInfoService.java
@@ -207,7 +207,7 @@
* @param docQuery
* @return
*/
- Result<?> findList(DocInfoQueryRequest docQuery);
+ List<DocInfo> findList(DocInfoQueryRequest docQuery);
/**
* 鑾峰彇涓�缁勫伐搴忎笅鐨勬枃妗ｄ俊鎭垪琛�
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
index 33a1e56..383e3e4 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
@@ -790,7 +790,7 @@
}
@Override
- public Result<?> findList(DocInfoQueryRequest docQuery) {
+ public List<DocInfo> findList(DocInfoQueryRequest docQuery) {
if(docQuery == null || !ValidateUtil.validateString(docQuery.getAttributionId())
|| !ValidateUtil.validateInteger(docQuery.getAttributionType()) ||
!ValidateUtil.validateString(docQuery.getDocClassCode())) {
@@ -816,8 +816,7 @@
}
queryWrapper.ge(StrUtil.isNotEmpty(docQuery.getStartTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getStartTime());
queryWrapper.le(StrUtil.isNotEmpty(docQuery.getEndTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getEndTime());
- List<DocInfo> docInfoIPage = super.getBaseMapper().findDocExtList(queryWrapper);
- return Result.ok(docInfoIPage);
+ return super.getBaseMapper().findDocExtList(queryWrapper);
}
@Override
--
Gitblit v1.9.3