From 3cb0cef6f7189dcbb537df52cef5921d1d2c3cd9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 26 四月 2023 00:12:23 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdAttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
similarity index 76%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdAttributeServiceImpl.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
index e993f2f..c61c7f3 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdAttributeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
@@ -4,13 +4,13 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.omd.constant.OmdCacheConstant;
-import com.vci.ubcs.omd.dto.OmdAttributeDTO;
-import com.vci.ubcs.omd.dto.OmdBtmTypeLinkAttributesDTO;
-import com.vci.ubcs.omd.entity.OmdAttribute;
-import com.vci.ubcs.omd.mapper.OmdAttributeMapper;
-import com.vci.ubcs.omd.service.IOmdAttributeService;
-import com.vci.ubcs.omd.vo.OmdAttributeVO;
-import com.vci.ubcs.omd.wrapper.OmdAttributeWrapper;
+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.mapper.AttributeMapper;
+import com.vci.ubcs.omd.service.IAttributeService;
+import com.vci.ubcs.omd.vo.AttributeVO;
+import com.vci.ubcs.omd.wrapper.AttributeWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.cache.utils.CacheUtil;
@@ -36,7 +36,7 @@
* @date 2023/4/3
*/
@Service
-public class OmdAttributeServiceImpl extends ServiceImpl<OmdAttributeMapper, OmdAttribute> implements IOmdAttributeService {
+public class AttributeServiceImpl extends ServiceImpl<AttributeMapper, Attribute> implements IAttributeService {
@Override
public boolean deleteLogic(@NotEmpty List<Long> ids) {
@@ -55,9 +55,9 @@
* @return 鍏冩暟鎹樉绀哄璞�
*/
@Override
- public OmdAttributeVO getAttributeDetail(Long id) {
+ public AttributeVO getAttributeDetail(Long id) {
Func.requireNotNull(id,"涓婚敭涓嶈兘涓虹┖");
- return OmdAttributeWrapper.build().entityVO(baseMapper.selectByPrimaryKey(id));
+ return AttributeWrapper.build().entityVO(baseMapper.selectByPrimaryKey(id));
}
/**
@@ -67,14 +67,14 @@
* @return 鎵ц缁撴灉
*/
@Override
- public boolean submit(OmdAttributeDTO dto) {
- LambdaQueryWrapper<OmdAttribute> wrapper = Wrappers.<OmdAttribute>query().lambda().eq(OmdAttribute::getKey, dto.getKey());
- Long count = baseMapper.selectCount((Func.isEmpty(dto.getId())) ? wrapper : wrapper.notIn(OmdAttribute::getId, dto.getId()));
+ public boolean submit(AttributeDTO dto) {
+ LambdaQueryWrapper<Attribute> wrapper = Wrappers.<Attribute>query().lambda().eq(Attribute::getKey, dto.getKey());
+ Long count = baseMapper.selectCount((Func.isEmpty(dto.getId())) ? wrapper : wrapper.notIn(Attribute::getId, dto.getId()));
if (count > 0L) {
throw new ServiceException("灞炴�у悕宸插瓨鍦�!");
}
dto.setIsDeleted(BladeConstant.DB_NOT_DELETED);
- OmdAttribute omdAttribute = BeanUtil.copy(dto, OmdAttribute.class);
+ Attribute omdAttribute = BeanUtil.copy(dto, Attribute.class);
CacheUtil.clear(OmdCacheConstant.ATTR_CACHE);
return saveOrUpdate(omdAttribute);
}
@@ -111,7 +111,7 @@
*/
@Override
public boolean checkAttributeExists(Collection<String> keyCollections) throws VciBaseException {
- List<OmdAttributeVO> existAttributeVOList = listAttributeByKeyCollection(keyCollections);
+ List<AttributeVO> existAttributeVOList = listAttributeByKeyCollection(keyCollections);
if (CollectionUtils.isEmpty(existAttributeVOList)) {
throw new VciBaseException("浣跨敤鐨勫睘鎬ч兘鍦ㄧ郴缁熶腑涓嶅瓨鍦紝璇峰厛鏌ヨ瘉");
} else {
@@ -134,11 +134,11 @@
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
@Override
- public List<OmdAttributeVO> listAttributeByKeyCollection(Collection<String> attributeIdCollection) throws VciBaseException {
+ public List<AttributeVO> listAttributeByKeyCollection(Collection<String> attributeIdCollection) throws VciBaseException {
if(!CollectionUtils.isEmpty(attributeIdCollection)){
- List<OmdAttribute> attributeDOList = listAttributeByKeyCollectionDO(attributeIdCollection);
+ List<Attribute> attributeDOList = listAttributeByKeyCollectionDO(attributeIdCollection);
if(!CollectionUtils.isEmpty(attributeDOList)) {
- return OmdAttributeWrapper.build().listEntityVO(attributeDOList);
+ return AttributeWrapper.build().listEntityVO(attributeDOList);
}
}
return null;
@@ -150,14 +150,14 @@
* @return 灞炴�ф暟鎹璞″垪琛紝濡傛灉鏈変笉瀛樺湪鐨勪笉浼氳繑鍥烇紝鍏ㄩ儴涓嶅瓨鍦ㄧ殑鍒欒繑鍥炵┖鍒楄〃
* @throws VciBaseException mybatis鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- private List<OmdAttribute> listAttributeByKeyCollectionDO(Collection<String> attributeIdCollection) throws VciBaseException {
+ private List<Attribute> listAttributeByKeyCollectionDO(Collection<String> attributeIdCollection) throws VciBaseException {
if(!CollectionUtils.isEmpty(attributeIdCollection)){
- List<OmdAttribute> attributeDOList = new ArrayList<>();
+ List<Attribute> attributeDOList = new ArrayList<>();
Collection<String> distAttributeIdCollection = attributeIdCollection.stream().distinct().collect(Collectors.toList());
Collection<Collection<String>> idCollections = VciBaseUtil.switchCollectionForOracleIn(distAttributeIdCollection);
if(!CollectionUtils.isEmpty(idCollections)) {
idCollections.stream().forEach(s -> {
- List<OmdAttribute> attributeDOS = baseMapper.selectList(Wrappers.<OmdAttribute>query().lambda().in(OmdAttribute::getKey, s));
+ List<Attribute> attributeDOS = baseMapper.selectList(Wrappers.<Attribute>query().lambda().in(Attribute::getKey, s));
if(!CollectionUtils.isEmpty(attributeDOS)){
attributeDOList.addAll(attributeDOS);
}
@@ -191,7 +191,7 @@
* @throws VciBaseException 涓嶇鍚堟椂鎶涘嚭寮傚父
*/
@Override
- public boolean checkAttribute(OmdBtmTypeLinkAttributesDTO attributesDTO) throws VciBaseException {
+ public boolean checkAttribute(BtmTypeLinkAttributesDTO attributesDTO) throws VciBaseException {
VciBaseUtil.alertNotNull(attributesDTO.getId(), "灞炴�х殑鑻辨枃鍚嶇О", attributesDTO.getName(), "灞炴�х殑涓枃鍚嶇О",
attributesDTO.getAttrDataType(), "灞炴�х殑鏁版嵁绫诲瀷");
boolean pass = checkAttributePass(attributesDTO.getId(), attributesDTO.getAttrDataType(), attributesDTO.getAttributeLength(), attributesDTO.getDefaultValue());
--
Gitblit v1.9.3