From ca6ec80da1bffc13e67b2ce5e34ff67f485cc74f Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期二, 16 五月 2023 17:51:56 +0800
Subject: [PATCH] 业务类型新增按钮联调修正。 业务类型弹出表单细节修正。
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
index 70559e2..c12be50 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
@@ -6,6 +6,7 @@
import com.alibaba.nacos.api.exception.NacosException;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.constant.BtmTypeFieldConstant;
import com.vci.ubcs.omd.dto.BtmAndLinkTypeDdlDTO;
import com.vci.ubcs.omd.entity.Attribute;
@@ -13,7 +14,7 @@
import com.vci.ubcs.omd.service.IAttributeService;
import com.vci.ubcs.omd.service.IBtmTypeAttributeService;
import com.vci.ubcs.omd.service.IModifyAttributeService;
-import com.vci.ubcs.omd.vo.BtmTypeTreeVO;
+import com.vci.ubcs.omd.vo.*;
import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
import com.vci.ubcs.omd.wrapper.ModifyAttributeWrapper;
import com.vci.ubcs.starter.web.constant.OmdRegExpConstant;
@@ -24,9 +25,6 @@
import com.vci.ubcs.omd.entity.ModifyAttributeInfo;
import com.vci.ubcs.omd.mapper.BtmTypeMapper;
import com.vci.ubcs.omd.service.IBtmTypeService;
-import com.vci.ubcs.omd.vo.BtmTypeVO;
-import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
-import com.vci.ubcs.omd.vo.LinkTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
@@ -496,6 +494,7 @@
btmTypeDO.setTableName(getTableName(btmTypeDO.getId(),btmTypeDO.getDomain()));
}
// 娣诲姞灞炴��
+ btmTypeDTO.setOid(btmTypeDO.getOid());
afterAttributes = addAttributeForBtm(btmTypeDTO);
baseMapper.insert(btmTypeDO);
}else {
@@ -620,9 +619,6 @@
// 闇�瑕佹帶鍒跺瘑绾�
btmTypeDTO.setAttributes(addAttributeByFieldMap(btmTypeDTO.getAttributes(),BtmTypeFieldConstant.SECRET_MANAGE_FIELD_MAP));
}
- if (StringUtils.isBlank(btmTypeDTO.getOid())) {
- btmTypeDTO.setOid(VciBaseUtil.getPk());
- }
}
@Override
public boolean deleteLogic(@NotEmpty List<Long> ids) {
@@ -642,18 +638,21 @@
@Override
public List<BtmTypeTreeVO> treeDomain() {
try {
- List<String> domain = DomainRepeater.getDomain();
+ Map<String, String> domain = Optional.ofNullable(DomainRepeater.getDomain()).orElseGet(ArrayList::new).stream().collect(Collectors.toMap(s -> s.getValue(), t -> t.getLabel()));
List<BtmTypeVO> vos = BtmTypeWrapper.build().listEntityVO(baseMapper.selectAll());
Map<String, List<BtmTypeVO>> domainMap = vos.stream().collect(Collectors.groupingBy(BtmTypeVO::getDomain));
List<BtmTypeTreeVO> treeList = new ArrayList<>();
domainMap.forEach((k,v)-> {
- if (domain.contains(k)){
+ if (domain.containsKey(k)){
+ String label = domain.get(k);
BtmTypeTreeVO parent = new BtmTypeTreeVO();
- parent.setName(k);
+ parent.setName(label);
+ parent.setId(k);
parent.setChildList(v.stream().map(s -> {
BtmTypeTreeVO child = new BtmTypeTreeVO();
child.setOid(s.getOid());
child.setName(s.getId() + " " + (s.getName() == null ? "" : s.getName()));
+ child.setId(s.getId());
return child;
}).collect(Collectors.toList()));
treeList.add(parent);
@@ -675,7 +674,7 @@
public List<BtmTypeVO> getFromTable(String domain) {
VciBaseUtil.alertNotNull(domain,"棰嗗煙鍊�");
try {
- if (!DomainRepeater.getDomain().contains(domain)){
+ if (!DomainRepeater.getDomain().stream().collect(Collectors.toMap(DomainVO::getValue, DomainVO::getLabel)).containsKey(domain)){
return null;
}
R result = DomainRepeater.getFromTable(domain);
@@ -737,7 +736,9 @@
Attribute attribute = new Attribute();
attribute.setKey(attr.getId());
attribute.setLabel(attr.getName());
- attribute.setDictKey(attr.getAttrDataType());
+ attribute.setTypeCode("attributeType");
+ attribute.setTypeKey(attr.getAttrDataType());
+// attribute.setDictKey(attr.getAttrDataType());
attribute.setMaxLength(attr.getAttributeLength());
attribute.setPrecision(attr.getPrecisionLength());
attribute.setDescription(attr.getDescription());
--
Gitblit v1.9.3