From c84c6564cf3f71999622828290ae19972972afaf Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 20 十一月 2024 11:07:48 +0800
Subject: [PATCH] 添加登录成功，登录错误次数清零逻辑，ui定义的数据查询服务中增加通用查询接口。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 160 insertions(+), 15 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 f342ec9..316cb50 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
@@ -1,18 +1,28 @@
package com.vci.web.controller;
+import com.vci.corba.common.PLException;
+import com.vci.dto.DeleteDataDTO;
+import com.vci.dto.DeleteLinkDataDTO;
+import com.vci.dto.FormDataDTO;
+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.web.dto.*;
-import com.vci.web.pageModel.ReferConfigVO;
-import com.vci.web.pageModel.UIFormDataVO;
+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 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.*;
+
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -33,6 +43,11 @@
private UIDataServiceI uiDataService;
/**
+ * 鏃ュ織
+ */
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ /**
* 鍒楄〃鏌ヨ
* @param dataGridQuery 鏌ヨ瀵硅薄
* @return 鍒楄〃鏁版嵁
@@ -40,7 +55,7 @@
@PostMapping("/dataGridQuery")
@VciUnCheckRight
@VciBusinessLog(operateName = "鍒楄〃鏁版嵁鐨勬煡璇�",description = "${param.btmname}閲岀殑${param.tableDefineId}")
- public DataGrid dataGrid(UIDataGridQuery dataGridQuery){
+ public DataGrid dataGrid(UIDataGridQuery dataGridQuery) throws PLException {
return uiDataService.getDataForGrid(dataGridQuery);
}
@@ -53,7 +68,14 @@
@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);
+ }
}
/**
@@ -65,7 +87,33 @@
@VciUnCheckRight
@VciBusinessLog(operateName = "鏍戠殑鏌ヨ",description = "${param.btmname}")
public List<Tree> getDataForTree(UITreeQuery treeQuery){
- return uiDataService.getDataForTree(treeQuery);
+ try {
+ return 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);
+ }
}
/**
@@ -77,7 +125,14 @@
@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);
+ }
}
/**
@@ -88,7 +143,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);
+ }
}
/**
@@ -100,7 +162,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);
+ }
}
/**
@@ -111,18 +180,44 @@
@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);
+ }
}
/**
- * 鏁版嵁鍗囩増锛屽墠绔娇鐢↗SON鎻愪氦
+ * 鏁版嵁鍗囩増鏈�/娆★紝鍓嶇浣跨敤JSON鎻愪氦
* @param formDataDTO 琛ㄥ崟鏁版嵁
* @return 鎵ц鐨勭粨鏋�
*/
@PutMapping("/upRevision")
@VciBusinessLog(operateName = "鏁版嵁鍗囩増",description = "${param.btmname}閲岀殑${param.copyFromVersion}")
- public BaseResult<Map<String,Object>> upRevision(@RequestBody FormDataDTO formDataDTO){
+ public BaseResult<Map<String, Object>> upRevision(@RequestBody FormDataDTO formDataDTO) throws PLException {
return uiDataService.upRevision(formDataDTO);
+ }
+
+ /**
+ * 鏁版嵁鍗囩増鏈�/娆★紝鍓嶇浣跨敤JSON鎻愪氦
+ * @param btmname 涓氬姟绫诲瀷鐨勪俊鎭�
+ * @param oid 涓氬姟鏁版嵁鐨勪富閿�
+ * @param type 1:鐗堟瀵硅薄锛�2锛氱増鏈璞★紱3锛氫富瀵硅薄
+ * @return 鎵ц鐨勭粨鏋�
+ */
+ @DeleteMapping("/deleteBusinessObject")
+ public BaseResult deleteBusinessObject(String btmname , String oid, int type) {
+ try {
+ return uiDataService.deleteBusinessObject(btmname, oid, type);
+ }catch (PLException e){
+ BaseResult<Object> objectBaseResult = new BaseResult<>();
+ objectBaseResult.setCode(Integer.parseInt(e.code));
+ objectBaseResult.setMsg(Arrays.toString(e.messages));
+ return objectBaseResult;
+ }
}
/**
@@ -131,10 +226,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);
+ }
}
/**
@@ -156,7 +258,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);
+ }
}
/**
@@ -187,4 +296,40 @@
re.setData(dataMapList);
return re;
}
+ /**
+ * 鍙樻洿鎵�鏈夎��
+ * @param btmname 涓氬姟绫诲瀷
+ * @param oid 涓婚敭
+ * @return 鎵ц鐨勭粨鏋�
+ */
+ @PutMapping("/changeBusinessObjectOwner")
+ public BaseResult changeBusinessObjectOwner(String btmname , String oid) {
+ try {
+ return uiDataService.changeBusinessObjectOwner(btmname, oid);
+ } catch (PLException e) {
+ BaseResult<Object> objectBaseResult = new BaseResult<>();
+ objectBaseResult.setCode(Integer.parseInt(e.code));
+ objectBaseResult.setMsg(Arrays.toString(e.messages));
+ return objectBaseResult;
+ }
+ }
+
+ /**
+ * 鐘舵�佽穬杩�
+ * @param btmname 涓氬姟绫诲瀷
+ * @param oid 涓婚敭
+ * @param releaseStatus 鍙戝竷鐘舵��
+ * @return 鎵ц鐨勭粨鏋�
+ */
+ @PutMapping("/transferBusinessObject")
+ public BaseResult transferBusinessObject(String btmname , String oid, String toStatus, String releaseStatus) {
+ try {
+ return uiDataService.transferBusinessObject(btmname, oid, toStatus, releaseStatus);
+ } catch (PLException e) {
+ BaseResult<Object> objectBaseResult = new BaseResult<>();
+ objectBaseResult.setCode(Integer.parseInt(e.code));
+ objectBaseResult.setMsg(Arrays.toString(e.messages));
+ return objectBaseResult;
+ }
+ }
}
--
Gitblit v1.9.3