From d74e5663908f6530ee32d074b1a747c49cb05589 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 25 八月 2023 16:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
index f43e99d..4ccbc9b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
@@ -19,6 +19,7 @@
import com.vci.ubcs.starter.web.wrapper.VciQueryWrapperForDO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springblade.core.tool.utils.Func;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ResourceUtils;
@@ -37,8 +38,6 @@
import java.math.BigInteger;
import java.net.InetAddress;
import java.net.NetworkInterface;
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -1294,13 +1293,14 @@
* @return Map瀵硅薄
* @version 2016骞�3鏈�20鏃� 11:03:01
*/
- public static Map convertBean2Map(Object bean) throws Exception {
+ public static Map convertBean2Map(Object bean,Set<String> existFild) throws Exception {
Class type = bean.getClass();
Map returnMap = new HashMap();
BeanInfo beanInfo = Introspector.getBeanInfo(type);
PropertyDescriptor[] propertyDescriptors = beanInfo
.getPropertyDescriptors();
Field[] declaredFields = type.getDeclaredFields();
+ Map<String, String> fieldMap = new HashMap();
String existField = "";
for (Field declaredField : declaredFields) {
declaredField.setAccessible(true);
@@ -1313,9 +1313,13 @@
if(fieldValue == false){
existField += declaredField.getName().toLowerCase()+",";
}
+ String value = tableField.value();
+ if(net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils.isNotBlank(value)){
+ fieldMap.put(declaredField.getName(), value);
+ }
}
}
-
+ Map mapData = new HashMap<>();
for (int i = 0, n = propertyDescriptors.length; i <n ; i++) {
PropertyDescriptor descriptor = propertyDescriptors[i];
String propertyName = descriptor.getName();
@@ -1327,13 +1331,25 @@
if (result != null) {
if ("data".equals(propertyName)){
- returnMap.putAll((Map) result);
- }else {
- returnMap.put(propertyName, result);
+ mapData = (Map) result;
+ }else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
+ returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName).toLowerCase():propertyName.toLowerCase(), result);
}
- } else {
- returnMap.put(propertyName, "");
+ } else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
+ returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName).toLowerCase():propertyName.toLowerCase(), "");
}
+ }
+ }
+ //浣滅敤涓昏鐢ㄤ簬宸睲AP涓殑鏁版嵁涓哄噯锛宐ean閲岄潰閬囧埌瀛楁鐩稿悓涓攎ap閲岄潰鏁版嵁涓虹┖锛屽垯浣跨敤bean閲岄潰鐨勫��,
+// Map resulMapChild = (Map) mapData;
+ for (Object o : mapData.keySet()) {
+ if(existFild == null || existFild.contains(String.valueOf(o).toLowerCase())){
+ if((Func.isNotBlank(String.valueOf(returnMap.get(String.valueOf(o).toLowerCase())))
+ && returnMap.get(String.valueOf(o).toLowerCase()) !=null)
+ && Func.isBlank(String.valueOf(mapData.get(o)))){
+ continue;
+ }
+ returnMap.put(String.valueOf(o).toLowerCase(),mapData.get(o));
}
}
return returnMap;
@@ -1357,9 +1373,14 @@
// String sqlField = camelToUnderscore(key);
- if (map.containsKey(key.toUpperCase())) {
+ if (map.containsKey(key.toUpperCase(Locale.ROOT))||map.containsKey(key.toLowerCase(Locale.ROOT))) {
try {
- Object value = map.get(key.toUpperCase());
+ Object value="";
+ if (map.containsKey(key.toUpperCase(Locale.ROOT))) {
+ value = map.get(key.toUpperCase());
+ }else if(map.containsKey(key.toLowerCase(Locale.ROOT))){
+ value = map.get(key.toLowerCase());
+ }
// 寰楀埌property瀵瑰簲鐨剆etter鏂规硶
Method setter = property.getWriteMethod();
Class<?> type = property.getPropertyType();
@@ -1381,6 +1402,7 @@
return beanList;
}
+
public static String camelToUnderscore(String name) {
if (name == null && name.length() <= 0) {
return name;
--
Gitblit v1.9.3