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;
@@ -1334,22 +1333,23 @@
               if ("data".equals(propertyName)){
                  mapData = (Map) result;
               }else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
                  returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, result);
                  returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName).toLowerCase():propertyName.toLowerCase(), result);
               }
            } else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
               returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, "");
               returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName).toLowerCase():propertyName.toLowerCase(), "");
            }
         }
      }
      //作用主要用于已MAP中的数据为准，bean里面遇到字段相同也会进行覆盖。
      if(existFild == null){
         returnMap.putAll((Map) mapData);
      }else{
         Map resulMapChild = (Map) mapData;
         for (Object o : resulMapChild.keySet()) {
            if(existFild.contains(String.valueOf(o).toLowerCase())){
               returnMap.put(String.valueOf(o).toLowerCase(),resulMapChild.get(o));
      //作用主要用于已MAP中的数据为准，bean里面遇到字段相同且map里面数据为空，则使用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;
@@ -1373,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对应的setter方法
                        Method setter = property.getWriteMethod();
                        Class<?> type = property.getPropertyType();
@@ -1397,6 +1402,7 @@
      return beanList;
}


   public static String camelToUnderscore(String name) {
      if (name == null && name.length() <= 0) {
         return name;