From 60e314a94c0d3bea34c8fae19b9f81db9170176d Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 19 十月 2023 16:33:19 +0800
Subject: [PATCH] 分类xmlbug更改
---
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/IDdlService.java | 110 +++++++++++++++++++++++-------------------------------
1 files changed, 47 insertions(+), 63 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 90c842a..c7610fa 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,15 +1,12 @@
package com.vci.ubcs.ddl.service;
-import com.vci.starter.word.bo.WordMergeStartTableDataBO;
import com.vci.ubcs.ddl.bo.DdlTableBO;
-import com.vci.ubcs.ddl.enums.DataBaseEnum;
-import com.vci.ubcs.omd.dto.OmdBtmTypeDTO;
-import com.vci.ubcs.omd.entity.OmdBtmTypeAttribute;
-import com.vci.ubcs.omd.entity.OsModifyAttributeInfoDO;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
-import com.vci.ubcs.omd.vo.OmdBtmTypeVO;
-import com.vci.ubcs.omd.vo.OsLinkTypeAttributeVO;
-import com.vci.ubcs.omd.vo.OsLinkTypeVO;
+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;
+import com.vci.ubcs.omd.vo.LinkTypeAttributeVO;
+import com.vci.ubcs.omd.vo.LinkTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import org.springblade.core.tool.api.R;
@@ -24,37 +21,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 涓氬姟绫诲瀷鐨勪富閿�
@@ -70,6 +36,20 @@
void createDbTablesByOidCollection(Collection<String> oidCollection) throws VciBaseException;
/**
+ * 鑾峰彇鍒涘缓鐨剆ql璇彞涓睘鎬ч儴鍒� -- 涓氬姟绫诲瀷
+ * @param attributeVOList 灞炴�х殑绔嬬
+ * @return sql璇彞
+ */
+ String getCreateSqlByAttributeForBtm(List<BtmTypeAttributeVO> attributeVOList);
+
+ /**
+ * 鑾峰彇鍒涘缓鐨剆ql璇彞涓睘鎬ч儴鍒� -- 閾炬帴绫诲瀷
+ * @param attributeVOList 灞炴�х殑绔嬬
+ * @return sql璇彞
+ */
+ String getCreateSqlByAttributeForLink(List<LinkTypeAttributeVO> attributeVOList);
+
+ /**
* 鎵归噺灏嗕笟鍔＄被鍨嬪垱寤烘暟鎹簱琛�
* @param ids 涓氬姟绫诲瀷鐨勮嫳鏂囧悕绉�
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呭垱寤鸿〃鍑虹幇浜嗛敊璇殑鏃跺�欎細鎶涘嚭寮傚父
@@ -81,28 +61,28 @@
* @param modifyLengthAttrDOList 闇�瑕佷慨鏀圭殑灞炴�у璞�
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- void changeColumnForBtm(List<OmdBtmTypeAttributeVO> modifyLengthAttrDOList) throws VciBaseException;
+ void changeColumnForBtm(List<BtmTypeAttributeVO> modifyLengthAttrDOList) throws VciBaseException;
/**
* 淇敼閾炬帴绫诲瀷涓殑灞炴�у瓧娈电殑闀垮害锛屾敞鎰忓湪鎵ц杩欎釜鏂规硶鏃跺氨浼氬皢浠ュ墠鐨勪簨鍔℃彁浜ゃ��
* @param modifyLengthAttrDOListForLinkType 闇�瑕佷慨鏀圭殑灞炴�у璞�
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- void changeColumnForLink(List<OsLinkTypeAttributeVO> modifyLengthAttrDOListForLinkType) throws VciBaseException;
+ void changeColumnForLink(List<LinkTypeAttributeVO> modifyLengthAttrDOListForLinkType) throws VciBaseException;
/**
* 娣诲姞灞炴�у瓧娈靛埌涓氬姟绫诲瀷涓紝娉ㄦ剰鍦ㄦ墽琛岃繖涓柟娉曟椂灏变細灏嗕互鍓嶇殑浜嬪姟鎻愪氦銆�
* @param addAttrDOList 闇�瑕佹坊鍔犵殑灞炴�у璞�
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- void addColumn2TableForBtm(List<OmdBtmTypeAttributeVO> addAttrDOList) throws VciBaseException;
+ void addColumn2TableForBtm(List<BtmTypeAttributeVO> addAttrDOList) throws VciBaseException;
/**
* 娣诲姞灞炴�у瓧娈靛埌閾炬帴绫诲瀷涓紝娉ㄦ剰鍦ㄦ墽琛岃繖涓柟娉曟椂灏变細灏嗕互鍓嶇殑浜嬪姟鎻愪氦銆�
* @param addAttrDOListForLinkType 闇�瑕佹坊鍔犵殑灞炴�у璞�
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- void addColumn2TableForLink(List<OsLinkTypeAttributeVO> addAttrDOListForLinkType) throws VciBaseException;
+ void addColumn2TableForLink(List<LinkTypeAttributeVO> addAttrDOListForLinkType) throws VciBaseException;
/**
* 鍒ゆ柇琛ㄤ腑鏄惁鏈夋暟鎹�
@@ -132,12 +112,6 @@
*/
void dropColumnByName(String tableName, String columnName);
- /**
- * 鏍￠獙涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬬殑瀵瑰簲鐨勮〃鏍兼槸鍚﹀瓨鍦�
- * @param pkBtmType 涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬬殑琛ㄦ牸
- * @return true琛ㄧず瀛樺湪锛宖alse琛ㄧず涓嶅瓨鍦�
- */
- boolean checkTableExist(String pkBtmType);
/**
* 鏍规嵁琛ㄦ牸鐨勫悕绉板垽鏂〃鏍兼槸鍚﹀瓨鍦�
@@ -146,12 +120,6 @@
*/
boolean checkTableExistByTableName(String tableName);
- /**
- * 鏍￠獙涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬫墍瀵瑰簲鐨勮〃鏍兼槸鍚﹀瓨鍦�
- * @param id 涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬬殑鑻辨枃鍚嶇О
- * @return true琛ㄧず瀛樺湪锛宖alse琛ㄧず涓嶅瓨鍦�
- */
- boolean checkTableExistById(String id);
/**
* 鑾峰彇鏁版嵁搴撳拰涓氬姟绫诲瀷涓殑涓嶅悓鐨勫湴鏂�
@@ -159,14 +127,16 @@
* @param linkTypeVOList 閾炬帴绫诲瀷瀵硅薄锛屾湁灞炴�ф椂闇�瑕佸寘鍚睘鎬�
* @return 涓嶅悓鐨勫湴鏂癸紝姣忎竴涓笟鍔＄被鍨嬫垨鑰呴摼鎺ョ被鍨嬩竴鏉℃暟鎹�
*/
- List<OsModifyAttributeInfoDO> checkDifferent(List<OmdBtmTypeVO> btmTypeVOList, List<OsLinkTypeVO> linkTypeVOList) throws VciBaseException;
+ List<ModifyAttributeInfo> checkDifferent(List<BtmTypeVO> btmTypeVOList, List<LinkTypeVO> linkTypeVOList) throws VciBaseException;
/**
* 娓呯悊涓氬姟绫诲瀷涓拰鏁版嵁搴撻噷涓嶄竴鏍风殑
* @param differentAttributeList 涓嶅悓鐨勫睘鎬х殑鍒楄〃
+ * @param btmTypeVOList 涓氬姟绫诲瀷鏁版嵁
+ * @param linkTypeVOList 閾炬帴绫诲瀷鏁版嵁
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮墽琛屽嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
- void reflexDifferent(List<OsModifyAttributeInfoDO> differentAttributeList) throws VciBaseException;
+ void reflexDifferent(List<ModifyAttributeInfo> differentAttributeList,List<BtmTypeVO> btmTypeVOList, List<LinkTypeVO> linkTypeVOList) throws VciBaseException;
/**
* 鑾峰彇鏁版嵁搴撲腑鎵�鏈夌殑琛ㄦ牸
@@ -209,8 +179,8 @@
* 鎷疯礉鏁版嵁鍒皐ord妯℃澘涓�
* @param tableDataBO 瑕佸啓鍏ョ殑鏁版嵁
* @return word 鏂囦欢璺緞
- */
- String writeDataToWord(WordMergeStartTableDataBO tableDataBO);
+ *//*
+ String writeDataToWord(WordMergeStartTableDataBO tableDataBO);*/
/**
* 鍒ゆ柇鏄惁涓哄吋瀹规�х殑琛紝杩欎簺琛ㄤ笉搴旇琚垱寤哄拰淇敼
@@ -222,10 +192,10 @@
/**
* 鏁版嵁搴撴柊澧炴垨淇敼琛�
- * @param dto 涓氬姟绫诲瀷浼犺緭瀵硅薄
+ * @param ddlDTO 涓氬姟绫诲瀷浼犺緭瀵硅薄
* @return 鎵ц缁撴灉
*/
- R submitBtmType(OmdBtmTypeDTO dto);
+ R submit(BtmAndLinkTypeDdlDTO ddlDTO) throws Throwable;
/**
* 鎸夎〃鍚嶈幏鍙栬〃淇℃伅
@@ -238,5 +208,19 @@
* 鑾峰彇鎵�鏈夎〃淇℃伅
* @return 琛ㄤ俊鎭泦鍚�
*/
- List<DdlTableBO> getAllTableInfo();
+ List<BtmTypeVO> getAllTableInfo();
+
+ /**
+ * 妫�鏌ユ暟鎹〃鏄惁瀛樺湪鏁版嵁锛屼笉瀛樺湪鍒欏垹闄�
+ * @param tableCheckDTOList 闇�瑕佹鏌ョ殑琛ㄩ泦鍚�
+ * @return 妫�鏌ョ粨鏋�
+ */
+ TableCheckResultDTO checkTableHasDataThenDelete(List<TableCheckDTO> tableCheckDTOList);
+
+ /**
+ * 涓鸿〃娣诲姞瀛楁
+ * @param addColumnDTO 娣诲姞鐨勫璞�
+ * @return 鎵ц缁撴灉鏍囪瘑
+ */
+ Boolean addColumnForTable(TableAddColumnDTO addColumnDTO);
}
--
Gitblit v1.9.3