From f02c15e434ffbc248b55d9d14e104c7d8556062b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 28 四月 2023 11:42:42 +0800
Subject: [PATCH] 1、主要完成主题库定义的模板分类的接口移植。 2、主要对界面字数多了换行问题进行了修改。
---
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java | 75 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
index 4889862..561ae46 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
@@ -1,7 +1,11 @@
package com.vci.ubcs.ddl.service.impl;
+<<<<<<< HEAD
import com.alibaba.nacos.client.naming.NacosNamingService;
+
+=======
import com.vci.starter.web.util.VciBaseUtil;
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
import com.vci.starter.word.bo.WordMergeStartTableDataBO;
import com.vci.ubcs.ddl.bo.DdlTableBO;
import com.vci.ubcs.ddl.bo.DdlTableInDataBaseBO;
@@ -12,14 +16,15 @@
import com.vci.ubcs.ddl.properties.DdlExportWordFieldProperties;
import com.vci.ubcs.ddl.properties.DdlPropertise;
import com.vci.ubcs.ddl.service.IDdlService;
-import com.vci.ubcs.omd.cache.OmdBtmTypeCache;
-import com.vci.ubcs.omd.dto.OmdBtmTypeDTO;
-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.cache.BtmTypeCache;
+import com.vci.ubcs.omd.dto.BtmTypeDTO;
+import com.vci.ubcs.omd.entity.ModifyAttributeInfoDO;
+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 com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
@@ -89,7 +94,7 @@
@Override
public String getTableNameByBtmTypeOid(String pkBtmType) {
VciBaseUtil.alertNotNull(pkBtmType, "涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬬殑涓婚敭");
- OmdBtmTypeVO btmType = OmdBtmTypeCache.getDetail(pkBtmType);
+ BtmTypeVO btmType = BtmTypeCache.getDetail(pkBtmType);
String tableName = "";
if (btmType == null || StringUtils.isBlank(btmType.getOid())) {
/*OsLinkTypeDO linkTypeDO = linkTypeDOMapper.selectByPrimaryKey(pkBtmType.trim());
@@ -113,7 +118,7 @@
@Override
public String getTableNameByBtmTypeId(String id) {
VciBaseUtil.alertNotNull(id, "涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬬殑鑻辨枃鍚嶇О");
- List<OmdBtmTypeVO> btmTypeList = OmdBtmTypeCache.selectByIdCollection(VciBaseUtil.str2List(id));
+ List<BtmTypeVO> btmTypeList = BtmTypeCache.selectByIdCollection(VciBaseUtil.str2List(id));
String tableName = "";
if (CollectionUtils.isEmpty(btmTypeList)) {
/*List<OsLinkTypeDO> linkTypeDOList = linkTypeDOMapper.selectByIdCollection(VciBaseUtil.str2List(id));
@@ -161,7 +166,7 @@
@Override
public void createDbTablesByOidCollection(Collection<String> oidCollection) throws VciBaseException {
VciBaseUtil.alertCollectionNotNull("涓氬姟绫诲瀷/閾炬帴绫诲瀷鐨勪富閿泦鍚�", oidCollection);
- List<OmdBtmTypeVO> btmTypeVOList = OmdBtmTypeCache.listBtmTypeByOidCollection(oidCollection);
+ List<BtmTypeVO> btmTypeVOList = BtmTypeCache.listBtmTypeByOidCollection(oidCollection);
// List<OsLinkTypeVO> linkTypeVOList = linkTypeService.listLinkTypeByOidCollection(oidCollection);
if (!CollectionUtils.isEmpty(btmTypeVOList)) {
//璇存槑鏄笟鍔＄被鍨�
@@ -181,7 +186,7 @@
* @param btmTypeVO 涓氬姟绫诲瀷鐨勬樉绀哄璞�
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- private void createDbTableForBtm(OmdBtmTypeVO btmTypeVO) throws VciBaseException {
+ private void createDbTableForBtm(BtmTypeVO btmTypeVO) throws VciBaseException {
VciBaseUtil.alertNotNull(btmTypeVO, "瑕佸垱寤鸿〃鏍兼墍灞炵殑涓氬姟绫诲瀷", btmTypeVO.getTableName(), "涓氬姟绫诲瀷鐨勮〃鏍煎悕绉�");
if (btmTypeVO.isViewFlag() && StringUtils.isNotBlank(btmTypeVO.getViewCreateSql())) {
//璇存槑鏄鍥�
@@ -210,7 +215,7 @@
@Override
public void createDbTablesById(String ids) throws VciBaseException {
VciBaseUtil.alertNotNull(ids, "涓氬姟绫诲瀷/閾炬帴绫诲瀷鐨勮嫳鏂囬泦鍚�");
- List<OmdBtmTypeVO> btmTypeVOList = OmdBtmTypeCache.selectByIdCollection(VciBaseUtil.str2List(ids));
+ List<BtmTypeVO> btmTypeVOList = BtmTypeCache.selectByIdCollection(VciBaseUtil.str2List(ids));
// List<OsLinkTypeVO> linkTypeVOList = linkTypeService.listLinkTypeByIdCollection(VciBaseUtil.str2List(ids));
if (!CollectionUtils.isEmpty(btmTypeVOList)) {
//璇存槑鏄笟鍔＄被鍨�
@@ -232,11 +237,11 @@
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public void changeColumnForBtm(List<OmdBtmTypeAttributeVO> modifyLengthAttrVOList) throws VciBaseException {
+ public void changeColumnForBtm(List<BtmTypeAttributeVO> modifyLengthAttrVOList) throws VciBaseException {
VciBaseUtil.alertCollectionNotNull("瑕佷慨鏀归暱搴︾殑灞炴�ч泦", modifyLengthAttrVOList);
- Map<String, List<OmdBtmTypeAttributeVO>> btmTypeHasAttributeVOMap = modifyLengthAttrVOList.stream().collect(Collectors.groupingBy(OmdBtmTypeAttributeVO::getPkBtmType));
+ Map<String, List<BtmTypeAttributeVO>> btmTypeHasAttributeVOMap = modifyLengthAttrVOList.stream().collect(Collectors.groupingBy(BtmTypeAttributeVO::getPkBtmType));
btmTypeHasAttributeVOMap.forEach((k, v) -> {
- OmdBtmTypeVO btmTypeVO = OmdBtmTypeCache.getDetail(k);
+ BtmTypeVO btmTypeVO = BtmTypeCache.getDetail(k);
if (btmTypeVO == null || StringUtils.isBlank(btmTypeVO.getOid())) {
throw new VciBaseException("瑕佷慨鏀瑰睘鎬у垪闀垮害鐨勪笟鍔＄被鍨嬩笉瀛樺湪");
}
@@ -259,7 +264,7 @@
* @param tableName 琛ㄦ牸鐨勫悕绉�
* @param attributeVOList 瑕佹坊鍔犵殑灞炴�у瓧娈�
*/
- private void changeColumnsForTable(String tableName, List<OmdBtmTypeAttributeVO> attributeVOList) {
+ private void changeColumnsForTable(String tableName, List<BtmTypeAttributeVO> attributeVOList) {
String attributeSql = dllMapper.getCreateSqlByAttributeForBtm(attributeVOList);
//鍏堝垽鏂〃鏍兼槸鍚﹀瓨鍦�
boolean tableExist = false;
@@ -282,7 +287,7 @@
* @param tableName 琛ㄦ牸鍚嶇О
* @param attributeVOList 灞炴�у璞″垪琛�
*/
- private void commentColumnsForTable(String tableName, List<OmdBtmTypeAttributeVO> attributeVOList) {
+ private void commentColumnsForTable(String tableName, List<BtmTypeAttributeVO> attributeVOList) {
if (StringUtils.isNotBlank(tableName) && !CollectionUtils.isEmpty(attributeVOList)) {
attributeVOList.stream().forEach(s -> {
ddlMapper.commentColumnTable(tableName, s.getId(), s.getName());
@@ -297,7 +302,7 @@
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public void changeColumnForLink(List<OsLinkTypeAttributeVO> modifyLengthAttrDOListForLinkType) throws VciBaseException {
+ public void changeColumnForLink(List<LinkTypeAttributeVO> modifyLengthAttrDOListForLinkType) throws VciBaseException {
}
@@ -308,13 +313,13 @@
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public void addColumn2TableForBtm(List<OmdBtmTypeAttributeVO> addAttrDOList) throws VciBaseException {
+ public void addColumn2TableForBtm(List<BtmTypeAttributeVO> addAttrDOList) throws VciBaseException {
VciBaseUtil.alertCollectionNotNull("瑕佹坊鍔犲埌鏁版嵁搴撹〃涓殑灞炴�ч泦", addAttrDOList);
- Map<String, List<OmdBtmTypeAttributeVO>> btmTypeHasAttributeVOMap = addAttrDOList.stream().collect(Collectors.groupingBy(OmdBtmTypeAttributeVO::getPkBtmType));
+ Map<String, List<BtmTypeAttributeVO>> btmTypeHasAttributeVOMap = addAttrDOList.stream().collect(Collectors.groupingBy(BtmTypeAttributeVO::getPkBtmType));
btmTypeHasAttributeVOMap.forEach((k, v) -> {
- OmdBtmTypeVO btmTypeVO = OmdBtmTypeCache.getDetail(k);
+ BtmTypeVO btmTypeVO = BtmTypeCache.getDetail(k);
if (btmTypeVO == null || StringUtils.isBlank(btmTypeVO.getOid())) {
- throw new com.vci.starter.web.exception.VciBaseException("瑕佷慨鏀瑰睘鎬у垪闀垮害鐨勪笟鍔＄被鍨嬩笉瀛樺湪");
+ throw new VciBaseException("瑕佷慨鏀瑰睘鎬у垪闀垮害鐨勪笟鍔＄被鍨嬩笉瀛樺湪");
}
if (!isCompatibilityTable(btmTypeVO.getId(), null)) {
addColumnForTable(btmTypeVO.getTableName(), v);
@@ -327,13 +332,17 @@
*
* @param tableName 琛ㄦ牸鍚嶇О
* @param attributeVOList 灞炴�х殑鏄剧ず瀵硅薄
- * @throws com.vci.starter.web.exception.VciBaseException 鎵ц鎴栬�呰幏鍙杝ql璇彞鐨勬椂鍊欏嚭鐜伴敊璇細鎶涘嚭寮傚父
+ * @throws VciBaseException 鎵ц鎴栬�呰幏鍙杝ql璇彞鐨勬椂鍊欏嚭鐜伴敊璇細鎶涘嚭寮傚父
*/
- private void addColumnForTable(String tableName, List<OmdBtmTypeAttributeVO> attributeVOList) {
+<<<<<<< HEAD
+ private void addColumnForTable(String tableName, List<OmdBtmTypeAttributeVO> attributeVOList) throws VciBaseException{
+=======
+ private void addColumnForTable(String tableName, List<BtmTypeAttributeVO> attributeVOList) {
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
String attributeSql = dllMapper.getCreateSqlByAttributeForBtm(attributeVOList);
//鍏堝垽鏂〃鏍兼槸鍚﹀瓨鍦�
if (!checkTableExistByTableName(tableName)) {
- OmdBtmTypeAttributeVO attributeVO = attributeVOList.get(0);
+ BtmTypeAttributeVO attributeVO = attributeVOList.get(0);
createDbTables(attributeVO.getPkBtmType());
} else {
ddlMapper.addColumn2TableBySql(tableName, attributeSql);
@@ -348,7 +357,7 @@
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public void addColumn2TableForLink(List<OsLinkTypeAttributeVO> addAttrDOListForLinkType) throws VciBaseException {
+ public void addColumn2TableForLink(List<LinkTypeAttributeVO> addAttrDOListForLinkType) throws VciBaseException {
}
@@ -449,7 +458,7 @@
* @return 涓嶅悓鐨勫湴鏂癸紝姣忎竴涓笟鍔＄被鍨嬫垨鑰呴摼鎺ョ被鍨嬩竴鏉℃暟鎹�
*/
@Override
- public List<OsModifyAttributeInfoDO> checkDifferent(List<OmdBtmTypeVO> btmTypeVOList, List<OsLinkTypeVO> linkTypeVOList) throws VciBaseException {
+ public List<ModifyAttributeInfoDO> checkDifferent(List<BtmTypeVO> btmTypeVOList, List<LinkTypeVO> linkTypeVOList) throws VciBaseException {
return null;
}
@@ -460,7 +469,7 @@
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮墽琛屽嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public void reflexDifferent(List<OsModifyAttributeInfoDO> differentAttributeList) throws VciBaseException {
+ public void reflexDifferent(List<ModifyAttributeInfoDO> differentAttributeList) throws VciBaseException {
}
@@ -556,9 +565,9 @@
* @return 鎵ц缁撴灉
*/
@Override
- public R submitBtmType(OmdBtmTypeDTO dto) {
+ public R submitBtmType(BtmTypeDTO dto) {
VciBaseUtil.alertNotNull(dto, "涓氬姟绫诲瀷", dto.getAttributesDTOList(), "涓氬姟绫诲瀷灞炴��");
- OmdBtmTypeVO btmTypeVO = Objects.requireNonNull(BeanUtil.copy(dto, OmdBtmTypeVO.class));
+ BtmTypeVO btmTypeVO = Objects.requireNonNull(BeanUtil.copy(dto, BtmTypeVO.class));
if (Func.isNotBlank(dto.getTableName())) {
checkModifyOrCreateTable(btmTypeVO);
} else {
@@ -580,12 +589,12 @@
*
* @param btmTypeVO 涓氬姟绫诲瀷
*/
- private void checkModifyOrCreateTable(OmdBtmTypeVO btmTypeVO) {
+ private void checkModifyOrCreateTable(BtmTypeVO btmTypeVO) {
if (checkTableExistByTableName(btmTypeVO.getTableName())) {
// 琛ㄥ凡瀛樺湪锛屾牎楠屽睘鎬�
- List<OmdBtmTypeVO> vos = new ArrayList<>();
+ List<BtmTypeVO> vos = new ArrayList<>();
vos.add(btmTypeVO);
- List<OsModifyAttributeInfoDO> differentAttributeList = checkDifferent(vos, null);
+ List<ModifyAttributeInfoDO> differentAttributeList = checkDifferent(vos, null);
if (CollectionUtils.isEmpty(differentAttributeList)) {
// 鍙互鐩存帴鍒犻櫎鍐嶅垱寤�
dropTableByName(btmTypeVO.getTableName());
--
Gitblit v1.9.3