From a36a33fe9b9af48b3f03b7a6a19e622c8f3d376c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 27 六月 2024 17:59:56 +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 | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 913d390..0810fed 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
@@ -3,6 +3,8 @@
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.vci.common.exception.VciExceptionTool;
+import com.vci.corba.common.PLException;
import com.vci.starter.web.annotation.Id;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.annotation.VciLinkType;
@@ -48,6 +50,23 @@
public class VciBaseUtil {
/**
+ * 鑾峰彇寮傚父淇℃伅,鍥犱负鎶涘嚭鐨勫紓甯镐笉鍚岋紝鑾峰彇閿欒淇℃伅鐨勬柟寮忓瓨鍦ㄥ樊寮傛墍浠ユ棤娉曠粺涓�鑾峰彇
+ * 鍚庣画鏈夊叾浠栧紓甯搁渶瑕佽幏鍙栵紝鑷娣诲姞澶勭悊閫昏緫锛�
+ * @param e
+ * @return
+ */
+ public static String getExceptionMessage(Exception e){
+ String exceptionStr = VciExceptionTool.getExceptionStr(e);
+ if(exceptionStr.contains("VciBaseException")){
+ return e.getMessage();
+ }else if(exceptionStr.contains("PLException")){
+ return Arrays.stream(((PLException) e).messages).collect(Collectors.joining("\n"));
+ }else {
+ return e.getMessage();
+ }
+ }
+
+ /**
* 鏃ュ織瀵硅薄
*/
private static Logger log = LoggerFactory.getLogger(VciBaseUtil.class);
@@ -1210,7 +1229,7 @@
* @return 浼氳瘽瀵硅薄
*/
public static SessionInfo getCurrentUserSessionInfoNotException() {
- return WebThreadLocalUtil.getCurrentUserSessionInfoInThread().get();
+ return WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
}
/**
@@ -1218,7 +1237,7 @@
* @param sessionInfo 鐢ㄦ埛瀵硅薄
*/
public static void setCurrentUserSessionInfo(SessionInfo sessionInfo){
- WebThreadLocalUtil.getCurrentUserSessionInfoInThread().set(sessionInfo);
+ WebThreadLocalUtil.setCurrentUserSessionInfoInThread(sessionInfo);
}
/**
@@ -1226,7 +1245,7 @@
* @return true琛ㄧず鏌ヨ
*/
public static boolean isQueryTotal(){
- String needQueryTotal = WebThreadLocalUtil.getNeedQueryTotalInThread().get();
+ String needQueryTotal = WebThreadLocalUtil.getNeedQueryTotalInThread();
if("false".equalsIgnoreCase(needQueryTotal)){
return false;
}else{
@@ -1929,4 +1948,15 @@
}
return new String(c);
}
+
+ /**
+ * 灏唖tring闆嗗悎杞负stirng鏁扮粍
+ * @param strCollection string闆嗗悎
+ * @return string鏁扮粍
+ */
+ public static String[] collection2StrArr(Collection<String> strCollection){
+ String[] strArr = new String[strCollection.size()];
+ strCollection.toArray(strArr);
+ return strArr;
+ }
}
--
Gitblit v1.10.0