From 100bdd6595cc5c7a447ea6fedd6827f311b37f48 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 04 七月 2023 00:18:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 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 c5f1306..818798d 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
@@ -4,15 +4,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.vci.ubcs.omd.constant.OmdCacheConstant;
import com.vci.ubcs.omd.dto.AttributeDTO;
import com.vci.ubcs.omd.dto.BtmTypeLinkAttributesDTO;
import com.vci.ubcs.omd.entity.Attribute;
import com.vci.ubcs.omd.entity.BtmType;
-import com.vci.ubcs.omd.entity.BtmTypeAttribute;
import com.vci.ubcs.omd.mapper.AttributeMapper;
-import com.vci.ubcs.omd.mapper.BtmTypeMapper;
import com.vci.ubcs.omd.service.IAttributeService;
import com.vci.ubcs.omd.vo.AttributeVO;
import com.vci.ubcs.omd.vo.BtmTypeVO;
@@ -24,14 +21,11 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import javax.annotation.Resource;
import javax.validation.constraints.NotEmpty;
import java.util.ArrayList;
import java.util.Collection;
@@ -82,13 +76,14 @@
*/
@Override
public boolean submit(AttributeDTO dto) {
+ VciBaseUtil.alertNotNull(dto.getId(),"灞炴�х紪鍙�",dto.getName(),"灞炴�у悕绉�",dto.getTypeKey(),"灞炴�х被鍨�",dto.getMaxLength(),"灞炴�ч暱搴�");
if (!Pattern.compile(REGEXP).matcher(dto.getId()).matches()){
- throw new VciBaseException("灞炴�у悕绉皗0}鍙兘鏄嫳鏂�",new Object[]{dto.getId()});
+ 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.getOid())) ? wrapper : wrapper.notIn(Attribute::getOid, dto.getOid()));
if (count > 0L) {
- throw new ServiceException("灞炴�у悕宸插瓨鍦�!");
+ throw new ServiceException("灞炴�х紪鍙峰凡瀛樺湪!");
}
Attribute attribute = AttributeWrapper.build().copyBeforeSave(dto);
CacheUtil.clear(OmdCacheConstant.ATTR_CACHE);
@@ -98,13 +93,17 @@
/**
* 鍒犻櫎
*
- * @param ids 涓婚敭闆嗗悎
+ * @param oids 涓婚敭闆嗗悎
* @return 鎵ц缁撴灉
*/
@Override
- public boolean removeAttrs(String ids) {
- List<Long> idList = Func.toLongList(ids);
- return !deleteLogic(idList) && removeByIds(idList);
+ public boolean removeAttrs(String oids) {
+ List<String> oidList = Func.toStrList(",", oids);
+ List<Attribute> list = list(Wrappers.<Attribute>query().lambda().in(Attribute::getOid, oidList));
+ if (!CollectionUtils.isEmpty(list)){
+ baseMapper.delete(Wrappers.<Attribute>query().lambda().in(Attribute::getOid,list.stream().map(Attribute::getOid).collect(Collectors.toList())));
+ }
+ return true;
}
/**
@@ -116,15 +115,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);
}
/**
@@ -169,7 +163,7 @@
}
/**
- * 鏍规嵁缂栧彿闆嗗悎鑾峰彇灞炴�ф暟鎹璞�
+ * 鏍规嵁缂栧彿闆嗗悎鑾峰彇灞炴�ф暟鎹璞�,鍏朵腑榛樿鐨勫睘鎬у簲褰撳墧闄�
* @param attributeIdCollection 灞炴�х殑缂栧彿闆嗗悎
* @return 灞炴�ф暟鎹璞″垪琛紝濡傛灉鏈変笉瀛樺湪鐨勪笉浼氳繑鍥烇紝鍏ㄩ儴涓嶅瓨鍦ㄧ殑鍒欒繑鍥炵┖鍒楄〃
* @throws VciBaseException mybatis鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
@@ -248,4 +242,20 @@
}
return pass;
}
+
+ /**
+ * 鍗曚釜鍒犻櫎
+ *
+ * @param oid 涓婚敭
+ * @return 鎵ц缁撴灉
+ */
+ @Override
+ public R remove(String oid) {
+ List<BtmTypeVO> vos = applyRange(oid);
+ if (CollectionUtils.isEmpty(vos)){
+ return R.status(removeAttrs(oid));
+ }else {
+ return R.fail("璇ュ睘鎬у凡琚娇鐢紝涓嶅厑璁稿垹闄�");
+ }
+ }
}
--
Gitblit v1.9.3