From 03ab24af158dba0d506569d7e7cf22929ae67296 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 31 一月 2024 16:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/IDdlService.java |   72 ++++++++++++-----------------------
 1 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/IDdlService.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/IDdlService.java
index ca66ffc..e59096f 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/IDdlService.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/IDdlService.java
@@ -1,8 +1,7 @@
 package com.vci.ubcs.ddl.service;
 
 import com.vci.ubcs.ddl.bo.DdlTableBO;
-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.BtmTypeAttributeVO;
 import com.vci.ubcs.omd.vo.BtmTypeVO;
@@ -11,6 +10,7 @@
 import com.vci.ubcs.starter.exception.VciBaseException;
 import org.springblade.core.tool.api.R;
 
+import java.rmi.ServerException;
 import java.util.Collection;
 import java.util.List;
 
@@ -22,37 +22,6 @@
  * @date 2023/4/24
  */
 public interface IDdlService {
-
-	/**
-	 * 鏍¢獙涓氬姟绫诲瀷鐨勬暟鎹簱琛ㄤ腑鏄惁鏈夋暟鎹�
-	 * @param pkBtmType 涓氬姟绫诲瀷鐨勪富閿�
-	 * @return true琛ㄧず鏈夋暟鎹紝false琛ㄧず娌℃湁鏁版嵁
-	 * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
-	 */
-	boolean checkTableHasData(String pkBtmType) throws VciBaseException;
-
-	/**
-	 * 鏍规嵁涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬬殑涓婚敭鑾峰彇鏁版嵁搴撹〃鏍肩殑鍚嶇О
-	 * @param pkBtmType  涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬬殑涓婚敭
-	 * @return 鏁版嵁搴撹〃鍚嶇О
-	 */
-	String getTableNameByBtmTypeOid(String pkBtmType);
-
-	/**
-	 * 鏍规嵁涓氬姟绫诲瀷鑾峰彇閾炬帴绫诲瀷鐨勮嫳鏂囧悕绉拌幏鍙栨暟鎹簱琛ㄦ牸鐨勫悕绉�
-	 * @param id 涓氬姟绫诲瀷鑾峰彇閾炬帴绫诲瀷鐨勮嫳鏂囧悕绉�
-	 * @return 鏁版嵁搴撹〃鍚嶇О
-	 */
-	String getTableNameByBtmTypeId(String id);
-
-	/**
-	 * 鏍¢獙涓氬姟绫诲瀷鐨勬暟鎹簱琛ㄤ腑鏄惁鏈夋暟鎹�
-	 * @param id 涓氬姟绫诲瀷鐨勮嫳鏂囧悕绉�
-	 * @return true琛ㄧず鏈夋暟鎹紝false琛ㄧず娌℃湁鏁版嵁
-	 * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
-	 */
-	boolean checkTableHasDataById(String id) throws VciBaseException;
-
 	/**
 	 * 鎵归噺灏嗕笟鍔$被鍨嬪垱寤烘暟鎹簱琛�
 	 * @param pkBtmTypes 涓氬姟绫诲瀷鐨勪富閿�
@@ -68,11 +37,18 @@
 	void createDbTablesByOidCollection(Collection<String> oidCollection) throws VciBaseException;
 
 	/**
-	 * 鑾峰彇鍒涘缓鐨剆ql璇彞涓睘鎬ч儴鍒�
+	 * 鑾峰彇鍒涘缓鐨剆ql璇彞涓睘鎬ч儴鍒� -- 涓氬姟绫诲瀷
 	 * @param attributeVOList 灞炴�х殑绔嬬
 	 * @return sql璇彞
 	 */
 	String getCreateSqlByAttributeForBtm(List<BtmTypeAttributeVO> attributeVOList);
+
+	/**
+	 * 鑾峰彇鍒涘缓鐨剆ql璇彞涓睘鎬ч儴鍒� -- 閾炬帴绫诲瀷
+	 * @param attributeVOList 灞炴�х殑绔嬬
+	 * @return sql璇彞
+	 */
+	String getCreateSqlByAttributeForLink(List<LinkTypeAttributeVO> attributeVOList);
 
 	/**
 	 * 鎵归噺灏嗕笟鍔$被鍨嬪垱寤烘暟鎹簱琛�
@@ -137,12 +113,6 @@
 	 */
 	void dropColumnByName(String tableName, String columnName);
 
-	/**
-	 * 鏍¢獙涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬬殑瀵瑰簲鐨勮〃鏍兼槸鍚﹀瓨鍦�
-	 * @param pkBtmType 涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬬殑琛ㄦ牸
-	 * @return true琛ㄧず瀛樺湪锛宖alse琛ㄧず涓嶅瓨鍦�
-	 */
-	boolean checkTableExist(String pkBtmType);
 
 	/**
 	 * 鏍规嵁琛ㄦ牸鐨勫悕绉板垽鏂〃鏍兼槸鍚﹀瓨鍦�
@@ -151,12 +121,6 @@
 	 */
 	boolean checkTableExistByTableName(String tableName);
 
-	/**
-	 * 鏍¢獙涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬫墍瀵瑰簲鐨勮〃鏍兼槸鍚﹀瓨鍦�
-	 * @param id 涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬬殑鑻辨枃鍚嶇О
-	 * @return true琛ㄧず瀛樺湪锛宖alse琛ㄧず涓嶅瓨鍦�
-	 */
-	boolean checkTableExistById(String id);
 
 	/**
 	 * 鑾峰彇鏁版嵁搴撳拰涓氬姟绫诲瀷涓殑涓嶅悓鐨勫湴鏂�
@@ -232,7 +196,7 @@
 	 * @param ddlDTO 涓氬姟绫诲瀷浼犺緭瀵硅薄
 	 * @return 鎵ц缁撴灉
 	 */
-	R submit(BtmAndLinkTypeDdlDTO ddlDTO);
+	R submit(BtmAndLinkTypeDdlDTO ddlDTO) throws ServerException;
 
 	/**
 	 * 鎸夎〃鍚嶈幏鍙栬〃淇℃伅
@@ -246,4 +210,18 @@
 	 * @return 琛ㄤ俊鎭泦鍚�
 	 */
 	List<BtmTypeVO> getAllTableInfo();
+
+	/**
+	 * 妫�鏌ユ暟鎹〃鏄惁瀛樺湪鏁版嵁锛屼笉瀛樺湪鍒欏垹闄�
+	 * @param tableCheckDTOList 闇�瑕佹鏌ョ殑琛ㄩ泦鍚�
+	 * @return 妫�鏌ョ粨鏋�
+	 */
+	TableCheckResultDTO checkTableHasDataThenDelete(List<TableCheckDTO> tableCheckDTOList);
+
+	/**
+	 * 涓鸿〃娣诲姞瀛楁
+	 * @param addColumnDTO 娣诲姞鐨勫璞�
+	 * @return 鎵ц缁撴灉鏍囪瘑
+	 */
+	Boolean addColumnForTable(TableAddColumnDTO addColumnDTO);
 }

--
Gitblit v1.9.3