From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java
index ba3ad2d..d267657 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java
@@ -12,9 +12,9 @@
import com.vci.pagemodel.ReferConfigVO;
import com.vci.pagemodel.UIFormDataVO;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.query.UIDataGridQuery;
-import com.vci.web.query.UIFormQuery;
-import com.vci.web.query.UITreeQuery;
+import com.vci.query.UIDataGridQuery;
+import com.vci.query.UIFormQuery;
+import com.vci.query.UITreeQuery;
import com.vci.web.service.UIDataServiceI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,9 +86,9 @@
@PostMapping("/getDataForTree")
@VciUnCheckRight
@VciBusinessLog(operateName = "鏍戠殑鏌ヨ",description = "${param.btmname}")
- public List<Tree> getDataForTree(UITreeQuery treeQuery){
+ public BaseResult getDataForTree(UITreeQuery treeQuery){
try {
- return uiDataService.getDataForTree(treeQuery);
+ return BaseResult.tree(uiDataService.getDataForTree(treeQuery));
}catch (Exception e){
e.printStackTrace();
String errorMsg = "鏍戠殑鏁版嵁鏌ヨ鍑虹幇閿欒锛屽師鍥狅細"+ VciBaseUtil.getExceptionMessage(e);
@@ -98,6 +98,25 @@
}
/**
+ * 鏍规嵁鏌ヨ妯℃澘鏌ヨ鏁版嵁锛岃繑鍥炲�兼寜鐓ч〉闈㈠畾涔�
+ * @param treeQuery 鏍戞煡璇㈠璞�
+ * @return 鏍戠殑鏁版嵁
+ */
+ @PostMapping("/getDataByTemp")
+ @VciUnCheckRight
+ @VciBusinessLog(operateName = "鏌ヨ")
+ public BaseResult getDataByTemp(UITreeQuery treeQuery){
+ try {
+ return uiDataService.getDataByTemp(treeQuery);
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "鏁版嵁鏌ヨ鍑虹幇閿欒锛屽師鍥狅細"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
+
+ /**
* 娣诲姞鏁版嵁銆傚墠绔娇鐢↗SON鎻愪氦
* @param formDataDTO 琛ㄥ崟
* @return 鎵ц鐨勭粨鏋�
--
Gitblit v1.9.3