From 90c86c95de1d20a3c3a44cab3482388a8c221a5e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 05 十二月 2024 10:32:59 +0800
Subject: [PATCH] UI数据查询调整
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java | 135 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 114 insertions(+), 21 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 b1a9072..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
@@ -7,13 +7,17 @@
import com.vci.dto.FormLinkDataDTO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
+import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.pagemodel.ReferConfigVO;
import com.vci.pagemodel.UIFormDataVO;
-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.starter.web.util.VciBaseUtil;
+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;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -36,7 +40,12 @@
* 鐣岄潰鐨勬暟鎹湇鍔�
*/
@Autowired
- private UIDataServiceI uiDataService;
+ private UIDataCommonServiceI uiDataService;
+
+ /**
+ * 鏃ュ織
+ */
+ private Logger logger = LoggerFactory.getLogger(getClass());
/**
* 鍒楄〃鏌ヨ
@@ -44,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);
+ }
}
/**
@@ -56,10 +72,17 @@
* @return 琛ㄥ崟鐨勬暟鎹�
*/
@PostMapping("/dataFormQuery")
- @VciUnCheckRight
+ //@VciUnCheckRight
@VciBusinessLog(operateName = "琛ㄥ崟鐨勬煡璇�",description = "${param.btmname}閲岀殑${param.formDefineId}")
public BaseResult<UIFormDataVO> getDataForForm(UIFormQuery formQuery){
- return BaseResult.success(uiDataService.getDataForForm(formQuery));
+ try {
+ return BaseResult.success(uiDataService.getDataForForm(formQuery));
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "琛ㄥ崟鏁版嵁鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
}
/**
@@ -68,10 +91,36 @@
* @return 鏍戠殑鏁版嵁
*/
@PostMapping("/getDataForTree")
- @VciUnCheckRight
+ //@VciUnCheckRight
@VciBusinessLog(operateName = "鏍戠殑鏌ヨ",description = "${param.btmname}")
- public List<Tree> getDataForTree(UITreeQuery treeQuery){
- return uiDataService.getDataForTree(treeQuery);
+ public BaseResult getDataForTree(UITreeQuery treeQuery){
+ try {
+ 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);
+ }
}
/**
@@ -80,10 +129,17 @@
* @return 鎵ц鐨勭粨鏋�
*/
@PostMapping("/addSave")
- @VciUnCheckRight
+ //@VciUnCheckRight
@VciBusinessLog(operateName = "娣诲姞鏁版嵁",description = "${param.btmname}")
public BaseResult<Map<String,Object>> addSave(@RequestBody FormDataDTO formDataDTO){
- return uiDataService.addSave(formDataDTO);
+ try {
+ return uiDataService.addSave(formDataDTO);
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "娣诲姞鏁版嵁鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
}
/**
@@ -94,7 +150,14 @@
@PostMapping("/linkAddSave")
@VciBusinessLog(operateName = "娣诲姞閾炬帴鏁版嵁",description = "${param.linkType}")
public BaseResult<String> linkAddSave(@RequestBody FormLinkDataDTO formLinkDataDTO){
- return uiDataService.linkAddSave(formLinkDataDTO);
+ try {
+ return uiDataService.linkAddSave(formLinkDataDTO);
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "娣诲姞閾炬帴绫诲瀷鏁版嵁鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
}
/**
@@ -106,7 +169,14 @@
@VciUnCheckRight
@VciBusinessLog(operateName = "淇敼鏁版嵁",description = "${param.btmname}閲岀殑${param.oid}")
public BaseResult<Map<String,Object>> editSave(@RequestBody FormDataDTO formDataDTO){
- return uiDataService.editSave(formDataDTO);
+ try {
+ return uiDataService.editSave(formDataDTO);
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "淇敼鏁版嵁鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
}
/**
@@ -117,7 +187,14 @@
@VciBusinessLog(operateName = "淇敼閾炬帴绫诲瀷鏁版嵁",description = "${param.linkType}閲岀殑${param.oid}")
@PutMapping("/linkEditSave")
public BaseResult linkEditSave(@RequestBody FormLinkDataDTO formLinkDataDTO){
- return uiDataService.linkEditSave(formLinkDataDTO);
+ try {
+ return uiDataService.linkEditSave(formLinkDataDTO);
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "淇敼閾炬帴绫诲瀷鐨勬暟鎹椂鍑虹幇閿欒锛屽師鍥狅細"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
}
/**
@@ -156,10 +233,17 @@
* @return 鎵ц鐨勭粨鏋�
*/
@DeleteMapping("/deleteData")
- @VciUnCheckRight
+ //@VciUnCheckRight
@VciBusinessLog(operateName = "鍒犻櫎鏁版嵁",description = "${param.dataList.0.btmname}鐨�${param.dataList.${join}.oid}")
public BaseResult deleteData(@RequestBody DeleteDataDTO deleteDataDTO){
- return uiDataService.batchDelete(deleteDataDTO);
+ try {
+ return uiDataService.batchDelete(deleteDataDTO);
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "鍒犻櫎鏁版嵁鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
}
/**
@@ -181,7 +265,14 @@
@GetMapping("/defaultReferDataGrid")
@VciBusinessLog(operateName = "鑾峰彇鍙傜収鐨勫垪琛ㄦ暟鎹�",description = "")
public DataGrid defaultReferDataGrid(ReferConfigVO referConfigVO,PageHelper pageHelper){
- return uiDataService.referDataGrid(referConfigVO,pageHelper);
+ try {
+ return uiDataService.referDataGrid(referConfigVO,pageHelper);
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "榛樿鐨勫弬鐓у垪琛ㄦ椂鍑虹幇閿欒锛屽師鍥狅細"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
}
/**
@@ -212,6 +303,7 @@
re.setData(dataMapList);
return re;
}
+
/**
* 鍙樻洿鎵�鏈夎��
* @param btmname 涓氬姟绫诲瀷
@@ -248,4 +340,5 @@
return objectBaseResult;
}
}
+
}
--
Gitblit v1.9.3