From e1feed4fb9f3a7722eb0cd646e73e6573bdfb6e1 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 16 四月 2024 20:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/controller/DdlController.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/controller/DdlController.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/controller/DdlController.java
index e40f69e..e8c4118 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/controller/DdlController.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/controller/DdlController.java
@@ -3,8 +3,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.ddl.bo.DdlTableBO;
import com.vci.ubcs.ddl.service.IDdlService;
-import com.vci.ubcs.omd.dto.BtmAndLinkTypeDdlDTO;
-import com.vci.ubcs.omd.dto.BtmTypeDTO;
+import com.vci.ubcs.omd.dto.*;
import com.vci.ubcs.omd.entity.ModifyAttributeInfo;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import io.swagger.annotations.Api;
@@ -44,8 +43,12 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "涓氬姟绫诲瀷閾炬帴绫诲瀷浼犺緭瀵硅薄")
- public R submitBtmType(@RequestBody BtmAndLinkTypeDdlDTO ddlDTO) {
- return ddlService.submit(ddlDTO);
+ public R<List<ModifyAttributeInfo>> submitBtmType(@RequestBody BtmAndLinkTypeDdlDTO ddlDTO) {
+ try {
+ return ddlService.submit(ddlDTO);
+ } catch (Throwable e) {
+ return R.fail(e.getMessage());
+ }
}
/**
@@ -83,4 +86,31 @@
Func.requireNotNull(ddlDTO,"涓氬姟绫诲瀷涓庨摼鎺ュ璞′紶杈撳璞′笉鑳戒负绌�");
return R.data(ddlService.checkDifferent(ddlDTO.getBtmTypeList(),ddlDTO.getLinkTypeList()));
}
+
+ /**
+ * 妫�鏌ユ暟鎹〃鏄惁瀛樺湪鏁版嵁锛屼笉瀛樺湪鍒欏垹闄�
+ * @param tableCheckDTOList 闇�瑕佹鏌ョ殑琛ㄩ泦鍚�
+ * @return 妫�鏌ョ粨鏋�
+ */
+ @PostMapping("/checkTableHasDataThenDelete")
+ @ApiOperation(value = "妫�鏌ユ暟鎹〃鏄惁瀛樺湪鏁版嵁锛屼笉瀛樺湪鍒欏垹闄�")
+ @ApiOperationSupport(order = 6)
+ public R<TableCheckResultDTO> checkTableHasDataThenDelete(@RequestBody List<TableCheckDTO> tableCheckDTOList){
+ Func.requireNotNull(tableCheckDTOList,"闇�瑕佹鏌ョ殑琛ㄩ泦鍚�");
+ return R.data(ddlService.checkTableHasDataThenDelete(tableCheckDTOList));
+ }
+
+ /**
+ * 涓鸿〃娣诲姞瀛楁
+ * @param addColumnDTO 娣诲姞鐨勫璞�
+ * @return 鎵ц缁撴灉
+ */
+ @PostMapping("/addColumnForTable")
+ @ApiOperation(value = "涓鸿〃娣诲姞瀛楁")
+ @ApiOperationSupport(order = 6)
+ public R addColumnForTable(@RequestBody TableAddColumnDTO addColumnDTO){
+ Func.requireNotNull(addColumnDTO,"娣诲姞鐨勫璞�");
+ return R.status(ddlService.addColumnForTable(addColumnDTO));
+ }
+
}
--
Gitblit v1.9.3