From 3579af2945dd38d841a23cd340acd474bb63773a Mon Sep 17 00:00:00 2001 From: lihang <lihang@vci-tech.com> Date: 星期四, 04 五月 2023 18:02:01 +0800 Subject: [PATCH] 业务类型与DDL服务相关的添加 --- Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/controller/DdlController.java | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 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 b06a46d..2683a9a 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,22 @@ 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.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 +38,14 @@ /** * 鏂板鎴栦慨鏀规暟鎹簱琛� - * @param dto 涓氬姟绫诲瀷 + * @param ddlDTO 涓氬姟绫诲瀷+閾炬帴绫诲瀷 * @return 鎵ц缁撴灉 */ - @PostMapping("/submitBtmType") + @PostMapping("/submit") @ApiOperationSupport(order = 1) - @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆涓氬姟绫诲瀷浼犺緭瀵硅薄") - public R submitBtmType(@Valid @RequestBody BtmTypeDTO dto) { - return ddlService.submitBtmType(dto); + @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "涓氬姟绫诲瀷閾炬帴绫诲瀷浼犺緭瀵硅薄") + public R submitBtmType(@RequestBody BtmAndLinkTypeDdlDTO ddlDTO) { + return ddlService.submit(ddlDTO); } /** @@ -65,4 +70,17 @@ public R<List<DdlTableBO>> 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())); + } } -- Gitblit v1.9.3