From 07d570d63420e1dca2760034fe6fe9c28810298b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 05 十二月 2024 11:34:25 +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 |   54 +++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 41 insertions(+), 13 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..82cbbfd 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,10 +12,10 @@
 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.web.service.UIDataServiceI;
+import com.vci.query.UIDataGridQuery;
+import com.vci.query.UIFormQuery;
+import com.vci.query.UITreeQuery;
+import com.vci.web.service.uidataservice.UIDataCommonServiceI;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +40,7 @@
      * 鐣岄潰鐨勬暟鎹湇鍔�
      */
     @Autowired
-    private UIDataServiceI uiDataService;
+    private UIDataCommonServiceI uiDataService;
 
     /**
      * 鏃ュ織
@@ -53,10 +53,17 @@
      * @return 鍒楄〃鏁版嵁
      */
     @PostMapping("/dataGridQuery")
-    @VciUnCheckRight
+    //@VciUnCheckRight
     @VciBusinessLog(operateName = "鍒楄〃鏁版嵁鐨勬煡璇�",description = "${param.btmname}閲岀殑${param.tableDefineId}")
-    public DataGrid dataGrid(UIDataGridQuery dataGridQuery) throws PLException {
-        return uiDataService.getDataForGrid(dataGridQuery);
+    public BaseResult dataGrid(UIDataGridQuery dataGridQuery) throws Exception {
+        try {
+            return BaseResult.dataGrid(uiDataService.getDataForGrid(dataGridQuery));
+        }catch (Exception e){
+            e.printStackTrace();
+            String errorMsg = "琛ㄥ崟鏁版嵁鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+            logger.error(errorMsg);
+            throw new VciBaseException(errorMsg);
+        }
     }
 
     /**
@@ -65,7 +72,7 @@
      * @return 琛ㄥ崟鐨勬暟鎹�
      */
     @PostMapping("/dataFormQuery")
-    @VciUnCheckRight
+    //@VciUnCheckRight
     @VciBusinessLog(operateName = "琛ㄥ崟鐨勬煡璇�",description = "${param.btmname}閲岀殑${param.formDefineId}")
     public BaseResult<UIFormDataVO> getDataForForm(UIFormQuery formQuery){
         try {
@@ -84,14 +91,33 @@
      * @return 鏍戠殑鏁版嵁
      */
     @PostMapping("/getDataForTree")
-    @VciUnCheckRight
+    //@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);
+            logger.error(errorMsg);
+            throw new VciBaseException(errorMsg);
+        }
+    }
+
+    /**
+     * 鏍规嵁鏌ヨ妯℃澘鏌ヨ鏁版嵁锛岃繑鍥炲�兼寜鐓ч〉闈㈠畾涔�
+     * @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);
         }
@@ -103,7 +129,7 @@
      * @return 鎵ц鐨勭粨鏋�
      */
     @PostMapping("/addSave")
-    @VciUnCheckRight
+    //@VciUnCheckRight
     @VciBusinessLog(operateName = "娣诲姞鏁版嵁",description = "${param.btmname}")
     public BaseResult<Map<String,Object>> addSave(@RequestBody FormDataDTO formDataDTO){
         try {
@@ -277,6 +303,7 @@
         re.setData(dataMapList);
         return re;
     }
+
     /**
      * 鍙樻洿鎵�鏈夎��
      * @param btmname 涓氬姟绫诲瀷
@@ -313,4 +340,5 @@
             return objectBaseResult;
         }
     }
+
 }

--
Gitblit v1.9.3