From ab234e8b6a7cc2a52be8dbe04c7b731105f6a030 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 01 十二月 2023 10:42:27 +0800
Subject: [PATCH] 字符集修改，删除接口完善
---
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/controller/DdlController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 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 2683a9a..6423ad9 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;
@@ -45,7 +44,11 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "涓氬姟绫诲瀷閾炬帴绫诲瀷浼犺緭瀵硅薄")
public R submitBtmType(@RequestBody BtmAndLinkTypeDdlDTO ddlDTO) {
- return ddlService.submit(ddlDTO);
+ try {
+ return ddlService.submit(ddlDTO);
+ } catch (Throwable e) {
+ return R.fail(e.getMessage());
+ }
}
/**
@@ -67,7 +70,7 @@
@GetMapping("/getAllTableInfo")
@ApiOperation(value = "鑾峰彇鎵�鏈夌殑琛ㄤ俊鎭�")
@ApiOperationSupport(order = 4)
- public R<List<DdlTableBO>> getAllTableInfo(){
+ public R<List<BtmTypeVO>> getAllTableInfo(){
return R.data(ddlService.getAllTableInfo());
}
@@ -83,4 +86,30 @@
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