From db1c3c5b3670639fd1dfc5de0fe75ce6f02f732e Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 31 五月 2023 14:40:07 +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 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 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 26520c4..819c5e5 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,17 +3,21 @@
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.OmdBtmTypeDTO;
+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;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* Description: 鏁版嵁搴撴搷浣滄帶鍒跺櫒
@@ -33,14 +37,14 @@
/**
* 鏂板鎴栦慨鏀规暟鎹簱琛�
- * @param dto 涓氬姟绫诲瀷
+ * @param ddlDTO 涓氬姟绫诲瀷+閾炬帴绫诲瀷
* @return 鎵ц缁撴灉
*/
- @PostMapping("/submitBtmType")
+ @PostMapping("/submit")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆涓氬姟绫诲瀷浼犺緭瀵硅薄")
- public R submitBtmType(@Valid @RequestBody OmdBtmTypeDTO dto) {
- return ddlService.submitBtmType(dto);
+ @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "涓氬姟绫诲瀷閾炬帴绫诲瀷浼犺緭瀵硅薄")
+ public R submitBtmType(@RequestBody BtmAndLinkTypeDdlDTO ddlDTO) {
+ return ddlService.submit(ddlDTO);
}
/**
@@ -62,7 +66,46 @@
@GetMapping("/getAllTableInfo")
@ApiOperation(value = "鑾峰彇鎵�鏈夌殑琛ㄤ俊鎭�")
@ApiOperationSupport(order = 4)
- public R<List<DdlTableBO>> getAllTableInfo(){
+ public R<List<BtmTypeVO>> getAllTableInfo(){
return R.data(ddlService.getAllTableInfo());
}
+
+ /**
+ * 鑾峰彇鏁版嵁搴撳拰涓氬姟绫诲瀷涓殑涓嶅悓鐨勫湴鏂�
+ * @param ddlDTO 鍖呭惈涓氬姟绫诲瀷鍜岄摼鎺ョ被鍨嬬殑鍖呰
+ * @return 涓嶅悓鐨勫湴鏂癸紝姣忎竴涓笟鍔＄被鍨嬫垨鑰呴摼鎺ョ被鍨嬩竴鏉℃暟鎹�
+ */
+ @PostMapping("/checkDifferentAndReflex")
+ @ApiOperation(value = "妫�鏌ヤ笟鍔＄被鍨嬬殑鏁版嵁涓庢暟鎹簱涓槸鍚︾浉鍚�")
+ @ApiOperationSupport(order = 5)
+ public R<List<ModifyAttributeInfo>> checkDifferentAndReflex(@RequestBody BtmAndLinkTypeDdlDTO ddlDTO){
+ 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