From 1d5845e4b98f9c69833e54ef69253d85d0c69fe8 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 09 六月 2023 15:10:59 +0800
Subject: [PATCH] 1、对MDM服务的接口测试更改。 2、增加sys的菜单接口用于通过业务类型获取相关的界面按钮。
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
index 03f8eaf..d98174c 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
@@ -19,7 +19,6 @@
import com.vci.ubcs.omd.wrapper.AttributeWrapper;
import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
import com.vci.ubcs.starter.web.constant.OmdRegExpConstant;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
@@ -53,9 +52,6 @@
private final String REGEXP = "^[A-Za-z]+$";
- @Resource
- private BtmTypeMapper btmTypeMapper;
-
@Override
public boolean deleteLogic(@NotEmpty List<Long> ids) {
return false;
@@ -86,17 +82,17 @@
*/
@Override
public boolean submit(AttributeDTO dto) {
- if (Pattern.compile(REGEXP).matcher(dto.getId()).matches()){
+ if (!Pattern.compile(REGEXP).matcher(dto.getId()).matches()){
throw new VciBaseException("灞炴�у悕绉皗0}鍙兘鏄嫳鏂�",new Object[]{dto.getId()});
}
LambdaQueryWrapper<Attribute> wrapper = Wrappers.<Attribute>query().lambda().eq(Attribute::getId, dto.getId());
- Long count = baseMapper.selectCount((Func.isEmpty(dto.getId())) ? wrapper : wrapper.notIn(Attribute::getId, dto.getId()));
+ Long count = baseMapper.selectCount((Func.isEmpty(dto.getOid())) ? wrapper : wrapper.notIn(Attribute::getOid, dto.getOid()));
if (count > 0L) {
throw new ServiceException("灞炴�у悕宸插瓨鍦�!");
}
- Attribute omdAttribute = BeanUtil.copy(dto, Attribute.class);
+ Attribute attribute = AttributeWrapper.build().copyBeforeSave(dto);
CacheUtil.clear(OmdCacheConstant.ATTR_CACHE);
- return saveOrUpdate(omdAttribute);
+ return saveOrUpdate(attribute);
}
/**
@@ -120,15 +116,10 @@
@Override
public List<BtmTypeVO> applyRange(String oid) {
List<BtmType> btmTypes = baseMapper.selectApplyRange(oid);
- if (!CollectionUtils.isEmpty(btmTypes)){
- return btmTypes.stream().map(btm -> {
- BtmTypeVO vo = new BtmTypeVO();
- vo.setId(btm.getId());
- vo.setName(btm.getName());
- return vo;
- }).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(btmTypes)){
+ return null;
}
- return null;
+ return BtmTypeWrapper.build().listEntityVO(btmTypes);
}
/**
--
Gitblit v1.9.3