From aedc56b3c034ef33811ca873debee68d6f963a88 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期二, 04 七月 2023 10:12:57 +0800
Subject: [PATCH] 更改领域值字段为bizDomain
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java
index 1451bc7..e2aa9f1 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LinkTypeServiceImpl.java
@@ -395,7 +395,7 @@
LinkType linkTypeDO = new LinkType();
BeanUtil.copy(linkTypeVO, linkTypeDO);
if (StringUtils.isBlank(linkTypeDO.getTableName())){
- linkTypeDO.setTableName(getTableName(linkTypeDO.getId(),linkTypeDO.getDomain()));
+ linkTypeDO.setTableName(getTableName(linkTypeDO.getId(),linkTypeDO.getBizDomain()));
}
String creator = AuthUtil.getUserAccount();
Date now = new Date();
@@ -411,7 +411,7 @@
List<LinkTypeAttributeVO> attributes = typeVO.getAttributes();
attributes.addAll(linkTypeAttributeService.getDefaultAttributes(typeVO));
typeVO.setAttributes(attributes);
- R r = DomainRepeater.submitLinkType(typeVO.getDomain(), typeVO);
+ R r = DomainRepeater.submitLinkType(typeVO.getBizDomain(), typeVO);
if (!r.isSuccess()){
dataSourceTransactionManager.rollback(transaction);
}else {
@@ -571,7 +571,7 @@
attributes.addAll(defaultAttributes);
linkTypeVO.setAttributes(attributes);
BtmAndLinkTypeDdlDTO ddlDTO = new BtmAndLinkTypeDdlDTO();
- DomainRepeater.checkDifferent(ddlDTO,linkTypeVO.getDomain());
+ DomainRepeater.checkDifferent(ddlDTO,linkTypeVO.getBizDomain());
dataSourceTransactionManager.commit(transaction);
}
} catch (Throwable e){
@@ -625,10 +625,10 @@
List<TableCheckDTO> checkList = linkTypeDOList.stream().map(linkType -> {
TableCheckDTO tableCheckDTO = new TableCheckDTO();
tableCheckDTO.setBtmName(linkType.getId());
- tableCheckDTO.setTableName(getTableName(linkType.getId(),linkType.getDomain()));
+ tableCheckDTO.setTableName(getTableName(linkType.getId(),linkType.getBizDomain()));
tableCheckDTO.setCheckTableHasData(true);
tableCheckDTO.setNeedDelete(true);
- tableCheckDTO.setDomain(linkType.getDomain());
+ tableCheckDTO.setDomain(linkType.getBizDomain());
return tableCheckDTO;
}).collect(Collectors.toList());
R result = DomainRepeater.checkTableHasDataByTableNameThenDrop(checkList);
@@ -877,7 +877,7 @@
try {
Map<String, String> domain = Optional.ofNullable(DomainRepeater.getDomain()).orElseGet(ArrayList::new).stream().collect(Collectors.toMap(DomainVO::getValue, DomainVO::getLabel));
List<LinkTypeVO> vos = LinkTypeWrapper.build().listEntityVO(baseMapper.selectAll(), null);
- Map<String, List<LinkTypeVO>> domainMap = vos.stream().collect(Collectors.groupingBy(LinkTypeVO::getDomain));
+ Map<String, List<LinkTypeVO>> domainMap = vos.stream().collect(Collectors.groupingBy(LinkTypeVO::getBizDomain));
List<BtmTreeVO> treeList = new ArrayList<>();
domainMap.forEach((k,v)-> {
if (domain.containsKey(k)){
--
Gitblit v1.9.3