From 54036dc2ebc591f891f452b3b248594d60fc583e Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 29 十一月 2023 09:25:03 +0800
Subject: [PATCH] 1.标准申请功能开发 2.业务数据报错去空格

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 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 0b415a0..7b1e981 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
@@ -1332,7 +1332,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 +1345,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 +1369,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;
@@ -1475,6 +1482,22 @@
 		}
 		return sum;
 	}
+	/***
+	 * 鏍¢獙鏄惁鏄綏椹暟瀛�
+	 * @param s
+	 * @return
+	 */
+	public static boolean isRoman(String s) {
+		// 妫�鏌ヨ緭鍏ョ殑瀛楃涓叉槸鍚︿负绌�
+		if (s == null || s.length() == 0) {
+			return false;
+		}
+		// 灏嗚緭鍏ョ殑瀛楃涓茶浆鎹负澶у啓瀛楁瘝
+		s = s.toUpperCase();
+		// 杩斿洖缁撴灉
+		Pattern pattern = Pattern.compile("^M{0,3}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$");
+		return pattern.matcher(s ).matches();
+	}
 
 	public static String intToRomanTwo(int num) {
 		String M[] = {"", "M", "MM", "MMM"};

--
Gitblit v1.9.3