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/BtmTypeServiceImpl.java | 120 +++++++++++++++++++++++++++---------------------------------
1 files changed, 54 insertions(+), 66 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdBtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
similarity index 77%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdBtmTypeServiceImpl.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
index c81ccad..bd51b5c 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdBtmTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
@@ -4,21 +4,21 @@
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.constant.OmdBtmTypeConstant;
+import com.vci.ubcs.omd.constant.BtmTypeConstant;
import com.vci.ubcs.omd.repeater.DomainRepeater;
-import com.vci.ubcs.omd.service.IOmdBtmTypeAttributeService;
-import com.vci.ubcs.omd.wrapper.OmdBtmTypeWrapper;
+import com.vci.ubcs.omd.service.IBtmTypeAttributeService;
+import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
import com.vci.ubcs.starter.web.constant.OmdRegExpConstant;
-import com.vci.ubcs.omd.dto.OmdBtmTypeDTO;
-import com.vci.ubcs.omd.dto.OmdBtmTypeLinkAttributesDTO;
-import com.vci.ubcs.omd.entity.OmdBtmType;
-import com.vci.ubcs.omd.entity.OmdBtmTypeAttribute;
-import com.vci.ubcs.omd.entity.OsModifyAttributeInfoDO;
-import com.vci.ubcs.omd.mapper.OmdBtmTypeMapper;
-import com.vci.ubcs.omd.service.IOmdBtmTypeService;
-import com.vci.ubcs.omd.vo.OmdBtmTypeVO;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
-import com.vci.ubcs.omd.vo.OsLinkTypeVO;
+import com.vci.ubcs.omd.dto.BtmTypeDTO;
+import com.vci.ubcs.omd.dto.BtmTypeLinkAttributesDTO;
+import com.vci.ubcs.omd.entity.BtmType;
+import com.vci.ubcs.omd.entity.BtmTypeAttribute;
+import com.vci.ubcs.omd.entity.ModifyAttributeInfoDO;
+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.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.VciDateUtil;
@@ -35,7 +35,6 @@
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.util.CollectionUtils;
-import javax.annotation.Resource;
import javax.validation.constraints.NotEmpty;
import java.util.*;
@@ -46,7 +45,7 @@
* @date 2023/4/23
*/
@Service
-public class OmdBtmTypeServiceImpl extends ServiceImpl<OmdBtmTypeMapper, OmdBtmType> implements IOmdBtmTypeService {
+public class BtmTypeServiceImpl extends ServiceImpl<BtmTypeMapper, BtmType> implements IBtmTypeService {
/**
* 浜嬪姟绠＄悊
@@ -58,10 +57,7 @@
* 涓氬姟绫诲瀷鍏宠仈灞炴�ф湇鍔�
*/
@Autowired
- private IOmdBtmTypeAttributeService btmTypeAttributeService;
-
- @Autowired
- private DomainRepeater domainRepeater;
+ private IBtmTypeAttributeService btmTypeAttributeService;
/**
* 璁剧疆骞冲彴鏈韩鐨勪笟鍔＄被鍨�
@@ -81,9 +77,9 @@
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
@Override
- public OmdBtmTypeVO getBtmTypeByOid(String pkBtmType) throws ServiceException {
+ public BtmTypeVO getBtmTypeByOid(String pkBtmType) throws ServiceException {
Func.requireNotNull(pkBtmType,"涓氬姟绫诲瀷涓婚敭涓嶈兘涓虹┖");
- OmdBtmTypeVO btmTypeVO = OmdBtmTypeWrapper.build().entityVO(baseMapper.selectOne(Wrappers.<OmdBtmType>query().lambda().eq(OmdBtmType::getOid, pkBtmType)));
+ BtmTypeVO btmTypeVO = BtmTypeWrapper.build().entityVO(baseMapper.selectOne(Wrappers.<BtmType>query().lambda().eq(BtmType::getOid, pkBtmType)));
btmTypeVO.setAttributes(btmTypeAttributeService.getAttributeByBtmTypeOid(pkBtmType));
return btmTypeVO;
}
@@ -96,7 +92,7 @@
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
@Override
- public List<OmdBtmTypeVO> listBtmTypeByOids(String pkBtmTypes) throws ServiceException {
+ public List<BtmTypeVO> listBtmTypeByOids(String pkBtmTypes) throws ServiceException {
return null;
}
@@ -108,7 +104,7 @@
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
@Override
- public List<OmdBtmTypeVO> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) throws ServiceException {
+ public List<BtmTypeVO> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) throws ServiceException {
return null;
}
@@ -120,7 +116,7 @@
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
@Override
- public OmdBtmTypeVO getBtmTypeById(String id) throws ServiceException {
+ public BtmTypeVO getBtmTypeById(String id) throws ServiceException {
return null;
}
@@ -132,7 +128,7 @@
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
@Override
- public List<OmdBtmTypeVO> listBtmTypeByIds(String ids) throws ServiceException {
+ public List<BtmTypeVO> listBtmTypeByIds(String ids) throws ServiceException {
return null;
}
@@ -144,7 +140,7 @@
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
@Override
- public List<OmdBtmTypeVO> listBtmTypeByIdCollection(Collection<String> idCollection) throws ServiceException {
+ public List<BtmTypeVO> listBtmTypeByIdCollection(Collection<String> idCollection) throws ServiceException {
return null;
}
@@ -156,7 +152,7 @@
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
@Override
- public List<OmdBtmType> listBtmTypeDOByIdCollection(Collection<String> idCollection) throws ServiceException {
+ public List<BtmType> listBtmTypeDOByIdCollection(Collection<String> idCollection) throws ServiceException {
return null;
}
@@ -168,7 +164,7 @@
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
@Override
- public List<OmdBtmType> listBtmTypeDOByOidCollection(Collection<String> oidCollection) throws ServiceException {
+ public List<BtmType> listBtmTypeDOByOidCollection(Collection<String> oidCollection) throws ServiceException {
return null;
}
@@ -204,7 +200,7 @@
* @throws ServiceException 涓氬姟绫诲瀷涓嶅瓨鍦紝鍙傛暟涓虹┖鎴栨煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
@Override
- public List<OmdBtmTypeAttributeVO> listHasAttributesByOid(String oid) throws ServiceException {
+ public List<BtmTypeAttributeVO> listHasAttributesByOid(String oid) throws ServiceException {
return null;
}
@@ -216,7 +212,7 @@
* @throws ServiceException 涓氬姟绫诲瀷涓嶅瓨鍦紝鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
*/
@Override
- public List<OmdBtmTypeAttributeVO> listHasAttributeById(String id) throws ServiceException {
+ public List<BtmTypeAttributeVO> listHasAttributeById(String id) throws ServiceException {
return null;
}
@@ -228,7 +224,7 @@
* @throws ServiceException 涓氬姟绫诲瀷涓嶅瓨鍦紝鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
*/
@Override
- public Map<String, List<OmdBtmTypeAttributeVO>> batchListHasAttributesByOidCollection(Collection<String> oidCollection) throws ServiceException {
+ public Map<String, List<BtmTypeAttributeVO>> batchListHasAttributesByOidCollection(Collection<String> oidCollection) throws ServiceException {
return null;
}
@@ -240,7 +236,7 @@
* @throws ServiceException 涓氬姟绫诲瀷涓嶅瓨鍦紝鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
*/
@Override
- public Map<String, List<OmdBtmTypeAttributeVO>> batchListHasAttributesByIdCollection(Collection<String> idCollection) throws ServiceException {
+ public Map<String, List<BtmTypeAttributeVO>> batchListHasAttributesByIdCollection(Collection<String> idCollection) throws ServiceException {
return null;
}
@@ -252,7 +248,7 @@
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
*/
@Override
- public List<OsLinkTypeVO> listLinkTypeForUsedBtmType(String pkBtmType) throws ServiceException {
+ public List<LinkTypeVO> listLinkTypeForUsedBtmType(String pkBtmType) throws ServiceException {
return null;
}
@@ -289,7 +285,7 @@
* @throws ServiceException 娣诲姞鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public OmdBtmTypeDTO addSave(OmdBtmTypeDTO btmTypeDTO, boolean autoCreateTable) throws ServiceException {
+ public BtmTypeDTO addSave(BtmTypeDTO btmTypeDTO, boolean autoCreateTable) throws ServiceException {
TransactionStatus transaction = null;
DefaultTransactionDefinition def = null;
if (autoCreateTable) {
@@ -299,7 +295,7 @@
transaction = dataSourceTransactionManager.getTransaction(def);
// 鑾峰緱浜嬪姟鐘舵��
}
- OmdBtmType btmTypeDO = new OmdBtmType();
+ BtmType btmTypeDO = new BtmType();
try {
VciBaseUtil.alertNotNull(btmTypeDTO, "瑕佹坊鍔犵殑涓氬姟绫诲瀷", btmTypeDTO.getId(), "涓氬姟绫诲瀷鐨勮嫳鏂囧悕绉�", btmTypeDTO.getName(), "涓氬姟绫诲瀷涓枃鍚嶇О");
if (btmTypeDTO.isViewFlag() && (StringUtils.isBlank(btmTypeDTO.getViewCreateSql())
@@ -315,9 +311,9 @@
if (btmTypeDTO.getId().length() > 24) {
throw new VciBaseException("涓氬姟绫诲瀷鑻辨枃鍚嶇О涓嶈兘瓒呰繃18锛岀洰鍓嶉暱搴︿负{0}", new Object[]{btmTypeDTO.getId().length()});
}
- List<OmdBtmType> btmTypeDOList = listBtmTypeDOByIdCollection(VciBaseUtil.str2List(btmTypeDTO.getId()));
+ List<BtmType> btmTypeDOList = listBtmTypeDOByIdCollection(VciBaseUtil.str2List(btmTypeDTO.getId()));
if (!CollectionUtils.isEmpty(btmTypeDOList) && btmTypeDOList.size() > 0) {
- OmdBtmType existBtmType = btmTypeDOList.get(0);
+ BtmType existBtmType = btmTypeDOList.get(0);
throw new VciBaseException("涓氬姟绫诲瀷鑻辨枃鍚嶇О宸茬粡瀛樺湪锛堜笉鍖哄垎澶у皬鍐欙級锛岃繖涓嫳鏂囧悕绉板搴旂殑涓枃鍚嶇О涓簕0},鍒涘缓浜簕1},鍒涘缓鏃堕棿{2}"
, new Object[]{existBtmType.getName(), existBtmType.getCreator(), VciDateUtil.date2Str(existBtmType.getCreateTime(), VciDateUtil.DateFormat)});
}
@@ -354,7 +350,7 @@
btmTypeDO.setCreator(creator);
btmTypeDO.setCreateTime(now);
btmTypeDO.setOwner(creator);
- btmTypeDO.setBtmname(OmdBtmTypeConstant.OMD_BTMTYPE);
+ btmTypeDO.setBtmname(BtmTypeConstant.OMD_BTMTYPE);
btmTypeDO.setTs(now);
if (StringUtils.isBlank(btmTypeDO.getTableName())) {
btmTypeDO.setTableName(getTableName(btmTypeDO.getId()));
@@ -379,7 +375,7 @@
throw e;
}
if (autoCreateTable) {
- OmdBtmTypeVO btmTypeVO = OmdBtmTypeWrapper.build().entityVO(btmTypeDO);
+ BtmTypeVO btmTypeVO = BtmTypeWrapper.build().entityVO(btmTypeDO);
btmTypeVO.setAttributes(listHasAttributesByOid(btmTypeDO.getOid()));
checkTableSame(btmTypeVO);
}
@@ -391,7 +387,7 @@
*
* @param btmTypeVO 涓氬姟绫诲瀷鐨勬樉绀哄璞�
*/
- private void checkTableSame(OmdBtmTypeVO btmTypeVO) {
+ private void checkTableSame(BtmTypeVO btmTypeVO) {
/*List<OmdBtmTypeVO> btmTypeVOList = new ArrayList<>();
btmTypeVOList.add(btmTypeVO);
List<OsModifyAttributeInfoDO> modifyAttributeInfoDOList = ddlServiceI.checkDifferent(btmTypeVOList, null);
@@ -413,8 +409,8 @@
* @param creator 鍒涘缓浜�
* @param now 褰撳墠鏃堕棿
*/
- private void addAttributeForBtm(OmdBtmTypeDTO btmTypeDTO, String creator, Date now) throws VciBaseException{
- List<OmdBtmTypeLinkAttributesDTO> attributesDTOList = btmTypeDTO.getAttributesDTOList();
+ private void addAttributeForBtm(BtmTypeDTO btmTypeDTO, String creator, Date now) throws VciBaseException{
+ List<BtmTypeLinkAttributesDTO> attributesDTOList = btmTypeDTO.getAttributesDTOList();
btmTypeAttributeService.checkAndInsert(btmTypeDTO.getOid(),attributesDTOList,creator,now);
}
@@ -427,7 +423,7 @@
* @throws ServiceException 淇敼鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public OmdBtmTypeDTO editSave(OmdBtmTypeDTO btmTypeDTO, boolean autoEditTable) throws ServiceException {
+ public BtmTypeDTO editSave(BtmTypeDTO btmTypeDTO, boolean autoEditTable) throws ServiceException {
return null;
}
@@ -439,7 +435,7 @@
* @throws ServiceException 濡傛灉涓氬姟绫诲瀷琚紩鐢紝鎴栬�呭垹闄ゅ嚭閿欐椂浼氭姏鍑哄紓甯�
*/
@Override
- public void delete(OmdBtmTypeVO btmTypeVO, boolean autoDeleteTable) throws ServiceException {
+ public void delete(BtmTypeVO btmTypeVO, boolean autoDeleteTable) throws ServiceException {
}
@@ -451,7 +447,7 @@
* @throws ServiceException 濡傛灉涓氬姟绫诲瀷琚紩鐢紝鎴栬�呭垹闄ゅ嚭閿欐椂浼氭姏鍑哄紓甯�
*/
@Override
- public void batchDelete(List<OmdBtmTypeVO> btmTypeVOList, boolean autoDeleteTable) throws ServiceException {
+ public void batchDelete(List<BtmTypeVO> btmTypeVOList, boolean autoDeleteTable) throws ServiceException {
}
@@ -463,7 +459,7 @@
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
*/
@Override
- public List<OsModifyAttributeInfoDO> checkDbTableSame(String pkBtmType) throws ServiceException {
+ public List<ModifyAttributeInfoDO> checkDbTableSame(String pkBtmType) throws ServiceException {
return null;
}
@@ -489,7 +485,7 @@
* @return 灞炴�х殑鏁版嵁瀵硅薄
*/
@Override
- public OmdBtmTypeAttribute btmTypeAttributeDTO2DO(OmdBtmTypeLinkAttributesDTO attributesDTO, String pkBtmType, String creator, Date now) {
+ public BtmTypeAttribute btmTypeAttributeDTO2DO(BtmTypeLinkAttributesDTO attributesDTO, String pkBtmType, String creator, Date now) {
return null;
}
@@ -500,7 +496,7 @@
* @return 鏁版嵁瀵硅薄
*/
@Override
- public List<OmdBtmTypeAttribute> btmTypeAttributeVO2DO(List<OmdBtmTypeAttributeVO> thisBtmTypeHasAttributeVOList) {
+ public List<BtmTypeAttribute> btmTypeAttributeVO2DO(List<BtmTypeAttributeVO> thisBtmTypeHasAttributeVOList) {
return null;
}
@@ -511,7 +507,7 @@
* @return 灞炴�х殑鏄剧ず瀵硅薄鍒楄〃
*/
@Override
- public List<OmdBtmTypeAttributeVO> batchBtmTypeAttributeDO2VO(List<OmdBtmTypeAttribute> attributeDOList) {
+ public List<BtmTypeAttributeVO> batchBtmTypeAttributeDO2VO(List<BtmTypeAttribute> attributeDOList) {
return null;
}
@@ -522,7 +518,7 @@
* @return 灞炴�х殑鏄剧ず瀵硅薄鍒楄〃
*/
@Override
- public OmdBtmTypeAttributeVO btmTypeAttributeDO2VO(OmdBtmTypeAttribute attributesDO) {
+ public BtmTypeAttributeVO btmTypeAttributeDO2VO(BtmTypeAttribute attributesDO) {
return null;
}
@@ -534,7 +530,7 @@
* @return 灞炴�х殑鏄剧ず瀵硅薄
*/
@Override
- public List<OmdBtmTypeAttribute> listAttributeDOByIdsForBtm(String id, Collection<String> attributeIdCollection) {
+ public List<BtmTypeAttribute> listAttributeDOByIdsForBtm(String id, Collection<String> attributeIdCollection) {
return null;
}
@@ -545,7 +541,7 @@
* @return 灞炴�х殑鏄剧ず瀵硅薄
*/
@Override
- public List<OmdBtmTypeAttributeVO> listAttributeByBtmTypeId(String id) {
+ public List<BtmTypeAttributeVO> listAttributeByBtmTypeId(String id) {
return null;
}
@@ -556,7 +552,7 @@
* @return 灞炴�х殑鏄剧ず瀵硅薄
*/
@Override
- public List<OmdBtmTypeAttributeVO> listAttributeByBtmTypeOid(String oid) {
+ public List<BtmTypeAttributeVO> listAttributeByBtmTypeOid(String oid) {
return null;
}
@@ -569,7 +565,7 @@
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欎細鎶涘嚭寮傚父
*/
@Override
- public List<OmdBtmTypeAttributeVO> batchListAttributeByBtmType(Collection<String> oidsOrIds, boolean queryById) throws ServiceException {
+ public List<BtmTypeAttributeVO> batchListAttributeByBtmType(Collection<String> oidsOrIds, boolean queryById) throws ServiceException {
return null;
}
@@ -580,22 +576,14 @@
* @return 鎵ц缁撴灉
*/
@Override
- public boolean submit(OmdBtmTypeDTO btmTypeDTO) {
- //addSave(btmTypeDTO,false);
+ public boolean submit(BtmTypeDTO btmTypeDTO) {
+ addSave(btmTypeDTO,false);
try {
- Object result = domainRepeater.submitBtmType(btmTypeDTO.getDomain(), Objects.requireNonNull(BeanUtil.copy(btmTypeDTO, OmdBtmTypeVO.class)));
- if (result instanceof R){
- R r = (R) result;
- if (r.isSuccess()){
- return true;
- }else {
- return false;
- }
- }
+ R result = DomainRepeater.submitBtmType(btmTypeDTO.getDomain(), Objects.requireNonNull(BeanUtil.copy(btmTypeDTO, BtmTypeVO.class)));
+ return result.isSuccess();
} catch (NacosException e) {
throw new RuntimeException(e);
}
- return true;
}
@Override
--
Gitblit v1.9.3