From 9e18636bed4fc3fceec08ca25d6c7916d4d9a429 Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 25 十二月 2024 17:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java | 71 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java
index 6d17c4f..105768a 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/util/VciBaseUtil.java
@@ -57,7 +57,7 @@
* @param e
* @return
*/
- public static String getExceptionMessage(Exception e){
+ public static String getExceptionMessage(Throwable e){
String exceptionStr = VciExceptionTool.getExceptionStr(e);
if(exceptionStr.contains("VciBaseException")){
return e.getMessage();
@@ -287,6 +287,28 @@
}
/**
+ * 鍘婚櫎鏈�鍓嶉潰鐨剆piltFilter锛屽幓闄ゅ悗闈㈢殑spiltFilter
+ * @param s 瀛楃涓�
+ * @param spiltFilter,鍒嗛殧绗�
+ * @return 鍘婚櫎鏈熬閫楀彿
+ */
+ public static String removeComma(String s,String spiltFilter){
+ if(s == null || s.trim().length() == 0) {
+ return s;
+ }
+ else{
+ if(s.startsWith(spiltFilter)) {
+ s = s.substring(spiltFilter.length(), s.length());
+ }
+ if(s.endsWith(spiltFilter)) {
+ s = s.substring(0, s.length() - spiltFilter.length());
+ }
+ return s;
+ }
+ }
+
+
+ /**
* 涓簊ql涓娇鐢╥n鏃讹紝鎻愪緵杞崲锛屾敞鎰廼n閲岀殑鍊间笉鑳借秴杩�1000
* @param s 瀛楃涓�
* @return 杩斿洖sql璇彞
@@ -472,6 +494,21 @@
charMap.put(String.valueOf(c), (!charMap.containsKey(String.valueOf(c))? 1 : charMap.get(String.valueOf(c)) + 1));
}
return charMap.get(String.valueOf(findC));
+ }
+
+ /**
+ * 甯﹂�楀彿鐨勫瓧绗︿覆杞负list
+ * @param s 瀛楃涓�
+ * @return 瀛楃涓插垪琛�
+ */
+ public static List<String> str2List(String s,String spilter){
+ if (isNull(s)) {
+ return null;
+ } else {
+ List<String> l = new ArrayList<String>();
+ Collections.addAll(l,removeComma(s,spilter).split(spilter));
+ return l;
+ }
}
/**
@@ -777,7 +814,7 @@
if(c.isArray()){
return isBasicType(c.getComponentType());
}
- return ClassUtil.isPrimitive(c);
+ return ClassUtilForVCI.isPrimitive(c);
}
/**
@@ -1285,7 +1322,7 @@
Map<String,Object> map = new HashMap<String,Object>();
if(o!=null) {
String jsonString = JSONObject.toJSONStringWithDateFormat(o, VciDateUtil.DateTimeMillFormat, SerializerFeature.WriteDateUseDateFormat);
- if(org.apache.commons.lang3.StringUtils.isNotBlank(jsonString)) {
+ if(StringUtils.isNotBlank(jsonString)) {
JSONObject jsonObject = JSONObject.parseObject(jsonString);
if(jsonObject!=null){
for(String key : jsonObject.keySet()){
@@ -1306,7 +1343,7 @@
Map<String,String> map = new HashMap<String,String>();
if(o!=null) {
String jsonString = JSONObject.toJSONStringWithDateFormat(o, VciDateUtil.DateTimeMillFormat, SerializerFeature.WriteDateUseDateFormat);
- if(org.apache.commons.lang3.StringUtils.isNotBlank(jsonString)) {
+ if(StringUtils.isNotBlank(jsonString)) {
JSONObject jsonObject = JSONObject.parseObject(jsonString);
if(jsonObject!=null){
for(String key : jsonObject.keySet()){
@@ -1333,6 +1370,25 @@
}
}
+
+ /**
+ * 鏁扮粍杞崲涓篠tring
+ * @param array 鏁扮粍瀵硅薄
+ * @param spiltFiter 鍒嗛殧绗�
+ * @return 閫楀彿閾炬帴鐨勫瓧绗︿覆
+ */
+ public static String array2String(String[] array,String spiltFiter) {
+ if(null == array || array.length == 0) {
+ return "";
+ } else{
+ String ss = "";
+ for(String s : array){
+ ss += s + spiltFiter;
+ //1.8鍙互
+ }
+ return removeComma(ss,spiltFiter);
+ }
+ }
/**
* 鏁扮粍杞崲涓篠tring
* @param array 鏁扮粍瀵硅薄
@@ -1758,14 +1814,13 @@
return name;
}
-
/**
* 鏍规嵁涓氬姟绫诲瀷鑾峰彇琛ㄦ牸鍚嶇О
* @param btmname 涓氬姟绫诲瀷锛屽苟涓斾笉鑳芥槸瑙嗗浘
* @return 鏁版嵁搴撹〃鏍煎悕绉�
*/
public static String getTableName(String btmname) {
- return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY?"platformbtm_":"vcibt_") + btmname.trim().toLowerCase();
+ return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY?"pbt_":"vcibt_") + btmname.trim().toLowerCase();
}
/**
@@ -1774,7 +1829,7 @@
* @return 鏁版嵁搴撹〃鏍煎悕绉�
*/
public static String getLinkTableName(String linkName){
- return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY?"platformlt_":"vcilt_")+ linkName.trim().toLowerCase();
+ return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY?"plt_":"vcilt_")+ linkName.trim().toLowerCase();
}
/**
@@ -1822,7 +1877,7 @@
* @param replaceMap 浣跨敤鏇挎崲鐨勬暟鎹簮
* @return 鏇挎崲鍚庣殑鍊�
*/
- public static String replaceByFreeMarker(String freemarker,Map<String,String> replaceMap){
+ public static String replaceByFreeMarker(String freemarker,Map<String,Object> replaceMap){
if(StringUtils.isBlank(freemarker)){
return "";
}
--
Gitblit v1.9.3