From d97c5223b68df0153cef2180b9256d6916c5414d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 07 三月 2024 11:35:04 +0800
Subject: [PATCH] 集成相关更改
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 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 cef20db..bd9f7d9 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
@@ -63,6 +63,36 @@
&& NacosConfigCache.getAdminUserInfo().getUserName().equals(AuthUtil.getUserName());
}
+ /**
+ * 浠巑ap涓幏鍙栧�硷紝骞朵笖鍙互蹇界暐澶у皬鍐�
+ * @param map
+ * @param key
+ * @return
+ */
+ public static Object getMapValueIgnoreCase(Map<String, Object> map,String key){
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ if (entry.getKey().equalsIgnoreCase(key)) {
+ return entry.getValue();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 浠巑ap涓幏鍙栧�硷紝骞朵笖鍙互蹇界暐澶у皬鍐�
+ * @param map
+ * @param key
+ * @return
+ */
+ public static String getMapStrValueIgnoreCase(Map<String, String> map,String key){
+ for (Map.Entry<String, String> entry : map.entrySet()) {
+ if (entry.getKey().equalsIgnoreCase(key)) {
+ return entry.getValue();
+ }
+ }
+ return null;
+ }
+
public static String getPk() {
return String.valueOf(getPKLong(1,1));
}
@@ -1332,7 +1362,7 @@
}
String value = tableField.value();
if(net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils.isNotBlank(value)){
- fieldMap.put(declaredField.getName(), value);
+ fieldMap.put(declaredField.getName(), value.trim());
}
}
}
@@ -1345,6 +1375,9 @@
((!"".equals(existField) && !existField.contains(propertyName.toLowerCase()+","))||"data".equals(propertyName))) {
Method readMethod = descriptor.getReadMethod();
Object result = readMethod.invoke(bean, new Object[0]);
+ if(result instanceof String){
+ result=((String) result).trim();
+ }
if (result != null) {
if ("data".equals(propertyName)){
@@ -1366,7 +1399,11 @@
&& Func.isBlank(String.valueOf(mapData.get(o)))){
continue;
}
- returnMap.put(String.valueOf(o).toLowerCase(),mapData.get(o));
+ Object result=mapData.get(o);
+ if(result instanceof String){
+ result=((String) result).trim();
+ }
+ returnMap.put(String.valueOf(o).toLowerCase(),result);
}
}
return returnMap;
--
Gitblit v1.9.3