From c09f81131e8b7c83937206d7cf76f34d2020be75 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 15 一月 2025 13:14:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIController.java
index 73df4c7..46ebfc6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIController.java
@@ -6,7 +6,11 @@
import com.vci.pagemodel.UITableDefineVO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
+import com.vci.starter.web.pagemodel.BaseResult;
+import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.service.UIEngineServiceI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,6 +33,11 @@
private UIEngineServiceI uiService;
/**
+ * 鏃ュ織
+ */
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ /**
* 鑾峰彇UI涓婁笅鏂囩殑瀹氫箟
* @param btmType 涓氬姟绫诲瀷
* @param id 缂栧彿
@@ -36,8 +45,15 @@
*/
@GetMapping("/getUIContentByBtmTypeAndId")
@VciUnCheckRight
- public UIContentVO getUIContentByBtmTypeAndId(String btmType,String id){
- return uiService.getUIContentByBtmTypeAndId(btmType,id);
+ public BaseResult getUIContentByBtmTypeAndId(String btmType,String id){
+ try {
+ return BaseResult.success(uiService.getUIContentByBtmTypeAndId(btmType,id));
+ } catch (PLException e) {
+ e.printStackTrace();
+ String exceptionMessage = "鑾峰彇UI涓婁笅鏂囩殑瀹氫箟鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
}
/**
--
Gitblit v1.9.3