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/repeater/DomainRepeater.java | 83 +-
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/ModifyAttributeInfoVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/ModifyAttributeInfoDO.java | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java | 31
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineVO.java | 8
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllBehavior.java | 18
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java | 36
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmTypeAttribute.java | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IAttributeService.java | 18
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/FieldRangeVO.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/AttributeDTO.java | 4
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java | 44 +-
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java | 24
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java | 4
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeMapper.java | 28
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/AttributeCache.java | 20
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeLinkAttributesDTO.java | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java | 33
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLine.java | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java | 14
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/AttributeMapper.java | 10
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/StatusVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java | 4
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java | 31
Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/AttributeMapper.xml | 6
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeDO.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessor.java | 18
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeAttributeService.java | 41 +
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeExportDTO.java | 16
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java | 61 ++
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java | 18
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeConstant.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeFallback.java | 8
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMySqlMapperProcessor.java | 16
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/IDdlService.java | 28
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java | 6
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java | 63 ++
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/StatusDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java | 8
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/FieldRange.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeClient.java | 10
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java | 14
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/AttributeVO.java | 6
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java | 17
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LinkTypeDTO.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeAttributeVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/RevisionRuleVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeFallback.java | 82 +++
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineDTO.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/RevisionRuleDTO.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java | 68 +-
/dev/null | 43 -
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeVO.java | 20
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/controller/DdlController.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java | 4
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllSqlLiteMapperProcessor.java | 5
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeClient.java | 12
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java | 2
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java | 72 +-
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeAttributeMapper.java | 13
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java | 120 ++---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/FiledRangeWrapper.java | 43 +
71 files changed, 775 insertions(+), 515 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/OmdAttributeCache.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/AttributeCache.java
similarity index 70%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/OmdAttributeCache.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/AttributeCache.java
index 449ada2..6342448 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/OmdAttributeCache.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/AttributeCache.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.omd.cache;
-import com.vci.ubcs.omd.entity.OmdAttribute;
-import com.vci.ubcs.omd.feign.IOmdAttributeClient;
+import com.vci.ubcs.omd.entity.Attribute;
+import com.vci.ubcs.omd.feign.IAttributeClient;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@@ -18,17 +18,17 @@
*
* @author Chill
*/
-public class OmdAttributeCache {
+public class AttributeCache {
private static final String ATTR_ID = "attr:id";
private static final String ATTR_LIST = "attr:list";
private static final String ATTR_CACHE = "ubcs:attr";
- private static IOmdAttributeClient attrClient;
+ private static IAttributeClient attrClient;
- private static IOmdAttributeClient getAttributeClient() {
+ private static IAttributeClient getAttributeClient() {
if (attrClient == null) {
- attrClient = SpringUtil.getBean(IOmdAttributeClient.class);
+ attrClient = SpringUtil.getBean(IAttributeClient.class);
}
return attrClient;
}
@@ -39,10 +39,10 @@
* @param id 涓婚敭
* @return 鍏冩暟鎹疄浣撳璞�
*/
- public static OmdAttribute getById(Long id) {
+ public static Attribute getById(Long id) {
String keyPrefix = ATTR_ID.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
return CacheUtil.get(ATTR_CACHE, keyPrefix, id, () -> {
- R<OmdAttribute> result = getAttributeClient().getById(id);
+ R<Attribute> result = getAttributeClient().getById(id);
return result.getData();
});
}
@@ -52,10 +52,10 @@
*
* @param key 灞炴�у悕绉�
*/
- public static List<OmdAttribute> getList(String key) {
+ public static List<Attribute> getList(String key) {
String keyPrefix = ATTR_LIST.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
return CacheUtil.get(DICT_CACHE, keyPrefix, key, () -> {
- R<List<OmdAttribute>> result = getAttributeClient().getList(key);
+ R<List<Attribute>> result = getAttributeClient().getList(key);
return result.getData();
});
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/OmdBtmTypeCache.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
similarity index 71%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/OmdBtmTypeCache.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
index 13600a0..59526d8 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/OmdBtmTypeCache.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.omd.cache;
-import com.vci.ubcs.omd.feign.IOmdBtmTypeClient;
-import com.vci.ubcs.omd.vo.OmdBtmTypeVO;
+import com.vci.ubcs.omd.feign.IBtmTypeClient;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@@ -18,7 +18,7 @@
* @author LiHang
* @date 2023/4/24
*/
-public class OmdBtmTypeCache {
+public class BtmTypeCache {
private static final String BTM_DETAIL = "btm:id";
@@ -28,11 +28,11 @@
private static final String BTM_IDS = "btm:ids";
- private static IOmdBtmTypeClient btmTypeClient;
+ private static IBtmTypeClient btmTypeClient;
- private static IOmdBtmTypeClient getBtmTypeClient() {
+ private static IBtmTypeClient getBtmTypeClient() {
if (btmTypeClient == null) {
- btmTypeClient = SpringUtil.getBean(IOmdBtmTypeClient.class);
+ btmTypeClient = SpringUtil.getBean(IBtmTypeClient.class);
}
return btmTypeClient;
}
@@ -43,10 +43,10 @@
* @param oid 涓婚敭
* @return 涓氬姟绫诲瀷璇︽儏淇℃伅
*/
- public static OmdBtmTypeVO getDetail(String oid){
+ public static BtmTypeVO getDetail(String oid){
String keyPrefix = BTM_DETAIL.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
return CacheUtil.get(BTM_TYPE_CACHE, keyPrefix, oid, () -> {
- R<OmdBtmTypeVO> result = getBtmTypeClient().getDetail(oid);
+ R<BtmTypeVO> result = getBtmTypeClient().getDetail(oid);
return result.getData();
});
}
@@ -56,10 +56,10 @@
* @param ids 瀵硅薄鑻辨枃鍚嶇О 浣嗘槸涓嶈兘瓒呰繃1000
* @return 涓氬姟瀵硅薄
*/
- public static List<OmdBtmTypeVO> selectByIdCollection(List<String> ids) {
+ public static List<BtmTypeVO> selectByIdCollection(List<String> ids) {
String keyPrefix = BTM_IDS.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
return CacheUtil.get(BTM_TYPE_CACHE,keyPrefix,Func.toStr(ids), () -> {
- R<List<OmdBtmTypeVO>> result = getBtmTypeClient().selectByIdCollection(ids);
+ R<List<BtmTypeVO>> result = getBtmTypeClient().selectByIdCollection(ids);
return result.getData();
});
}
@@ -70,10 +70,10 @@
* @param pkBtmTypeCollection 涓氬姟绫诲瀷涓婚敭闆嗗悎
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
*/
- public static List<OmdBtmTypeVO> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) {
+ public static List<BtmTypeVO> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) {
String keyPrefix = BTM_IDS.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
return CacheUtil.get(BTM_TYPE_CACHE,keyPrefix,Func.toStr(pkBtmTypeCollection.stream().map(s -> s.substring(0,5))),() ->{
- R<List<OmdBtmTypeVO>> result = getBtmTypeClient().listBtmTypeByOidCollection(pkBtmTypeCollection);
+ R<List<BtmTypeVO>> result = getBtmTypeClient().listBtmTypeByOidCollection(pkBtmTypeCollection);
return result.getData();
});
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/OmdBtmTypeConstant.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeConstant.java
similarity index 98%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/OmdBtmTypeConstant.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeConstant.java
index 671028f..7ecdc9e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/OmdBtmTypeConstant.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeConstant.java
@@ -6,7 +6,7 @@
* @author LiHang
* @date 2023/4/23
*/
-public class OmdBtmTypeConstant {
+public class BtmTypeConstant {
/**
* 灞炴�х殑涓氬姟绫诲瀷鍚嶇О
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OmdAttributeDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/AttributeDTO.java
similarity index 76%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OmdAttributeDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/AttributeDTO.java
index 3365ca7..e5c2906 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OmdAttributeDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/AttributeDTO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.omd.dto;
-import com.vci.ubcs.omd.entity.OmdAttribute;
+import com.vci.ubcs.omd.entity.Attribute;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,7 +13,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = true)
-public class OmdAttributeDTO extends OmdAttribute {
+public class AttributeDTO extends Attribute {
/**
* 搴忓垪鍖�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OmdBtmTypeDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java
similarity index 94%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OmdBtmTypeDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java
index 505ae53..4cdba00 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OmdBtmTypeDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java
@@ -11,7 +11,7 @@
* @date 2019/10/14 16:43
*/
@Data
-public class OmdBtmTypeDTO implements java.io.Serializable{
+public class BtmTypeDTO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
*/
@@ -137,7 +137,7 @@
/**
* 娣诲姞鎴栬�呯Щ闄ょ殑灞炴�т俊鎭�
*/
- private List<OmdBtmTypeLinkAttributesDTO> attributesDTOList;
+ private List<BtmTypeLinkAttributesDTO> attributesDTOList;
/**
* 鏃堕棿鎴筹紝鐢ㄤ簬鏍￠獙鏄惁鏈�鏂版暟鎹�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsBtmTypeExportDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeExportDTO.java
similarity index 65%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsBtmTypeExportDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeExportDTO.java
index 1550830..4f5f864 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsBtmTypeExportDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeExportDTO.java
@@ -11,7 +11,7 @@
* @date 2019/10/14 17:09
*/
@Data
-public class OsBtmTypeExportDTO implements java.io.Serializable{
+public class BtmTypeExportDTO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
@@ -20,36 +20,36 @@
/**
* 鐘舵�佹暟鎹紶杈撳璞�
*/
- private List<OsStatusDTO> statusDTOList;
+ private List<StatusDTO> statusDTOList;
/**
* 鐗堟湰瑙勫垯鏁版嵁浼犺緭瀵硅薄
*/
- private List<OsRevisionRuleDTO> revisionRuleDTOList;
+ private List<RevisionRuleDTO> revisionRuleDTOList;
/**
* 鏋氫妇鏁版嵁浼犺緭瀵硅薄
*/
- private List<OsEnumDTO> enumDTOList;
+ private List<EnumDTO> enumDTOList;
/**
* 鐢熷懡鍛ㄦ湡鏁版嵁浼犺緭瀵硅薄
*/
- private List<OsLifeCycleDTO> lifeCycleDTOList;
+ private List<LifeCycleDTO> lifeCycleDTOList;
/**
* 灞炴�ф暟鎹紶杈撳璞�
*/
- private List<OmdAttributeDTO> attributeDTOList;
+ private List<AttributeDTO> attributeDTOList;
/**
* 涓氬姟绫诲瀷鏁版嵁浼犺緭瀵硅薄
*/
- private List<OmdBtmTypeDTO> btmTypeDTOList;
+ private List<BtmTypeDTO> btmTypeDTOList;
/**
* 閾炬帴绫诲瀷鏁版嵁浼犺緭瀵硅薄
*/
- private List<OsLinkTypeDTO> linkTypeDTOList;
+ private List<LinkTypeDTO> linkTypeDTOList;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OmdBtmTypeLinkAttributesDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeLinkAttributesDTO.java
similarity index 95%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OmdBtmTypeLinkAttributesDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeLinkAttributesDTO.java
index 32e04ea..0040abc 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OmdBtmTypeLinkAttributesDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeLinkAttributesDTO.java
@@ -8,7 +8,7 @@
* @date 2019/10/14 16:17
*/
@Data
-public class OmdBtmTypeLinkAttributesDTO implements java.io.Serializable{
+public class BtmTypeLinkAttributesDTO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsEnumDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java
similarity index 98%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsEnumDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java
index 87dc37e..aedc1bf 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsEnumDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java
@@ -8,7 +8,7 @@
* @author weidy
* @date 2019/10/14 17:25
*/
-public class OsEnumDTO implements java.io.Serializable{
+public class EnumDTO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsLifeCycleDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java
similarity index 89%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsLifeCycleDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java
index b581509..7a1ccf6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsLifeCycleDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java
@@ -11,7 +11,7 @@
* @date 2019/10/14 17:28
*/
@Data
-public class OsLifeCycleDTO implements java.io.Serializable {
+public class LifeCycleDTO implements java.io.Serializable {
/**
* 绂佹淇敼杩欎釜鍊�
@@ -61,6 +61,6 @@
/**
* 鍖呭惈鐨勮繛鎺ョ嚎
*/
- private List<OsLifeCycleLineDTO> lineDTOList;
+ private List<LifeCycleLineDTO> lineDTOList;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsLifeCycleLineDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineDTO.java
similarity index 90%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsLifeCycleLineDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineDTO.java
index b40fac1..57ea385 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsLifeCycleLineDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineDTO.java
@@ -11,7 +11,7 @@
* @date 2019/10/14 17:31
*/
@Data
-public class OsLifeCycleLineDTO implements java.io.Serializable{
+public class LifeCycleLineDTO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
@@ -76,7 +76,7 @@
/**
* 鍖呭惈鐨勪簨浠�
*/
- private List<OsLifeCycleLineEventDTO> eventDTOList;
+ private List<LifeCycleLineEventDTO> eventDTOList;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsLifeCycleLineEventDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java
similarity index 89%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsLifeCycleLineEventDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java
index 53cf623..2f01763 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsLifeCycleLineEventDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java
@@ -10,7 +10,7 @@
* @date 2019/10/14 17:47
*/
@Data
-public class OsLifeCycleLineEventDTO implements java.io.Serializable {
+public class LifeCycleLineEventDTO implements java.io.Serializable {
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsLinkTypeDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LinkTypeDTO.java
similarity index 90%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsLinkTypeDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LinkTypeDTO.java
index ddc9491..d0eab19 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsLinkTypeDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LinkTypeDTO.java
@@ -11,7 +11,7 @@
* @date 2019/10/14 17:53
*/
@Data
-public class OsLinkTypeDTO implements java.io.Serializable {
+public class LinkTypeDTO implements java.io.Serializable {
/**
* 绂佹淇敼杩欎釜鍊�
@@ -81,6 +81,6 @@
/**
* 鍖呭惈鐨勫睘鎬ф樉绀哄璞�
*/
- private List<OmdBtmTypeLinkAttributesDTO> attributesDTOList;
+ private List<BtmTypeLinkAttributesDTO> attributesDTOList;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsRevisionRuleDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/RevisionRuleDTO.java
similarity index 93%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsRevisionRuleDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/RevisionRuleDTO.java
index a22873a..4f83e18 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsRevisionRuleDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/RevisionRuleDTO.java
@@ -10,7 +10,7 @@
* @date 2019/10/14 17:22
*/
@Data
-public class OsRevisionRuleDTO implements java.io.Serializable{
+public class RevisionRuleDTO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsStatusDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/StatusDTO.java
similarity index 91%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsStatusDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/StatusDTO.java
index cf7a782..b387959 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/OsStatusDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/StatusDTO.java
@@ -10,7 +10,7 @@
* @date 2019/10/14 17:15
*/
@Data
-public class OsStatusDTO implements java.io.Serializable{
+public class StatusDTO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
*/
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdAttribute.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java
similarity index 98%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdAttribute.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java
index 2f5ac60..8abd472 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdAttribute.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java
@@ -27,7 +27,7 @@
@EqualsAndHashCode(callSuper = true)
@TableName("pl_omd_attribute")
@ApiModel(value = "灞炴�у璞�", description = "灞炴�у璞�")
-public class OmdAttribute extends BaseEntity {
+public class Attribute extends BaseEntity {
/**
* 搴忓垪鍖�
*/
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdBtmType.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
similarity index 97%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdBtmType.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
index 9dce101..141f7ef 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdBtmType.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
@@ -16,7 +16,7 @@
@Data
@TableName("pl_omd_btm_type")
@ApiModel(value = "涓氬姟绫诲瀷", description = "涓氬姟绫诲瀷")
-public class OmdBtmType implements java.io.Serializable{
+public class BtmType implements java.io.Serializable{
/**
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdBtmTypeAttribute.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmTypeAttribute.java
similarity index 97%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdBtmTypeAttribute.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmTypeAttribute.java
index 9cd8fe0..28738a4 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdBtmTypeAttribute.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmTypeAttribute.java
@@ -16,7 +16,7 @@
@Data
@TableName("pl_omd_btm_type_attr")
@ApiModel(value = "涓氬姟绫诲瀷鍖呭惈鐨勫睘鎬�", description = "涓氬姟绫诲瀷鍖呭惈鐨勫睘鎬�")
-public class OmdBtmTypeAttribute implements java.io.Serializable{
+public class BtmTypeAttribute implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdFieldRange.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/FieldRange.java
similarity index 94%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdFieldRange.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/FieldRange.java
index 80eea5f..3679fa1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OmdFieldRange.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/FieldRange.java
@@ -20,7 +20,7 @@
@ToString(callSuper = true)
@TableName("pl_omd_field_range")
@ApiModel(value = "瀛楁鑼冨洿",description = "瀛楁鑼冨洿")
-public class OmdFieldRange extends BaseEntity {
+public class FieldRange extends BaseEntity {
/**
* 搴忓垪鍖�
*/
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLifeCycleEventDO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
similarity index 95%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLifeCycleEventDO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
index e8f0da6..1832c80 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLifeCycleEventDO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
@@ -16,7 +16,7 @@
@Data
@TableName("pl_omd_lift_cycle_event")
@ApiModel(value = "鐢熷懡鍛ㄦ湡浜嬩欢闆嗗悎", description = "鐢熷懡鍛ㄦ湡浜嬩欢闆嗗悎")
-public class OsLifeCycleEventDO implements java.io.Serializable{
+public class LifeCycleEvent implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLifeCycleLineDO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLine.java
similarity index 95%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLifeCycleLineDO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLine.java
index b134092..1d3b5ff 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLifeCycleLineDO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLine.java
@@ -16,7 +16,7 @@
@Data
@TableName("pl_omd_lift_cycle_line")
@ApiModel(value = "鐢熷懡鍛ㄦ湡鐘舵�佽繛鎺ョ嚎", description = "鐢熷懡鍛ㄦ湡鐘舵�佽繛鎺ョ嚎")
-public class OsLifeCycleLineDO implements java.io.Serializable {
+public class LifeCycleLine implements java.io.Serializable {
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLifeCycleLineEventDO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
similarity index 94%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLifeCycleLineEventDO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
index 7d9a88a..74760c2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLifeCycleLineEventDO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
@@ -16,7 +16,7 @@
@Data
@TableName("pl_omd_lift_cycle_line_event")
@ApiModel(value = "鐢熷懡鍛ㄦ湡鐘舵�佽繛鎺ョ嚎", description = "鐢熷懡鍛ㄦ湡鐘舵�佽繛鎺ョ嚎")
-public class OsLifeCycleLineEventDO implements java.io.Serializable{
+public class LifeCycleLineEvent implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLifeCycleRuleDO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
similarity index 95%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLifeCycleRuleDO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
index 2d97cc0..af28860 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLifeCycleRuleDO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
@@ -16,7 +16,7 @@
@Data
@TableName("pl_omd_lift_cycle_rule")
@ApiModel(value = "鐢熷懡鍛ㄦ湡瑙勫垯", description = "鐢熷懡鍛ㄦ湡瑙勫垯")
-public class OsLifeCycleRuleDO implements java.io.Serializable {
+public class LifeCycleRule implements java.io.Serializable {
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLinkTypeAttributeDO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java
similarity index 96%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLinkTypeAttributeDO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java
index 9fe9dfb..9e1e620 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLinkTypeAttributeDO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java
@@ -16,7 +16,7 @@
@Data
@TableName("pl_omd_link_type_attr")
@ApiModel(value = "閾炬帴绫诲瀷鍖呭惈鐨勫睘鎬�", description = "閾炬帴绫诲瀷鍖呭惈鐨勫睘鎬�")
-public class OsLinkTypeAttributeDO implements java.io.Serializable{
+public class LinkTypeAttribute implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLinkTypeDO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeDO.java
similarity index 96%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLinkTypeDO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeDO.java
index 7459787..4d7862a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsLinkTypeDO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeDO.java
@@ -15,7 +15,7 @@
@Data
@TableName("pl_omd_link_type")
@ApiModel(value = "閾炬帴绫诲瀷", description = "閾炬帴绫诲瀷")
-public class OsLinkTypeDO implements java.io.Serializable{
+public class LinkTypeDO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsModifyAttributeInfoDO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/ModifyAttributeInfoDO.java
similarity index 97%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsModifyAttributeInfoDO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/ModifyAttributeInfoDO.java
index 7a88209..50ea8d6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/OsModifyAttributeInfoDO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/ModifyAttributeInfoDO.java
@@ -16,7 +16,7 @@
@Data
@TableName("pl_omd_modify_attr_info")
@ApiModel(value = "闇�瑕佷慨鏀规暟鎹簱琛ㄤ腑瀛楁鐨勪俊鎭�", description = "闇�瑕佷慨鏀规暟鎹簱琛ㄤ腑瀛楁鐨勪俊鎭�")
-public class OsModifyAttributeInfoDO implements Serializable {
+public class ModifyAttributeInfoDO implements Serializable {
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IOmdAttributeClient.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeClient.java
similarity index 87%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IOmdAttributeClient.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeClient.java
index f3f0042..a002604 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IOmdAttributeClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeClient.java
@@ -17,7 +17,7 @@
package com.vci.ubcs.omd.feign;
-import com.vci.ubcs.omd.entity.OmdAttribute;
+import com.vci.ubcs.omd.entity.Attribute;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.tool.api.R;
import org.springframework.cloud.openfeign.FeignClient;
@@ -33,9 +33,9 @@
*/
@FeignClient(
value = AppConstant.APPLICATION_NAME_OMD,
- fallback = IOmdAttributeFallback.class
+ fallback = IAttributeFallback.class
)
-public interface IOmdAttributeClient {
+public interface IAttributeClient {
String API_PREFIX = "/client";
String GET_BY_ID = API_PREFIX + "/attribute/get-by-id";
@@ -48,7 +48,7 @@
* @return 鍏冩暟鎹璞�
*/
@GetMapping(GET_BY_ID)
- R<OmdAttribute> getById(@RequestParam("id") Long id);
+ R<Attribute> getById(@RequestParam("id") Long id);
/**
* 鑾峰彇鍏冩暟鎹垪琛�
@@ -56,5 +56,5 @@
* @return 鍏冩暟鎹垪琛�
*/
@GetMapping(GET_LIST)
- R<List<OmdAttribute>> getList(@RequestParam("key") String key);
+ R<List<Attribute>> getList(@RequestParam("key") String key);
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IOmdAttributeFallback.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeFallback.java
similarity index 84%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IOmdAttributeFallback.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeFallback.java
index 40dc9ea..f358100 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IOmdAttributeFallback.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IAttributeFallback.java
@@ -16,7 +16,7 @@
*/
package com.vci.ubcs.omd.feign;
-import com.vci.ubcs.omd.entity.OmdAttribute;
+import com.vci.ubcs.omd.entity.Attribute;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Component;
@@ -28,14 +28,14 @@
* @author Chill
*/
@Component
-public class IOmdAttributeFallback implements IOmdAttributeClient {
+public class IAttributeFallback implements IAttributeClient {
@Override
- public R<OmdAttribute> getById(Long id) {
+ public R<Attribute> getById(Long id) {
return R.fail("鑾峰彇鏁版嵁澶辫触");
}
@Override
- public R<List<OmdAttribute>> getList(String code) {
+ public R<List<Attribute>> getList(String code) {
return R.fail("鑾峰彇鏁版嵁澶辫触");
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IOmdBtmTypeClient.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeClient.java
similarity index 79%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IOmdBtmTypeClient.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeClient.java
index 11e64f0..78fb003 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IOmdBtmTypeClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeClient.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.omd.feign;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.vci.ubcs.omd.vo.OmdBtmTypeVO;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -23,7 +23,7 @@
value = AppConstant.APPLICATION_NAME_OMD,
fallback = IDictClientFallback.class
)
-public interface IOmdBtmTypeClient {
+public interface IBtmTypeClient {
/**
* 鍓嶇紑
@@ -53,7 +53,7 @@
* @return 涓氬姟绫诲瀷璇︽儏淇℃伅
*/
@GetMapping(GET_DETAIL)
- R<OmdBtmTypeVO> getDetail(@RequestParam("oid") String oid);
+ R<BtmTypeVO> getDetail(@RequestParam("oid") String oid);
/**
* 鍙傜収鍒楄〃鏌ヨ
@@ -63,7 +63,7 @@
* @return 鏌ヨ缁撴灉
*/
@GetMapping(GET_REF)
- R<IPage<OmdBtmTypeVO>> getRef(@RequestParam("condition")Map<String,Object> condition, @RequestParam("query")Query query, @RequestParam("domain") String domain);
+ R<IPage<BtmTypeVO>> getRef(@RequestParam("condition")Map<String,Object> condition, @RequestParam("query")Query query, @RequestParam("domain") String domain);
/**
* 鏍规嵁鑻辨枃鍚嶇О鎵归噺鏌ヨ瀵硅薄
@@ -71,7 +71,7 @@
* @return 涓氬姟瀵硅薄
*/
@GetMapping(GET_BY_IDS)
- R<List<OmdBtmTypeVO>> selectByIdCollection(List<String> ids);
+ R<List<BtmTypeVO>> selectByIdCollection(List<String> ids);
/**
* 鎵归噺鏍规嵁涓婚敭鑾峰彇涓氬姟绫诲瀷
@@ -79,5 +79,5 @@
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
*/
@GetMapping(GET_BY_OIDS)
- R<List<OmdBtmTypeVO>> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection);
+ R<List<BtmTypeVO>> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection);
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeFallback.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeFallback.java
new file mode 100644
index 0000000..69a0465
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/feign/IBtmTypeFallback.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
+package com.vci.ubcs.omd.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.vci.ubcs.omd.entity.Attribute;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Feign澶辫触閰嶇疆
+ *
+ * @author Chill
+ */
+@Component
+public class IBtmTypeFallback implements IBtmTypeClient {
+ /**
+ * 鑾峰彇涓氬姟绫诲瀷璇︽儏淇℃伅
+ *
+ * @param oid 涓婚敭
+ * @return 涓氬姟绫诲瀷璇︽儏淇℃伅
+ */
+ @Override
+ public R<BtmTypeVO> getDetail(String oid) {
+ return R.fail("鑾峰彇鏁版嵁澶辫触");
+ }
+
+ /**
+ * 鍙傜収鍒楄〃鏌ヨ
+ *
+ * @param condition 鏌ヨ鏉′欢
+ * @param query 鍒嗛〉鏉′欢
+ * @param domain 棰嗗煙鍊�
+ * @return 鏌ヨ缁撴灉
+ */
+ @Override
+ public R<IPage<BtmTypeVO>> getRef(Map<String, Object> condition, Query query, String domain) {
+ return R.fail("鑾峰彇鏁版嵁澶辫触");
+ }
+
+ /**
+ * 鏍规嵁鑻辨枃鍚嶇О鎵归噺鏌ヨ瀵硅薄
+ *
+ * @param ids 瀵硅薄鑻辨枃鍚嶇О 浣嗘槸涓嶈兘瓒呰繃1000
+ * @return 涓氬姟瀵硅薄
+ */
+ @Override
+ public R<List<BtmTypeVO>> selectByIdCollection(List<String> ids) {
+ return R.fail("鑾峰彇鏁版嵁澶辫触");
+ }
+
+ /**
+ * 鎵归噺鏍规嵁涓婚敭鑾峰彇涓氬姟绫诲瀷
+ *
+ * @param pkBtmTypeCollection 涓氬姟绫诲瀷涓婚敭闆嗗悎
+ * @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
+ */
+ @Override
+ public R<List<BtmTypeVO>> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) {
+ return R.fail("鑾峰彇鏁版嵁澶辫触");
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OmdAttributeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/AttributeVO.java
similarity index 86%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OmdAttributeVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/AttributeVO.java
index 33edc96..23b710e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OmdAttributeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/AttributeVO.java
@@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.vci.ubcs.omd.entity.OmdAttribute;
+import com.vci.ubcs.omd.entity.Attribute;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +21,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "鍏冩暟鎹樉绀哄璞�", description = "鍏冩暟鎹樉绀哄璞�")
-public class OmdAttributeVO extends OmdAttribute {
+public class AttributeVO extends Attribute {
/**
* 搴忓垪鍖�
*/
@@ -35,6 +35,6 @@
@ApiModelProperty("瀛楁鑼冨洿")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
- List<OmdFieldRangeVO> fieldRanges;
+ List<FieldRangeVO> fieldRanges;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OmdBtmTypeAttributeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java
similarity index 95%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OmdBtmTypeAttributeVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java
index bf5dd76..67d98cb 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OmdBtmTypeAttributeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.omd.vo;
-import com.vci.ubcs.omd.entity.OmdBtmTypeAttribute;
+import com.vci.ubcs.omd.entity.BtmTypeAttribute;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -16,7 +16,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "涓氬姟绫诲瀷鍖呭惈鐨勫睘鎬у璞�", description = "涓氬姟绫诲瀷鍖呭惈鐨勫睘鎬у璞�")
-public class OmdBtmTypeAttributeVO extends OmdBtmTypeAttribute {
+public class BtmTypeAttributeVO extends BtmTypeAttribute {
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OmdBtmTypeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java
similarity index 94%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OmdBtmTypeVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java
index 539967c..4c4f54e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OmdBtmTypeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java
@@ -11,7 +11,7 @@
* @date 2019/10/11 5:24 PM
*/
@Data
-public class OmdBtmTypeVO implements java.io.Serializable{
+public class BtmTypeVO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
@@ -66,7 +66,7 @@
/**
* 鐗堟湰瑙勫垯鏄剧ず瀵硅薄
*/
- private OsRevisionRuleVO revisionRuleVO;
+ private RevisionRuleVO revisionRuleVO;
/**
* 鏄惁鎶借薄鍖�
@@ -179,7 +179,7 @@
/**
* 鍖呭惈灞炴��
*/
- private List<OmdBtmTypeAttributeVO> attributes;
+ private List<BtmTypeAttributeVO> attributes;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OmdFieldRangeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/FieldRangeVO.java
similarity index 81%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OmdFieldRangeVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/FieldRangeVO.java
index 87edbe1..2d086e7 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OmdFieldRangeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/FieldRangeVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.omd.vo;
-import com.vci.ubcs.omd.entity.OmdFieldRange;
+import com.vci.ubcs.omd.entity.FieldRange;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -15,7 +15,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "瀛楁鑼冨洿鏄剧ず瀵硅薄", description = "瀛楁鑼冨洿鏄剧ず瀵硅薄")
-public class OmdFieldRangeVO extends OmdFieldRange {
+public class FieldRangeVO extends FieldRange {
/**
* 搴忓垪鍖�
*/
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLifeCycleEventVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java
similarity index 98%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLifeCycleEventVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java
index 89381ad..f3600ee 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLifeCycleEventVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java
@@ -7,7 +7,7 @@
* @author weidy
* @date 2019/10/17 9:46
*/
-public class OsLifeCycleEventVO implements java.io.Serializable{
+public class LifeCycleEventVO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLifeCycleLineEventVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
similarity index 98%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLifeCycleLineEventVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
index 2bcd4e2..6770a11 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLifeCycleLineEventVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
@@ -8,7 +8,7 @@
* @author weidy
* @date 2019/10/11 4:54 PM
*/
-public class OsLifeCycleLineEventVO implements java.io.Serializable{
+public class LifeCycleLineEventVO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLifeCycleLineVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineVO.java
similarity index 95%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLifeCycleLineVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineVO.java
index b20cc62..3cb2461 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLifeCycleLineVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineVO.java
@@ -8,7 +8,7 @@
* @author weidy
* @date 2019/10/11 4:48 PM
*/
-public class OsLifeCycleLineVO implements java.io.Serializable {
+public class LifeCycleLineVO implements java.io.Serializable {
/**
* 绂佹淇敼杩欎釜鍊�
@@ -93,7 +93,7 @@
/**
* 鍖呭惈浜嬩欢
*/
- private List<OsLifeCycleLineEventVO> events;
+ private List<LifeCycleLineEventVO> events;
public String getPkLifeCycle() {
return pkLifeCycle;
@@ -199,11 +199,11 @@
this.ts = ts;
}
- public List<OsLifeCycleLineEventVO> getEvents() {
+ public List<LifeCycleLineEventVO> getEvents() {
return events;
}
- public void setEvents(List<OsLifeCycleLineEventVO> events) {
+ public void setEvents(List<LifeCycleLineEventVO> events) {
this.events = events;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLifeCycleVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java
similarity index 95%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLifeCycleVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java
index 21133eb..b6b0bdb 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLifeCycleVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java
@@ -8,7 +8,7 @@
* @author weidy
* @date 2019/10/11 4:45 PM
*/
-public class OsLifeCycleVO implements java.io.Serializable{
+public class LifeCycleVO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
@@ -88,7 +88,7 @@
/**
* 鍖呭惈杩炴帴绾�
*/
- private List<OsLifeCycleLineVO> lines ;
+ private List<LifeCycleLineVO> lines ;
public String getClassFullName() {
return classFullName;
@@ -202,11 +202,11 @@
this.ts = ts;
}
- public List<OsLifeCycleLineVO> getLines() {
+ public List<LifeCycleLineVO> getLines() {
return lines;
}
- public void setLines(List<OsLifeCycleLineVO> lines) {
+ public void setLines(List<LifeCycleLineVO> lines) {
this.lines = lines;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLinkTypeAttributeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeAttributeVO.java
similarity index 99%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLinkTypeAttributeVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeAttributeVO.java
index b2a4e46..7f71297 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLinkTypeAttributeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeAttributeVO.java
@@ -8,7 +8,7 @@
* @author weidy
* @date 2019/10/11 6:16 PM
*/
-public class OsLinkTypeAttributeVO implements java.io.Serializable{
+public class LinkTypeAttributeVO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLinkTypeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeVO.java
similarity index 90%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLinkTypeVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeVO.java
index a412489..03cdf93 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsLinkTypeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LinkTypeVO.java
@@ -9,7 +9,7 @@
* @author weidy
* @date 2019/10/11 6:04 PM
*/
-public class OsLinkTypeVO implements java.io.Serializable {
+public class LinkTypeVO implements java.io.Serializable {
/**
* 绂佹淇敼杩欎釜鍊�
@@ -54,7 +54,7 @@
/**
* from绔笟鍔＄被鍨嬫樉绀哄璞�
*/
- private List<OmdBtmTypeVO> fromBtmTypeVOS;
+ private List<BtmTypeVO> fromBtmTypeVOS;
/**
* from绔笟鍔＄被鍨嬪悕绉�
@@ -74,7 +74,7 @@
/**
* to绔笟鍔＄被鍨嬫樉绀哄璞�
*/
- private List<OmdBtmTypeVO> toBtmTypeVOS;
+ private List<BtmTypeVO> toBtmTypeVOS;
/**
* 涓氬姟绫诲瀷鍚嶇О
@@ -114,7 +114,7 @@
/**
* 鍖呭惈灞炴��
*/
- private List<OsLinkTypeAttributeVO> attributes;
+ private List<LinkTypeAttributeVO> attributes;
public String getOid() {
return oid;
@@ -172,11 +172,11 @@
this.fromBtmType = fromBtmType;
}
- public List<OmdBtmTypeVO> getFromBtmTypeVOS() {
+ public List<BtmTypeVO> getFromBtmTypeVOS() {
return fromBtmTypeVOS;
}
- public void setFromBtmTypeVOS(List<OmdBtmTypeVO> fromBtmTypeVOS) {
+ public void setFromBtmTypeVOS(List<BtmTypeVO> fromBtmTypeVOS) {
this.fromBtmTypeVOS = fromBtmTypeVOS;
}
@@ -204,11 +204,11 @@
this.toBtmTypeName = toBtmTypeName;
}
- public List<OmdBtmTypeVO> getToBtmTypeVOS() {
+ public List<BtmTypeVO> getToBtmTypeVOS() {
return toBtmTypeVOS;
}
- public void setToBtmTypeVOS(List<OmdBtmTypeVO> toBtmTypeVOS) {
+ public void setToBtmTypeVOS(List<BtmTypeVO> toBtmTypeVOS) {
this.toBtmTypeVOS = toBtmTypeVOS;
}
@@ -252,11 +252,11 @@
this.ts = ts;
}
- public List<OsLinkTypeAttributeVO> getAttributes() {
+ public List<LinkTypeAttributeVO> getAttributes() {
return attributes;
}
- public void setAttributes(List<OsLinkTypeAttributeVO> attributes) {
+ public void setAttributes(List<LinkTypeAttributeVO> attributes) {
this.attributes = attributes;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsModifyAttributeInfoVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/ModifyAttributeInfoVO.java
similarity index 99%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsModifyAttributeInfoVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/ModifyAttributeInfoVO.java
index 3dc5025..a19b3f0 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsModifyAttributeInfoVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/ModifyAttributeInfoVO.java
@@ -7,7 +7,7 @@
* @author weidy
* @date 2019/10/18 11:48
*/
-public class OsModifyAttributeInfoVO implements java.io.Serializable{
+public class ModifyAttributeInfoVO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsRevisionRuleVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/RevisionRuleVO.java
similarity index 98%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsRevisionRuleVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/RevisionRuleVO.java
index 7b55f1e..ad5f3b2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsRevisionRuleVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/RevisionRuleVO.java
@@ -7,7 +7,7 @@
* @author weidy
* @date 2019/10/11 5:19 PM
*/
-public class OsRevisionRuleVO implements java.io.Serializable{
+public class RevisionRuleVO implements java.io.Serializable{
/**
* 绂佹淇敼杩欎釜鍊�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsStatusVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/StatusVO.java
similarity index 98%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsStatusVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/StatusVO.java
index 73715cc..fd8a951 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/OsStatusVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/StatusVO.java
@@ -7,7 +7,7 @@
* @author weidy
* @date 2019/10/11 4:40 PM
*/
-public class OsStatusVO implements java.io.Serializable {
+public class StatusVO implements java.io.Serializable {
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/controller/DdlController.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/controller/DdlController.java
index 26520c4..b06a46d 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/controller/DdlController.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/controller/DdlController.java
@@ -3,7 +3,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.ddl.bo.DdlTableBO;
import com.vci.ubcs.ddl.service.IDdlService;
-import com.vci.ubcs.omd.dto.OmdBtmTypeDTO;
+import com.vci.ubcs.omd.dto.BtmTypeDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -39,7 +39,7 @@
@PostMapping("/submitBtmType")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆涓氬姟绫诲瀷浼犺緭瀵硅薄")
- public R submitBtmType(@Valid @RequestBody OmdBtmTypeDTO dto) {
+ public R submitBtmType(@Valid @RequestBody BtmTypeDTO dto) {
return ddlService.submitBtmType(dto);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllBehavior.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllBehavior.java
index 604e9b8..a37b163 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllBehavior.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllBehavior.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.ddl.processor.dll;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import java.util.List;
@@ -46,21 +46,21 @@
* @param attributeVOList 灞炴�х殑绔嬬
* @return sql璇彞
*/
- String getCreateSqlByAttributeForBtm(List<OmdBtmTypeAttributeVO> attributeVOList);
+ String getCreateSqlByAttributeForBtm(List<BtmTypeAttributeVO> attributeVOList);
/**
* 澶勭悊鏁存暟绫诲瀷鐨剆ql杞崲
* @param attributeVO 灞炴��
* @return sql
*/
- String dealNumberCreateSql(OmdBtmTypeAttributeVO attributeVO);
+ String dealNumberCreateSql(BtmTypeAttributeVO attributeVO);
/**
* 璋冪敤澶勭悊榛樿鍊煎拰闈炵┖
* @param attributeVO 灞炴��
* @return 鎵ц缁撴灉
*/
- String dealDefaultAndNull(OmdBtmTypeAttributeVO attributeVO);
+ String dealDefaultAndNull(BtmTypeAttributeVO attributeVO);
/**
* 澶勭悊榛樿鍊�
@@ -74,32 +74,32 @@
* @param attributeVO 灞炴��
* @return sql
*/
- String dealDoubleCreateSql(OmdBtmTypeAttributeVO attributeVO);
+ String dealDoubleCreateSql(BtmTypeAttributeVO attributeVO);
/**
* 澶勭悊闈炵┖
* @return sql
*/
- String dealNullableSql(OmdBtmTypeAttributeVO attributeVO);
+ String dealNullableSql(BtmTypeAttributeVO attributeVO);
/**
* 澶勭悊甯冨皵绫诲瀷鐨剆ql杞崲
* @param attributeVO 灞炴��
* @return sql
*/
- String dealBooleanCreateSql(OmdBtmTypeAttributeVO attributeVO);
+ String dealBooleanCreateSql(BtmTypeAttributeVO attributeVO);
/**
* 澶勭悊鏃ユ湡鏃堕棿绫诲瀷鐨剆ql杞崲
* @param attributeVO 灞炴��
* @return sql
*/
- String dealDateTimeCreateSql(OmdBtmTypeAttributeVO attributeVO);
+ String dealDateTimeCreateSql(BtmTypeAttributeVO attributeVO);
/**
* 澶勭悊瀛楃涓茬被鍨嬬殑sql杞崲
* @param attributeVO 灞炴��
* @return sql
*/
- String dealStringCreateSql(OmdBtmTypeAttributeVO attributeVO);
+ String dealStringCreateSql(BtmTypeAttributeVO attributeVO);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessor.java
index 4fd51c8..4ea938e 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessor.java
@@ -1,10 +1,8 @@
package com.vci.ubcs.ddl.processor.dll;
import com.vci.ubcs.ddl.mapper.DllMapper;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import org.apache.commons.lang3.StringUtils;
-
-import java.util.List;
/**
* Description:DLL鐨勫鐞嗘帴鍙�
@@ -73,7 +71,7 @@
* @return sql
*/
@Override
- public String dealNumberCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealNumberCreateSql(BtmTypeAttributeVO attributeVO) {
StringBuilder snb = new StringBuilder().append(NUMBER + SPACE);
dealDefaultAndNull(attributeVO);
return snb.toString();
@@ -86,7 +84,7 @@
* @return 鎵ц缁撴灉
*/
@Override
- public String dealDefaultAndNull(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealDefaultAndNull(BtmTypeAttributeVO attributeVO) {
String value = "";
if (StringUtils.isNotBlank(attributeVO.getDefaultValue())) {
value += dealDefaultValue(attributeVO.getDefaultValue());
@@ -115,7 +113,7 @@
* @return sql
*/
@Override
- public String dealDoubleCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealDoubleCreateSql(BtmTypeAttributeVO attributeVO) {
Integer length = attributeVO.getPrecisionLength();
if(length == null || length == 0){
length = 20;
@@ -137,7 +135,7 @@
* @return sql
*/
@Override
- public String dealNullableSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealNullableSql(BtmTypeAttributeVO attributeVO) {
if (!attributeVO.isNullableFlag()) {
return SPACE + "not null" + SPACE;
}
@@ -151,7 +149,7 @@
* @return sql
*/
@Override
- public String dealBooleanCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealBooleanCreateSql(BtmTypeAttributeVO attributeVO) {
return "VARCHAR (5) " + SPACE + dealDefaultAndNull(attributeVO);
}
@@ -162,7 +160,7 @@
* @return sql
*/
@Override
- public String dealDateTimeCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealDateTimeCreateSql(BtmTypeAttributeVO attributeVO) {
return "DATETIME" + SPACE + dealDefaultAndNull(attributeVO);
}
@@ -173,7 +171,7 @@
* @return sql
*/
@Override
- public String dealStringCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealStringCreateSql(BtmTypeAttributeVO attributeVO) {
StringBuilder sb = new StringBuilder();
Integer length2 = attributeVO.getAttributeLength();
if (length2 == null) {
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java
index 4f5f19c..6ade30a 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMsMapperProcessor.java
@@ -3,11 +3,13 @@
import com.vci.ubcs.ddl.mapper.DllMapper;
import com.vci.ubcs.ddl.mapper.DllMsMapper;
-import com.vci.ubcs.ddl.mapper.DllOracleMapper;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
+<<<<<<< HEAD
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import org.apache.commons.lang3.StringUtils;
+=======
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
@@ -51,7 +53,7 @@
* @return sql璇彞
*/
@Override
- public String getCreateSqlByAttributeForBtm(List<OmdBtmTypeAttributeVO> attributeVOList) {
+ public String getCreateSqlByAttributeForBtm(List<BtmTypeAttributeVO> attributeVOList) {
StringBuilder sb = new StringBuilder();
attributeVOList.forEach(a -> {
sb.append(a.getId()).append(SPACE);
@@ -100,7 +102,7 @@
* @return sql
*/
@Override
- public String dealNumberCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealNumberCreateSql(BtmTypeAttributeVO attributeVO) {
return "INT" + SPACE + dealDefaultAndNull(attributeVO);
}
@@ -111,7 +113,7 @@
* @return sql
*/
@Override
- public String dealDoubleCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealDoubleCreateSql(BtmTypeAttributeVO attributeVO) {
Integer length = attributeVO.getPrecisionLength();
if(length == null || length == 0){
length = 20;
@@ -135,7 +137,7 @@
* @return sql
*/
@Override
- public String dealBooleanCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealBooleanCreateSql(BtmTypeAttributeVO attributeVO) {
return "VARCHAR (5) " + SPACE + dealDefaultAndNull(attributeVO);
}
@@ -146,7 +148,7 @@
* @return sql
*/
@Override
- public String dealDateTimeCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealDateTimeCreateSql(BtmTypeAttributeVO attributeVO) {
return "DATETIME" + SPACE + dealNullableSql(attributeVO);
}
@@ -157,7 +159,7 @@
* @return sql
*/
@Override
- public String dealStringCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealStringCreateSql(BtmTypeAttributeVO attributeVO) {
Integer length2 = attributeVO.getAttributeLength();
if(length2 == null){
length2 = 250;
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMySqlMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMySqlMapperProcessor.java
index 609aa10..0115dfd 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMySqlMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMySqlMapperProcessor.java
@@ -3,14 +3,16 @@
import com.vci.ubcs.ddl.mapper.DllMapper;
import com.vci.ubcs.ddl.mapper.DllOracleMapper;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
+<<<<<<< HEAD
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import org.apache.commons.lang3.StringUtils;
+=======
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
-import javax.smartcardio.ATR;
import java.util.List;
/**
@@ -51,7 +53,7 @@
* @return sql璇彞
*/
@Override
- public String getCreateSqlByAttributeForBtm(List<OmdBtmTypeAttributeVO> attributeVOList) {
+ public String getCreateSqlByAttributeForBtm(List<BtmTypeAttributeVO> attributeVOList) {
StringBuilder sb = new StringBuilder();
attributeVOList.forEach(a -> {
sb.append(a.getId()).append(SPACE);
@@ -99,7 +101,7 @@
* @return sql
*/
@Override
- public String dealNumberCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealNumberCreateSql(BtmTypeAttributeVO attributeVO) {
StringBuilder sb = new StringBuilder();
if (VciFieldTypeEnum.VTInteger.name().equalsIgnoreCase(attributeVO.getAttrDataType())) {
sb.append("INT").append(SPACE);
@@ -118,7 +120,7 @@
* @return sql
*/
@Override
- public String dealDoubleCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealDoubleCreateSql(BtmTypeAttributeVO attributeVO) {
StringBuilder sb = new StringBuilder();
Integer length = attributeVO.getPrecisionLength();
if (length == null || length == 0) {
@@ -143,7 +145,7 @@
* @return sql
*/
@Override
- public String dealBooleanCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealBooleanCreateSql(BtmTypeAttributeVO attributeVO) {
return "VARCHAR (5) " + SPACE + dealDefaultAndNull(attributeVO);
}
@@ -154,7 +156,7 @@
* @return sql
*/
@Override
- public String dealDateTimeCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealDateTimeCreateSql(BtmTypeAttributeVO attributeVO) {
return "DATETIME" + SPACE + dealDefaultAndNull(attributeVO);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java
index 41ed763..9e92da4 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllOracleMapperProcessor.java
@@ -1,12 +1,19 @@
package com.vci.ubcs.ddl.processor.dll;
+<<<<<<< HEAD
+=======
+import com.vci.starter.web.enumpck.VciFieldTypeEnum;
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
import com.vci.ubcs.ddl.mapper.DllMapper;
import com.vci.ubcs.ddl.mapper.DllOracleMapper;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
+<<<<<<< HEAD
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;
+=======
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
@@ -50,7 +57,7 @@
* @return sql璇彞
*/
@Override
- public String getCreateSqlByAttributeForBtm(List<OmdBtmTypeAttributeVO> attributeVOList) {
+ public String getCreateSqlByAttributeForBtm(List<BtmTypeAttributeVO> attributeVOList) {
StringBuilder sb = new StringBuilder();
attributeVOList.forEach(a -> {
sb.append(a.getId()).append(SPACE);
@@ -99,7 +106,7 @@
* @return sql
*/
@Override
- public String dealStringCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealStringCreateSql(BtmTypeAttributeVO attributeVO) {
Integer length2 = attributeVO.getAttributeLength();
StringBuilder sb = new StringBuilder();
if(length2 == null){
@@ -122,7 +129,7 @@
* @return sql
*/
@Override
- public String dealDateTimeCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealDateTimeCreateSql(BtmTypeAttributeVO attributeVO) {
return TIMESTAMP + SPACE + dealNullableSql(attributeVO);
}
@@ -133,7 +140,7 @@
* @return sql
*/
@Override
- public String dealBooleanCreateSql(OmdBtmTypeAttributeVO attributeVO) {
+ public String dealBooleanCreateSql(BtmTypeAttributeVO attributeVO) {
return VARCHAR + "(5)" + SPACE + dealDefaultAndNull(attributeVO);
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllSqlLiteMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllSqlLiteMapperProcessor.java
index dc3f5d9..4abfa2f 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllSqlLiteMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllSqlLiteMapperProcessor.java
@@ -1,9 +1,8 @@
package com.vci.ubcs.ddl.processor.dll;
import com.vci.ubcs.ddl.mapper.DllMapper;
-import com.vci.ubcs.ddl.mapper.DllOracleMapper;
import com.vci.ubcs.ddl.mapper.DllSqlLiteMapper;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
@@ -44,7 +43,7 @@
* @return sql璇彞
*/
@Override
- public String getCreateSqlByAttributeForBtm(List<OmdBtmTypeAttributeVO> attributeVOList) {
+ public String getCreateSqlByAttributeForBtm(List<BtmTypeAttributeVO> attributeVOList) {
return null;
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/IDdlService.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/IDdlService.java
index 90c842a..f0a3c8f 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/IDdlService.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/IDdlService.java
@@ -2,14 +2,12 @@
import com.vci.starter.word.bo.WordMergeStartTableDataBO;
import com.vci.ubcs.ddl.bo.DdlTableBO;
-import com.vci.ubcs.ddl.enums.DataBaseEnum;
-import com.vci.ubcs.omd.dto.OmdBtmTypeDTO;
-import com.vci.ubcs.omd.entity.OmdBtmTypeAttribute;
-import com.vci.ubcs.omd.entity.OsModifyAttributeInfoDO;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
-import com.vci.ubcs.omd.vo.OmdBtmTypeVO;
-import com.vci.ubcs.omd.vo.OsLinkTypeAttributeVO;
-import com.vci.ubcs.omd.vo.OsLinkTypeVO;
+import com.vci.ubcs.omd.dto.BtmTypeDTO;
+import com.vci.ubcs.omd.entity.ModifyAttributeInfoDO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.omd.vo.LinkTypeAttributeVO;
+import com.vci.ubcs.omd.vo.LinkTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import org.springblade.core.tool.api.R;
@@ -81,28 +79,28 @@
* @param modifyLengthAttrDOList 闇�瑕佷慨鏀圭殑灞炴�у璞�
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- void changeColumnForBtm(List<OmdBtmTypeAttributeVO> modifyLengthAttrDOList) throws VciBaseException;
+ void changeColumnForBtm(List<BtmTypeAttributeVO> modifyLengthAttrDOList) throws VciBaseException;
/**
* 淇敼閾炬帴绫诲瀷涓殑灞炴�у瓧娈电殑闀垮害锛屾敞鎰忓湪鎵ц杩欎釜鏂规硶鏃跺氨浼氬皢浠ュ墠鐨勪簨鍔℃彁浜ゃ��
* @param modifyLengthAttrDOListForLinkType 闇�瑕佷慨鏀圭殑灞炴�у璞�
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- void changeColumnForLink(List<OsLinkTypeAttributeVO> modifyLengthAttrDOListForLinkType) throws VciBaseException;
+ void changeColumnForLink(List<LinkTypeAttributeVO> modifyLengthAttrDOListForLinkType) throws VciBaseException;
/**
* 娣诲姞灞炴�у瓧娈靛埌涓氬姟绫诲瀷涓紝娉ㄦ剰鍦ㄦ墽琛岃繖涓柟娉曟椂灏变細灏嗕互鍓嶇殑浜嬪姟鎻愪氦銆�
* @param addAttrDOList 闇�瑕佹坊鍔犵殑灞炴�у璞�
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- void addColumn2TableForBtm(List<OmdBtmTypeAttributeVO> addAttrDOList) throws VciBaseException;
+ void addColumn2TableForBtm(List<BtmTypeAttributeVO> addAttrDOList) throws VciBaseException;
/**
* 娣诲姞灞炴�у瓧娈靛埌閾炬帴绫诲瀷涓紝娉ㄦ剰鍦ㄦ墽琛岃繖涓柟娉曟椂灏变細灏嗕互鍓嶇殑浜嬪姟鎻愪氦銆�
* @param addAttrDOListForLinkType 闇�瑕佹坊鍔犵殑灞炴�у璞�
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- void addColumn2TableForLink(List<OsLinkTypeAttributeVO> addAttrDOListForLinkType) throws VciBaseException;
+ void addColumn2TableForLink(List<LinkTypeAttributeVO> addAttrDOListForLinkType) throws VciBaseException;
/**
* 鍒ゆ柇琛ㄤ腑鏄惁鏈夋暟鎹�
@@ -159,14 +157,14 @@
* @param linkTypeVOList 閾炬帴绫诲瀷瀵硅薄锛屾湁灞炴�ф椂闇�瑕佸寘鍚睘鎬�
* @return 涓嶅悓鐨勫湴鏂癸紝姣忎竴涓笟鍔＄被鍨嬫垨鑰呴摼鎺ョ被鍨嬩竴鏉℃暟鎹�
*/
- List<OsModifyAttributeInfoDO> checkDifferent(List<OmdBtmTypeVO> btmTypeVOList, List<OsLinkTypeVO> linkTypeVOList) throws VciBaseException;
+ List<ModifyAttributeInfoDO> checkDifferent(List<BtmTypeVO> btmTypeVOList, List<LinkTypeVO> linkTypeVOList) throws VciBaseException;
/**
* 娓呯悊涓氬姟绫诲瀷涓拰鏁版嵁搴撻噷涓嶄竴鏍风殑
* @param differentAttributeList 涓嶅悓鐨勫睘鎬х殑鍒楄〃
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮墽琛屽嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
- void reflexDifferent(List<OsModifyAttributeInfoDO> differentAttributeList) throws VciBaseException;
+ void reflexDifferent(List<ModifyAttributeInfoDO> differentAttributeList) throws VciBaseException;
/**
* 鑾峰彇鏁版嵁搴撲腑鎵�鏈夌殑琛ㄦ牸
@@ -225,7 +223,7 @@
* @param dto 涓氬姟绫诲瀷浼犺緭瀵硅薄
* @return 鎵ц缁撴灉
*/
- R submitBtmType(OmdBtmTypeDTO dto);
+ R submitBtmType(BtmTypeDTO dto);
/**
* 鎸夎〃鍚嶈幏鍙栬〃淇℃伅
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
index f9470ae..561ae46 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
@@ -1,7 +1,11 @@
package com.vci.ubcs.ddl.service.impl;
+<<<<<<< HEAD
import com.alibaba.nacos.client.naming.NacosNamingService;
+=======
+import com.vci.starter.web.util.VciBaseUtil;
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
import com.vci.starter.word.bo.WordMergeStartTableDataBO;
import com.vci.ubcs.ddl.bo.DdlTableBO;
import com.vci.ubcs.ddl.bo.DdlTableInDataBaseBO;
@@ -12,13 +16,13 @@
import com.vci.ubcs.ddl.properties.DdlExportWordFieldProperties;
import com.vci.ubcs.ddl.properties.DdlPropertise;
import com.vci.ubcs.ddl.service.IDdlService;
-import com.vci.ubcs.omd.cache.OmdBtmTypeCache;
-import com.vci.ubcs.omd.dto.OmdBtmTypeDTO;
-import com.vci.ubcs.omd.entity.OsModifyAttributeInfoDO;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
-import com.vci.ubcs.omd.vo.OmdBtmTypeVO;
-import com.vci.ubcs.omd.vo.OsLinkTypeAttributeVO;
-import com.vci.ubcs.omd.vo.OsLinkTypeVO;
+import com.vci.ubcs.omd.cache.BtmTypeCache;
+import com.vci.ubcs.omd.dto.BtmTypeDTO;
+import com.vci.ubcs.omd.entity.ModifyAttributeInfoDO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.omd.vo.LinkTypeAttributeVO;
+import com.vci.ubcs.omd.vo.LinkTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.apache.commons.lang3.StringUtils;
@@ -90,7 +94,7 @@
@Override
public String getTableNameByBtmTypeOid(String pkBtmType) {
VciBaseUtil.alertNotNull(pkBtmType, "涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬬殑涓婚敭");
- OmdBtmTypeVO btmType = OmdBtmTypeCache.getDetail(pkBtmType);
+ BtmTypeVO btmType = BtmTypeCache.getDetail(pkBtmType);
String tableName = "";
if (btmType == null || StringUtils.isBlank(btmType.getOid())) {
/*OsLinkTypeDO linkTypeDO = linkTypeDOMapper.selectByPrimaryKey(pkBtmType.trim());
@@ -114,7 +118,7 @@
@Override
public String getTableNameByBtmTypeId(String id) {
VciBaseUtil.alertNotNull(id, "涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨嬬殑鑻辨枃鍚嶇О");
- List<OmdBtmTypeVO> btmTypeList = OmdBtmTypeCache.selectByIdCollection(VciBaseUtil.str2List(id));
+ List<BtmTypeVO> btmTypeList = BtmTypeCache.selectByIdCollection(VciBaseUtil.str2List(id));
String tableName = "";
if (CollectionUtils.isEmpty(btmTypeList)) {
/*List<OsLinkTypeDO> linkTypeDOList = linkTypeDOMapper.selectByIdCollection(VciBaseUtil.str2List(id));
@@ -162,7 +166,7 @@
@Override
public void createDbTablesByOidCollection(Collection<String> oidCollection) throws VciBaseException {
VciBaseUtil.alertCollectionNotNull("涓氬姟绫诲瀷/閾炬帴绫诲瀷鐨勪富閿泦鍚�", oidCollection);
- List<OmdBtmTypeVO> btmTypeVOList = OmdBtmTypeCache.listBtmTypeByOidCollection(oidCollection);
+ List<BtmTypeVO> btmTypeVOList = BtmTypeCache.listBtmTypeByOidCollection(oidCollection);
// List<OsLinkTypeVO> linkTypeVOList = linkTypeService.listLinkTypeByOidCollection(oidCollection);
if (!CollectionUtils.isEmpty(btmTypeVOList)) {
//璇存槑鏄笟鍔＄被鍨�
@@ -182,7 +186,7 @@
* @param btmTypeVO 涓氬姟绫诲瀷鐨勬樉绀哄璞�
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- private void createDbTableForBtm(OmdBtmTypeVO btmTypeVO) throws VciBaseException {
+ private void createDbTableForBtm(BtmTypeVO btmTypeVO) throws VciBaseException {
VciBaseUtil.alertNotNull(btmTypeVO, "瑕佸垱寤鸿〃鏍兼墍灞炵殑涓氬姟绫诲瀷", btmTypeVO.getTableName(), "涓氬姟绫诲瀷鐨勮〃鏍煎悕绉�");
if (btmTypeVO.isViewFlag() && StringUtils.isNotBlank(btmTypeVO.getViewCreateSql())) {
//璇存槑鏄鍥�
@@ -211,7 +215,7 @@
@Override
public void createDbTablesById(String ids) throws VciBaseException {
VciBaseUtil.alertNotNull(ids, "涓氬姟绫诲瀷/閾炬帴绫诲瀷鐨勮嫳鏂囬泦鍚�");
- List<OmdBtmTypeVO> btmTypeVOList = OmdBtmTypeCache.selectByIdCollection(VciBaseUtil.str2List(ids));
+ List<BtmTypeVO> btmTypeVOList = BtmTypeCache.selectByIdCollection(VciBaseUtil.str2List(ids));
// List<OsLinkTypeVO> linkTypeVOList = linkTypeService.listLinkTypeByIdCollection(VciBaseUtil.str2List(ids));
if (!CollectionUtils.isEmpty(btmTypeVOList)) {
//璇存槑鏄笟鍔＄被鍨�
@@ -233,11 +237,11 @@
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public void changeColumnForBtm(List<OmdBtmTypeAttributeVO> modifyLengthAttrVOList) throws VciBaseException {
+ public void changeColumnForBtm(List<BtmTypeAttributeVO> modifyLengthAttrVOList) throws VciBaseException {
VciBaseUtil.alertCollectionNotNull("瑕佷慨鏀归暱搴︾殑灞炴�ч泦", modifyLengthAttrVOList);
- Map<String, List<OmdBtmTypeAttributeVO>> btmTypeHasAttributeVOMap = modifyLengthAttrVOList.stream().collect(Collectors.groupingBy(OmdBtmTypeAttributeVO::getPkBtmType));
+ Map<String, List<BtmTypeAttributeVO>> btmTypeHasAttributeVOMap = modifyLengthAttrVOList.stream().collect(Collectors.groupingBy(BtmTypeAttributeVO::getPkBtmType));
btmTypeHasAttributeVOMap.forEach((k, v) -> {
- OmdBtmTypeVO btmTypeVO = OmdBtmTypeCache.getDetail(k);
+ BtmTypeVO btmTypeVO = BtmTypeCache.getDetail(k);
if (btmTypeVO == null || StringUtils.isBlank(btmTypeVO.getOid())) {
throw new VciBaseException("瑕佷慨鏀瑰睘鎬у垪闀垮害鐨勪笟鍔＄被鍨嬩笉瀛樺湪");
}
@@ -260,7 +264,7 @@
* @param tableName 琛ㄦ牸鐨勫悕绉�
* @param attributeVOList 瑕佹坊鍔犵殑灞炴�у瓧娈�
*/
- private void changeColumnsForTable(String tableName, List<OmdBtmTypeAttributeVO> attributeVOList) {
+ private void changeColumnsForTable(String tableName, List<BtmTypeAttributeVO> attributeVOList) {
String attributeSql = dllMapper.getCreateSqlByAttributeForBtm(attributeVOList);
//鍏堝垽鏂〃鏍兼槸鍚﹀瓨鍦�
boolean tableExist = false;
@@ -283,7 +287,7 @@
* @param tableName 琛ㄦ牸鍚嶇О
* @param attributeVOList 灞炴�у璞″垪琛�
*/
- private void commentColumnsForTable(String tableName, List<OmdBtmTypeAttributeVO> attributeVOList) {
+ private void commentColumnsForTable(String tableName, List<BtmTypeAttributeVO> attributeVOList) {
if (StringUtils.isNotBlank(tableName) && !CollectionUtils.isEmpty(attributeVOList)) {
attributeVOList.stream().forEach(s -> {
ddlMapper.commentColumnTable(tableName, s.getId(), s.getName());
@@ -298,7 +302,7 @@
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public void changeColumnForLink(List<OsLinkTypeAttributeVO> modifyLengthAttrDOListForLinkType) throws VciBaseException {
+ public void changeColumnForLink(List<LinkTypeAttributeVO> modifyLengthAttrDOListForLinkType) throws VciBaseException {
}
@@ -309,11 +313,11 @@
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public void addColumn2TableForBtm(List<OmdBtmTypeAttributeVO> addAttrDOList) throws VciBaseException {
+ public void addColumn2TableForBtm(List<BtmTypeAttributeVO> addAttrDOList) throws VciBaseException {
VciBaseUtil.alertCollectionNotNull("瑕佹坊鍔犲埌鏁版嵁搴撹〃涓殑灞炴�ч泦", addAttrDOList);
- Map<String, List<OmdBtmTypeAttributeVO>> btmTypeHasAttributeVOMap = addAttrDOList.stream().collect(Collectors.groupingBy(OmdBtmTypeAttributeVO::getPkBtmType));
+ Map<String, List<BtmTypeAttributeVO>> btmTypeHasAttributeVOMap = addAttrDOList.stream().collect(Collectors.groupingBy(BtmTypeAttributeVO::getPkBtmType));
btmTypeHasAttributeVOMap.forEach((k, v) -> {
- OmdBtmTypeVO btmTypeVO = OmdBtmTypeCache.getDetail(k);
+ BtmTypeVO btmTypeVO = BtmTypeCache.getDetail(k);
if (btmTypeVO == null || StringUtils.isBlank(btmTypeVO.getOid())) {
throw new VciBaseException("瑕佷慨鏀瑰睘鎬у垪闀垮害鐨勪笟鍔＄被鍨嬩笉瀛樺湪");
}
@@ -330,11 +334,15 @@
* @param attributeVOList 灞炴�х殑鏄剧ず瀵硅薄
* @throws VciBaseException 鎵ц鎴栬�呰幏鍙杝ql璇彞鐨勬椂鍊欏嚭鐜伴敊璇細鎶涘嚭寮傚父
*/
+<<<<<<< HEAD
private void addColumnForTable(String tableName, List<OmdBtmTypeAttributeVO> attributeVOList) throws VciBaseException{
+=======
+ private void addColumnForTable(String tableName, List<BtmTypeAttributeVO> attributeVOList) {
+>>>>>>> dd3a6c681f938fd53d5f6cc3a4fcee40e71b259c
String attributeSql = dllMapper.getCreateSqlByAttributeForBtm(attributeVOList);
//鍏堝垽鏂〃鏍兼槸鍚﹀瓨鍦�
if (!checkTableExistByTableName(tableName)) {
- OmdBtmTypeAttributeVO attributeVO = attributeVOList.get(0);
+ BtmTypeAttributeVO attributeVO = attributeVOList.get(0);
createDbTables(attributeVO.getPkBtmType());
} else {
ddlMapper.addColumn2TableBySql(tableName, attributeSql);
@@ -349,7 +357,7 @@
* @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
@Override
- public void addColumn2TableForLink(List<OsLinkTypeAttributeVO> addAttrDOListForLinkType) throws VciBaseException {
+ public void addColumn2TableForLink(List<LinkTypeAttributeVO> addAttrDOListForLinkType) throws VciBaseException {
}
@@ -450,7 +458,7 @@
* @return 涓嶅悓鐨勫湴鏂癸紝姣忎竴涓笟鍔＄被鍨嬫垨鑰呴摼鎺ョ被鍨嬩竴鏉℃暟鎹�
*/
@Override
- public List<OsModifyAttributeInfoDO> checkDifferent(List<OmdBtmTypeVO> btmTypeVOList, List<OsLinkTypeVO> linkTypeVOList) throws VciBaseException {
+ public List<ModifyAttributeInfoDO> checkDifferent(List<BtmTypeVO> btmTypeVOList, List<LinkTypeVO> linkTypeVOList) throws VciBaseException {
return null;
}
@@ -461,7 +469,7 @@
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮墽琛屽嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
@Override
- public void reflexDifferent(List<OsModifyAttributeInfoDO> differentAttributeList) throws VciBaseException {
+ public void reflexDifferent(List<ModifyAttributeInfoDO> differentAttributeList) throws VciBaseException {
}
@@ -557,9 +565,9 @@
* @return 鎵ц缁撴灉
*/
@Override
- public R submitBtmType(OmdBtmTypeDTO dto) {
+ public R submitBtmType(BtmTypeDTO dto) {
VciBaseUtil.alertNotNull(dto, "涓氬姟绫诲瀷", dto.getAttributesDTOList(), "涓氬姟绫诲瀷灞炴��");
- OmdBtmTypeVO btmTypeVO = Objects.requireNonNull(BeanUtil.copy(dto, OmdBtmTypeVO.class));
+ BtmTypeVO btmTypeVO = Objects.requireNonNull(BeanUtil.copy(dto, BtmTypeVO.class));
if (Func.isNotBlank(dto.getTableName())) {
checkModifyOrCreateTable(btmTypeVO);
} else {
@@ -581,12 +589,12 @@
*
* @param btmTypeVO 涓氬姟绫诲瀷
*/
- private void checkModifyOrCreateTable(OmdBtmTypeVO btmTypeVO) {
+ private void checkModifyOrCreateTable(BtmTypeVO btmTypeVO) {
if (checkTableExistByTableName(btmTypeVO.getTableName())) {
// 琛ㄥ凡瀛樺湪锛屾牎楠屽睘鎬�
- List<OmdBtmTypeVO> vos = new ArrayList<>();
+ List<BtmTypeVO> vos = new ArrayList<>();
vos.add(btmTypeVO);
- List<OsModifyAttributeInfoDO> differentAttributeList = checkDifferent(vos, null);
+ List<ModifyAttributeInfoDO> differentAttributeList = checkDifferent(vos, null);
if (CollectionUtils.isEmpty(differentAttributeList)) {
// 鍙互鐩存帴鍒犻櫎鍐嶅垱寤�
dropTableByName(btmTypeVO.getTableName());
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
similarity index 72%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
index b6045dd..e6200a9 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdAttributeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
@@ -4,12 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.omd.constant.OmdCacheConstant;
-import com.vci.ubcs.omd.dto.OmdAttributeDTO;
-import com.vci.ubcs.omd.entity.OmdAttribute;
-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.system.vo.DictVO;
+import com.vci.ubcs.omd.dto.AttributeDTO;
+import com.vci.ubcs.omd.entity.Attribute;
+import com.vci.ubcs.omd.service.IAttributeService;
+import com.vci.ubcs.omd.vo.AttributeVO;
+import com.vci.ubcs.omd.wrapper.AttributeWrapper;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
@@ -37,11 +36,11 @@
@AllArgsConstructor
@RequestMapping("/attribute")
@Api(value = "鍏冩暟鎹帶鍒跺櫒", tags = "鍏冩暟鎹帶鍒跺櫒")
-public class OmdAttributeController extends BladeController {
+public class AttributeController extends BladeController {
/**
* 鍏冩暟鎹湇鍔�
*/
- private final IOmdAttributeService attributeService;
+ private final IAttributeService attributeService;
/**
* 鏌ョ湅璇︽儏
@@ -51,7 +50,7 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "鏌ョ湅璇︽儏", notes = "浼犲叆涓婚敭")
- public R<OmdAttributeVO> detail(Long id) {
+ public R<AttributeVO> detail(Long id) {
return R.data(attributeService.getAttributeDetail(id));
}
@@ -66,8 +65,8 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ")
- public R<List<OmdAttributeVO>> list(@ApiIgnore @RequestParam Map<String, Object> condition) {
- return R.data(OmdAttributeWrapper.build().listEntityVO(attributeService.list(Condition.getQueryWrapper(condition, OmdAttribute.class).lambda().orderByAsc(OmdAttribute::getKey))));
+ public R<List<AttributeVO>> list(@ApiIgnore @RequestParam Map<String, Object> condition) {
+ return R.data(AttributeWrapper.build().listEntityVO(attributeService.list(Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getKey))));
}
/**
@@ -80,11 +79,11 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ")
- public R<IPage<OmdAttributeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
- IPage<OmdAttributeVO> pageVO = new Page<>();
- IPage<OmdAttribute> page = attributeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, OmdAttribute.class).lambda().orderByAsc(OmdAttribute::getKey));
+ public R<IPage<AttributeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
+ IPage<AttributeVO> pageVO = new Page<>();
+ IPage<Attribute> page = attributeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getKey));
BeanUtil.copy(page,pageVO);
- pageVO.setRecords( OmdAttributeWrapper.build().listEntityVO(page.getRecords()));
+ pageVO.setRecords( AttributeWrapper.build().listEntityVO(page.getRecords()));
return R.data(pageVO);
}
@@ -97,7 +96,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆鍏冩暟鎹璞�")
- public R submit(@Valid @RequestBody OmdAttributeDTO dto) {
+ public R submit(@Valid @RequestBody AttributeDTO dto) {
CacheUtil.clear(OmdCacheConstant.ATTR_CACHE);
return R.status(attributeService.submit(dto));
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdBtmTypeController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java
similarity index 76%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdBtmTypeController.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java
index 80e891d..2a88bb7 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/OmdBtmTypeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java
@@ -4,12 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.omd.constant.OmdCacheConstant;
-import com.vci.ubcs.omd.dto.OmdBtmTypeDTO;
-import com.vci.ubcs.omd.entity.OmdBtmType;
-import com.vci.ubcs.omd.service.IOmdBtmTypeService;
-import com.vci.ubcs.omd.vo.OmdBtmTypeVO;
-import com.vci.ubcs.omd.wrapper.OmdBtmTypeWrapper;
-import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
+import com.vci.ubcs.omd.dto.BtmTypeDTO;
+import com.vci.ubcs.omd.entity.BtmType;
+import com.vci.ubcs.omd.service.IBtmTypeService;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
@@ -39,12 +38,12 @@
@AllArgsConstructor
@RequestMapping("/btm-type")
@Api(value = "涓氬姟绫诲瀷鎺у埗鍣�", tags = "涓氬姟绫诲瀷鎺у埗鍣�")
-public class OmdBtmTypeController extends BladeController {
+public class BtmTypeController extends BladeController {
/**
* 涓氬姟绫诲瀷鏈嶅姟
*/
- private final IOmdBtmTypeService btmTypeService;
+ private final IBtmTypeService btmTypeService;
/**
@@ -56,7 +55,7 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "鏌ョ湅璇︽儏", notes = "浼犲叆涓婚敭")
- public R<OmdBtmTypeVO> detail(String oid) {
+ public R<BtmTypeVO> detail(String oid) {
return R.data(btmTypeService.getBtmTypeByOid(oid));
}
@@ -75,8 +74,8 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ")
- public R<List<OmdBtmTypeVO>> list(@ApiIgnore @RequestParam Map<String, Object> condition) {
- return R.data(OmdBtmTypeWrapper.build().listEntityVO(btmTypeService.list(Condition.getQueryWrapper(condition, OmdBtmType.class).lambda().orderByAsc(OmdBtmType::getId))));
+ public R<List<BtmTypeVO>> list(@ApiIgnore @RequestParam Map<String, Object> condition) {
+ return R.data(BtmTypeWrapper.build().listEntityVO(btmTypeService.list(Condition.getQueryWrapper(condition, BtmType.class).lambda().orderByAsc(BtmType::getId))));
}
/**
@@ -93,11 +92,11 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鏌ヨ鍒楄〃", notes = "浼犲叆鏌ヨ")
- public R<IPage<OmdBtmTypeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
- IPage<OmdBtmTypeVO> pageVO = new Page<>();
- IPage<OmdBtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, OmdBtmType.class).lambda().orderByAsc(OmdBtmType::getId));
+ public R<IPage<BtmTypeVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> condition, Query query) {
+ IPage<BtmTypeVO> pageVO = new Page<>();
+ IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, BtmType.class).lambda().orderByAsc(BtmType::getId));
BeanUtil.copy(page, pageVO);
- pageVO.setRecords(OmdBtmTypeWrapper.build().listEntityVO(page.getRecords()));
+ pageVO.setRecords(BtmTypeWrapper.build().listEntityVO(page.getRecords()));
return R.data(pageVO);
}
@@ -111,7 +110,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆鍏冩暟鎹璞�")
- public R submit(@Valid @RequestBody OmdBtmTypeDTO dto) {
+ public R submit(@Valid @RequestBody BtmTypeDTO dto) {
CacheUtil.clear(OmdCacheConstant.BTM_CACHE);
return R.status(btmTypeService.submit(dto));
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/OmdAttributeClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java
similarity index 70%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/OmdAttributeClient.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java
index dfc3e88..870ccec 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/OmdAttributeClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/AttributeClient.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.omd.feign;
-import com.vci.ubcs.omd.entity.OmdAttribute;
-import com.vci.ubcs.omd.service.IOmdAttributeService;
+import com.vci.ubcs.omd.entity.Attribute;
+import com.vci.ubcs.omd.service.IAttributeService;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tenant.annotation.NonDS;
@@ -24,20 +24,20 @@
@ApiIgnore
@RestController
@AllArgsConstructor
-public class OmdAttributeClient implements IOmdAttributeClient{
- private final IOmdAttributeService service;
+public class AttributeClient implements IAttributeClient {
+ private final IAttributeService service;
@Override
@GetMapping(GET_BY_ID)
- public R<OmdAttribute> getById(Long id) {
+ public R<Attribute> getById(Long id) {
return R.data(service.getById(id));
}
@Override
@GetMapping(GET_LIST)
- public R<List<OmdAttribute>> getList(String key) {
+ public R<List<Attribute>> getList(String key) {
Map<String,Object> condition = new HashMap<>();
condition.put("key",key);
- return R.data(service.list(Condition.getQueryWrapper(condition, OmdAttribute.class).lambda().orderByAsc(OmdAttribute::getKey)));
+ return R.data(service.list(Condition.getQueryWrapper(condition, Attribute.class).lambda().orderByAsc(Attribute::getKey)));
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/OmdBtmTypeClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
similarity index 61%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/OmdBtmTypeClient.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
index ae445bf..5625897 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/OmdBtmTypeClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
@@ -3,10 +3,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.vci.ubcs.omd.entity.OmdBtmType;
-import com.vci.ubcs.omd.service.IOmdBtmTypeService;
-import com.vci.ubcs.omd.vo.OmdBtmTypeVO;
-import com.vci.ubcs.omd.wrapper.OmdBtmTypeWrapper;
+import com.vci.ubcs.omd.entity.BtmType;
+import com.vci.ubcs.omd.service.IBtmTypeService;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -29,9 +29,9 @@
@ApiIgnore
@RestController
@AllArgsConstructor
-public class OmdBtmTypeClient implements IOmdBtmTypeClient{
+public class BtmTypeClient implements IBtmTypeClient {
- private final IOmdBtmTypeService btmTypeService;
+ private final IBtmTypeService btmTypeService;
/**
@@ -41,7 +41,7 @@
* @return 涓氬姟绫诲瀷璇︽儏淇℃伅
*/
@Override
- public R<OmdBtmTypeVO> getDetail(String oid) {
+ public R<BtmTypeVO> getDetail(String oid) {
return R.data(btmTypeService.getBtmTypeByOid(oid));
}
@@ -54,13 +54,13 @@
* @return 鏌ヨ缁撴灉
*/
@Override
- public R<IPage<OmdBtmTypeVO>> getRef(Map<String, Object> condition, Query query, String domain) {
+ public R<IPage<BtmTypeVO>> getRef(Map<String, Object> condition, Query query, String domain) {
Func.requireNotNull(domain,"棰嗗煙鍊�");
- IPage<OmdBtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, OmdBtmType.class).lambda().eq(OmdBtmType::getDomain, domain).orderByAsc(OmdBtmType::getId));
- IPage<OmdBtmTypeVO> pageVO = new Page<>();
+ IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, BtmType.class).lambda().eq(BtmType::getDomain, domain).orderByAsc(BtmType::getId));
+ IPage<BtmTypeVO> pageVO = new Page<>();
BeanUtil.copy(page,pageVO);
- pageVO.setRecords(OmdBtmTypeWrapper.build().listEntityVO(page.getRecords()));
- R<IPage<OmdBtmTypeVO>> r = R.data(pageVO);
+ pageVO.setRecords(BtmTypeWrapper.build().listEntityVO(page.getRecords()));
+ R<IPage<BtmTypeVO>> r = R.data(pageVO);
r.setSuccess(true);
return r;
}
@@ -72,11 +72,11 @@
* @return 涓氬姟瀵硅薄
*/
@Override
- public R<List<OmdBtmTypeVO>> selectByIdCollection(List<String> ids) {
+ public R<List<BtmTypeVO>> selectByIdCollection(List<String> ids) {
Func.requireNotNull(ids,"涓氬姟绫诲瀷鑻辨枃鍚嶇О");
- List<OmdBtmTypeVO> voList = OmdBtmTypeWrapper.build().listEntityVO(
+ List<BtmTypeVO> voList = BtmTypeWrapper.build().listEntityVO(
Optional.ofNullable(btmTypeService.list(
- Wrappers.<OmdBtmType>query().lambda().in(OmdBtmType::getId, ids)
+ Wrappers.<BtmType>query().lambda().in(BtmType::getId, ids)
)
).orElseGet(ArrayList::new)
);
@@ -90,11 +90,11 @@
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
*/
@Override
- public R<List<OmdBtmTypeVO>> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) {
+ public R<List<BtmTypeVO>> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) {
Func.requireNotNull(pkBtmTypeCollection,"涓氬姟绫诲瀷涓婚敭");
- List<OmdBtmTypeVO> voList = OmdBtmTypeWrapper.build().listEntityVO(
+ List<BtmTypeVO> voList = BtmTypeWrapper.build().listEntityVO(
Optional.ofNullable(btmTypeService.list(
- Wrappers.<OmdBtmType>query().lambda().in(OmdBtmType::getOid, pkBtmTypeCollection)
+ Wrappers.<BtmType>query().lambda().in(BtmType::getOid, pkBtmTypeCollection)
)
).orElseGet(ArrayList::new)
);
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/OmdAttributeMapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/AttributeMapper.java
similarity index 61%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/OmdAttributeMapper.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/AttributeMapper.java
index 6b47932..45f779a 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/OmdAttributeMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/AttributeMapper.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.omd.mapper;
-import com.vci.ubcs.omd.entity.OmdAttribute;
+import com.vci.ubcs.omd.entity.Attribute;
import org.springblade.core.mp.mapper.BladeMapper;
import java.util.Collection;
@@ -12,25 +12,25 @@
* @author LiHang
* @date 2023/4/3
*/
-public interface OmdAttributeMapper extends BladeMapper<OmdAttribute> {
+public interface AttributeMapper extends BladeMapper<Attribute> {
/**
* 鏌ヨ鍏ㄩ儴
* @return 鏌ヨ缁撴灉
*/
- List<OmdAttribute> selectAll();
+ List<Attribute> selectAll();
/**
* 涓婚敭鏌ヨ
* @param primaryKey 涓婚敭
* @return 鏌ヨ缁撴灉
*/
- OmdAttribute selectByPrimaryKey(Long primaryKey);
+ Attribute selectByPrimaryKey(Long primaryKey);
/**
* 涓婚敭鎵归噺鏌ヨ
* @param primaryKeyCollection 涓婚敭闆嗗悎
* @return 鏌ヨ缁撴灉
*/
- List<OmdAttribute> selectByPrimaryKeyCollection(Collection<String> primaryKeyCollection);
+ List<Attribute> selectByPrimaryKeyCollection(Collection<String> primaryKeyCollection);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeAttributeMapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeAttributeMapper.java
new file mode 100644
index 0000000..793bec1
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeAttributeMapper.java
@@ -0,0 +1,13 @@
+package com.vci.ubcs.omd.mapper;
+
+import com.vci.ubcs.omd.entity.BtmTypeAttribute;
+import org.springblade.core.mp.mapper.BladeMapper;
+
+/**
+ * Description:
+ *
+ * @author LiHang
+ * @date 2023/4/23
+ */
+public interface BtmTypeAttributeMapper extends BladeMapper<BtmTypeAttribute> {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/OmdBtmTypeMapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeMapper.java
similarity index 74%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/OmdBtmTypeMapper.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeMapper.java
index a6ccb5e..035e810 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/OmdBtmTypeMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/BtmTypeMapper.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.omd.mapper;
-import com.vci.ubcs.omd.entity.OmdBtmTypeAttribute;
-import com.vci.ubcs.omd.entity.OmdBtmType;
+import com.vci.ubcs.omd.entity.BtmTypeAttribute;
+import com.vci.ubcs.omd.entity.BtmType;
import org.apache.ibatis.annotations.Param;
import org.springblade.core.mp.mapper.BladeMapper;
import org.springframework.stereotype.Repository;
@@ -10,7 +10,7 @@
import java.util.List;
@Repository
-public interface OmdBtmTypeMapper extends BladeMapper<OmdBtmType> {
+public interface BtmTypeMapper extends BladeMapper<BtmType> {
/**
* 鏍规嵁涓婚敭鍒犻櫎瀵硅薄
* @param oid 鐢熷懡鍛ㄦ湡涓婚敭
@@ -23,47 +23,47 @@
* @param record 瑕佹坊鍔犵殑涓氬姟绫诲瀷瀵硅薄
* @return 褰卞搷鐨勮鏁�
*/
- int insert(OmdBtmType record);
+ int insert(BtmType record);
/**
* 鏍规嵁涓婚敭鑾峰彇鏁版嵁瀵硅薄
* @param oid 涓婚敭
* @return 鏁版嵁瀵硅薄
*/
- OmdBtmType selectByPrimaryKey(String oid);
+ BtmType selectByPrimaryKey(String oid);
/**
* 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
* @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
* @return 鏁版嵁瀵硅薄鍒楄〃
*/
- List<OmdBtmType> selectByPrimaryKeys(String oids);
+ List<BtmType> selectByPrimaryKeys(String oids);
/**
* 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
* @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
* @return 涓氬姟瀵硅薄
*/
- List<OmdBtmType> selectByPrimaryKeyCollection(@Param("oids") Collection<String> oids);
+ List<BtmType> selectByPrimaryKeyCollection(@Param("oids") Collection<String> oids);
/**
* 鏍规嵁鑻辨枃鍚嶇О鎵归噺鏌ヨ瀵硅薄
* @param ids 瀵硅薄鑻辨枃鍚嶇О 浣嗘槸涓嶈兘瓒呰繃1000
* @return 涓氬姟瀵硅薄
*/
- List<OmdBtmType> selectByIdCollection(@Param("ids") Collection<String> ids);
+ List<BtmType> selectByIdCollection(@Param("ids") Collection<String> ids);
/**
* 鏌ヨ鍏ㄩ儴鐨勪笟鍔＄被鍨�
* @return 涓氬姟绫诲瀷鏁版嵁瀵硅薄鍒楄〃
*/
- List<OmdBtmType> selectAll();
+ List<BtmType> selectAll();
/**
* 鏍规嵁涓婚敭淇敼鐢熷懡鍛ㄦ湡
* @param record 鏁版嵁瀵硅薄
* @return 褰卞搷鐨勮鏁�
*/
- int updateByPrimaryKey(OmdBtmType record);
+ int updateByPrimaryKey(BtmType record);
/**
* 鏍规嵁涓婚敭鑾峰彇鍚嶇О
@@ -84,21 +84,21 @@
* @param pkAttribute 灞炴�х殑涓婚敭
* @return 涓氬姟绫诲瀷瀵硅薄
*/
- List<OmdBtmType> selectByAttributeOid(String pkAttribute);
+ List<BtmType> selectByAttributeOid(String pkAttribute);
/**
* 鏍规嵁鐗堟湰瑙勫垯鐨勪富閿幏鍙栦娇鐢ㄧ殑涓氬姟绫诲瀷瀵硅薄
* @param pkRevisionRule 鐗堟湰瑙勫垯鐨勪富閿�
* @return 涓氬姟绫诲瀷瀵硅薄
*/
- List<OmdBtmType> selectByRevisionRuleOid(String pkRevisionRule);
+ List<BtmType> selectByRevisionRuleOid(String pkRevisionRule);
/**
* 鏍规嵁鐢熷懡鍛ㄦ湡鐨勪富閿幏鍙栦娇鐢ㄧ殑涓氬姟绫诲瀷瀵硅薄
* @param pkLifeCycle 鐢熷懡鍛ㄦ湡鐨勪富閿�
* @return 涓氬姟绫诲瀷瀵硅薄
*/
- List<OmdBtmType> selectByLifeCycleOid(String pkLifeCycle);
+ List<BtmType> selectByLifeCycleOid(String pkLifeCycle);
/**
@@ -113,6 +113,6 @@
* @param records 鎵归噺鐨勪俊鎭�
* @return 鎵ц鎬绘暟
*/
- Long batchInsert(@Param("records") List<OmdBtmTypeAttribute> records);
+ Long batchInsert(@Param("records") List<BtmTypeAttribute> records);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/OmdBtmTypeAttributeMapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/OmdBtmTypeAttributeMapper.java
deleted file mode 100644
index f743386..0000000
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/OmdBtmTypeAttributeMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.vci.ubcs.omd.mapper;
-
-import com.vci.ubcs.omd.entity.OmdBtmTypeAttribute;
-import org.springblade.core.mp.mapper.BladeMapper;
-
-/**
- * Description:
- *
- * @author LiHang
- * @date 2023/4/23
- */
-public interface OmdBtmTypeAttributeMapper extends BladeMapper<OmdBtmTypeAttribute> {
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/repeater/DomainRepeater.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/repeater/DomainRepeater.java
index 740d7bd..2ee2237 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/repeater/DomainRepeater.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/repeater/DomainRepeater.java
@@ -2,28 +2,27 @@
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosServiceManager;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.nacos.api.annotation.NacosInjected;
+import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.vci.ubcs.omd.vo.OmdBtmTypeVO;
-import org.apache.http.Header;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringPool;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Repository;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
/**
* Description: 棰嗗煙杞彂鍣�
@@ -31,8 +30,9 @@
* @author LiHang
* @date 2023/4/25
*/
-@Repository
public class DomainRepeater {
+ private DomainRepeater() {
+ }
/**
* 鎺у埗鍣ㄨ矾寰�
@@ -54,50 +54,51 @@
*/
public static final String API_GET_ALL_TABLE_INFO = API_PREFIX + StringPool.SLASH +"getAllTableInfo";
- @NacosInjected
- private NamingService nacosNamingService;
+ /**
+ * Nacos鏈嶅姟鍒楄〃
+ */
+ private static NamingService namingService = SINGLE.build();
- @Component
- public static class SINGLE{
+ private static class SINGLE {
@Autowired
- private NacosServiceManager nacosServiceManager;
+ private NacosServiceManager manager;
+ private static NacosServiceManager nacosServiceManager;
@Autowired
- private NacosDiscoveryProperties nacosDiscoveryProperties;
-
- private static NamingService nacosNamingService;
+ private NacosDiscoveryProperties properties;
+ private static NacosDiscoveryProperties nacosDiscoveryProperties;
@PostConstruct
- public NamingService build(){
- nacosNamingService = nacosServiceManager.getNamingService(nacosDiscoveryProperties.getNacosProperties());
- return nacosNamingService;
+ private void init(){
+ nacosServiceManager = manager;
+ nacosDiscoveryProperties = properties;
+ }
+ private static NamingService build(){
+ return nacosServiceManager.getNamingService(nacosDiscoveryProperties.getNacosProperties());
}
}
- private RestTemplate restTemplate = new RestTemplate();
-
- public Object submitBtmType (String serviceName, OmdBtmTypeVO omdBtmTypeVO) throws NacosException {
-
- if (nacosNamingService == null){
- nacosNamingService = SINGLE.nacosNamingService;
- }
- Instance service = nacosNamingService.selectOneHealthyInstance(AppConstant.APPLICATION_GATEWAY_NAME);
+ public static R submitBtmType (String serviceName, BtmTypeVO btmTypeVO) throws NacosException {
+ Instance service = namingService.selectOneHealthyInstance(AppConstant.APPLICATION_GATEWAY_NAME);
try {
String url = "http://" + service.getIp() +StringPool.COLON+ service.getPort() + StringPool.SLASH + serviceName + StringPool.SLASH + API_SUBMIT_BTM_TYPE;
- HttpPost httpPost = buildPost(url);
- httpPost.setEntity(new StringEntity(JSON.toJSONString(omdBtmTypeVO),"utf-8"));
- CloseableHttpClient httpClient = HttpClientBuilder.create().build();
- CloseableHttpResponse response = httpClient.execute(httpPost);
- return response;
+ ResponseEntity<R> responseEntity = executePost(url, JSONObject.toJSONString(btmTypeVO), null);
+ if (responseEntity.getStatusCode().equals(HttpStatus.OK)){
+ return responseEntity.getBody();
+ }
+ return R.fail(String.valueOf(responseEntity.getStatusCode().value()));
} catch (Exception e) {
throw new RuntimeException(e);
}
}
- private HttpPost buildPost(String url){
- HttpPost httpPost = new HttpPost(url);
- httpPost.setHeader("Content-Type","application/json;charset=UTF-8");
- httpPost.setHeader("Blade-Auth", AuthUtil.getHeader());
- return httpPost;
+ private static ResponseEntity<R> executePost(String url, String body,Map<String,String> extraHeaders) throws IOException {
+ RestTemplate restTemplate = new RestTemplate();
+ HttpHeaders httpHeaders = new HttpHeaders();
+ httpHeaders.add("Content-Type","application/json;charset=UTF-8");
+ httpHeaders.add("Blade-Auth", AuthUtil.getHeader());
+ Optional.ofNullable(extraHeaders).orElseGet(HashMap::new).forEach(httpHeaders::add);
+ HttpEntity<String> request = new HttpEntity<>(body,httpHeaders);
+ return restTemplate.postForEntity(url, request, R.class);
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IOmdAttributeService.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IAttributeService.java
similarity index 78%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IOmdAttributeService.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IAttributeService.java
index ec137b3..a4bb36e 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IOmdAttributeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IAttributeService.java
@@ -1,9 +1,9 @@
package com.vci.ubcs.omd.service;
-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.vo.OmdAttributeVO;
+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.vo.AttributeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import org.springblade.core.mp.base.BaseService;
@@ -17,21 +17,21 @@
* @author LiHang
* @date 2023/4/3
*/
-public interface IOmdAttributeService extends BaseService<OmdAttribute> {
+public interface IAttributeService extends BaseService<Attribute> {
/**
* 鑾峰彇鍏冩暟鎹鎯�
* @param id 涓婚敭
* @return 鍏冩暟鎹樉绀哄璞�
*/
- OmdAttributeVO getAttributeDetail(Long id);
+ AttributeVO getAttributeDetail(Long id);
/**
* 鏂板鎴栦慨鏀�
* @param dto 椤甸潰浼犺緭瀵硅薄
* @return 鎵ц缁撴灉
*/
- boolean submit(OmdAttributeDTO dto);
+ boolean submit(AttributeDTO dto);
/**
* 鍒犻櫎
@@ -62,7 +62,7 @@
* @return 灞炴�у璞″垪琛紝濡傛灉鏈変笉瀛樺湪鐨勪笉浼氳繑鍥烇紝鍏ㄩ儴涓嶅瓨鍦ㄧ殑鍒欒繑鍥炵┖鍒楄〃
* @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
- List<OmdAttributeVO> listAttributeByKeyCollection(Collection<String> attributeIdCollection) throws VciBaseException;
+ List<AttributeVO> listAttributeByKeyCollection(Collection<String> attributeIdCollection) throws VciBaseException;
/**
* 鍒ゆ柇灞炴�х殑鍐呭鏄惁绗﹀悎瑕佹眰
@@ -82,5 +82,5 @@
* @return true 绗﹀悎 false 涓嶇鍚�
* @throws VciBaseException 涓嶇鍚堟椂鎶涘嚭寮傚父
*/
- boolean checkAttribute(OmdBtmTypeLinkAttributesDTO attributesDTO) throws VciBaseException;
+ boolean checkAttribute(BtmTypeLinkAttributesDTO attributesDTO) throws VciBaseException;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeAttributeService.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeAttributeService.java
new file mode 100644
index 0000000..dabf1bb
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeAttributeService.java
@@ -0,0 +1,41 @@
+package com.vci.ubcs.omd.service;
+
+import com.vci.ubcs.omd.dto.BtmTypeLinkAttributesDTO;
+import com.vci.ubcs.omd.entity.BtmTypeAttribute;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Description:涓氬姟绫诲瀷鍏宠仈灞炴�х殑鏈嶅姟
+ *
+ * @author LiHang
+ * @date 2023/4/23
+ */
+public interface IBtmTypeAttributeService extends BaseService<BtmTypeAttribute> {
+
+ /**
+ * 妫�鏌ュ睘鎬у瓨鍦ㄥ苟娣诲姞
+ * @param btmTypeOid 涓氬姟绫诲瀷涓婚敭
+ * @param attributesDTOList 椤甸潰浼犺緭瀵硅薄闆嗗悎
+ * @param creator 鍒涘缓浜�
+ * @param now ts鏃堕棿鎴�
+ * @return 鍙楀奖鍝嶇殑琛屾暟
+ */
+ int checkAndInsert(String btmTypeOid, List<BtmTypeLinkAttributesDTO> attributesDTOList, String creator, Date now);
+
+ /**
+ * 鎵归噺鎻掑叆
+ * @param records 鏁版嵁瀵硅薄闆嗗悎
+ */
+ int batchInsert(List<BtmTypeAttribute> records);
+
+ /**
+ * 涓氬姟绫诲瀷涓婚敭鏌ュ睘鎬�
+ * @param btmTypeOid 涓氬姟绫诲瀷涓婚敭
+ * @return 鏌ヨ缁撴灉
+ */
+ List<BtmTypeAttributeVO> getAttributeByBtmTypeOid(String btmTypeOid);
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IOmdBtmTypeService.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java
similarity index 75%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IOmdBtmTypeService.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java
index 275d3de..066dbe1 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IOmdBtmTypeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java
@@ -1,13 +1,13 @@
package com.vci.ubcs.omd.service;
-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.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.vo.BtmTypeVO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.LinkTypeVO;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseService;
@@ -21,7 +21,7 @@
* @author weidy
* @date 2019/10/13 2:33 PM
*/
-public interface IOmdBtmTypeService extends BaseService<OmdBtmType> {
+public interface IBtmTypeService extends BaseService<BtmType> {
/**
* 璁剧疆骞冲彴鏈韩鐨勪笟鍔＄被鍨�
@@ -35,7 +35,7 @@
* @return 涓氬姟绫诲瀷锛屽鏋滀笉瀛樺湪浼氳繑鍥瀗ull
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
- OmdBtmTypeVO getBtmTypeByOid(String pkBtmType) throws ServiceException;
+ BtmTypeVO getBtmTypeByOid(String pkBtmType) throws ServiceException;
/**
* 鏍规嵁涓婚敭鎵归噺鑾峰彇涓氬姟绫诲瀷
@@ -43,7 +43,7 @@
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
- List<OmdBtmTypeVO> listBtmTypeByOids(String pkBtmTypes) throws ServiceException;
+ List<BtmTypeVO> listBtmTypeByOids(String pkBtmTypes) throws ServiceException;
/**
* 鎵归噺鏍规嵁涓婚敭鑾峰彇涓氬姟绫诲瀷
@@ -51,7 +51,7 @@
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
- List<OmdBtmTypeVO> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) throws ServiceException;
+ List<BtmTypeVO> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) throws ServiceException;
/**
* 鏍规嵁鑻辨枃鍚嶇О鑾峰彇涓氬姟绫诲瀷
@@ -59,7 +59,7 @@
* @return 涓氬姟绫诲瀷锛屽鏋滀笉瀛樺湪浼氳繑鍥瀗ull
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
- OmdBtmTypeVO getBtmTypeById(String id) throws ServiceException;
+ BtmTypeVO getBtmTypeById(String id) throws ServiceException;
/**
* 鏍规嵁鑻辨枃鍚嶇О鎵归噺鑾峰彇涓氬姟绫诲瀷
@@ -67,7 +67,7 @@
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
- List<OmdBtmTypeVO> listBtmTypeByIds(String ids) throws ServiceException;
+ List<BtmTypeVO> listBtmTypeByIds(String ids) throws ServiceException;
/**
* 鏍规嵁鑻辨枃鍚嶇О闆嗗悎鎵归噺鑾峰彇涓氬姟绫诲瀷
@@ -75,7 +75,7 @@
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
- List<OmdBtmTypeVO> listBtmTypeByIdCollection(Collection<String> idCollection) throws ServiceException;
+ List<BtmTypeVO> listBtmTypeByIdCollection(Collection<String> idCollection) throws ServiceException;
/**
* 鏍规嵁鑻辨枃鍚嶇О闆嗗悎鎵归噺鑾峰彇涓氬姟绫诲瀷鐨勬暟鎹璞�
@@ -83,7 +83,7 @@
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
- List<OmdBtmType> listBtmTypeDOByIdCollection(Collection<String> idCollection) throws ServiceException;
+ List<BtmType> listBtmTypeDOByIdCollection(Collection<String> idCollection) throws ServiceException;
/**
* 鏍规嵁涓婚敭闆嗗悎鎵归噺鑾峰彇涓氬姟绫诲瀷鐨勬暟鎹璞�
@@ -91,7 +91,7 @@
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
- List<OmdBtmType> listBtmTypeDOByOidCollection(Collection<String> oidCollection) throws ServiceException;
+ List<BtmType> listBtmTypeDOByOidCollection(Collection<String> oidCollection) throws ServiceException;
/**
* 鏍规嵁涓氬姟绫诲瀷涓婚敭鑾峰彇涓枃鍚嶇О
@@ -115,7 +115,7 @@
* @return 鎵�鏈夌殑灞炴�у璞★紝鍖呮嫭绯荤粺灞炴��
* @throws ServiceException 涓氬姟绫诲瀷涓嶅瓨鍦紝鍙傛暟涓虹┖鎴栨煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
*/
- List<OmdBtmTypeAttributeVO> listHasAttributesByOid(String oid) throws ServiceException;
+ List<BtmTypeAttributeVO> listHasAttributesByOid(String oid) throws ServiceException;
/**
* 鏍规嵁涓氬姟绫诲瀷鑻辨枃鍚嶇О鑾峰彇鍏宠仈鐨勬墍鏈夊睘鎬у璞�
@@ -123,7 +123,7 @@
* @return 鎵�鏈夌殑灞炴�у璞★紝鍖呮嫭绯荤粺鍐呯疆灞炴��
* @throws ServiceException 涓氬姟绫诲瀷涓嶅瓨鍦紝鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
*/
- List<OmdBtmTypeAttributeVO> listHasAttributeById(String id) throws ServiceException;
+ List<BtmTypeAttributeVO> listHasAttributeById(String id) throws ServiceException;
/**
* 鏍规嵁涓氬姟绫诲瀷涓婚敭鑾峰彇鍏宠仈鐨勬墍鏈夊睘鎬у璞�
@@ -132,7 +132,7 @@
* @return 鎵�鏈夌殑灞炴�у璞★紝鍖呮嫭绯荤粺鍐呯疆灞炴�э紝key鏄笟鍔＄被鍨嬩富閿紝value鏄寘鍚殑灞炴��
* @throws ServiceException 涓氬姟绫诲瀷涓嶅瓨鍦紝鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
*/
- Map<String,List<OmdBtmTypeAttributeVO>> batchListHasAttributesByOidCollection(Collection<String> oidCollection) throws ServiceException;
+ Map<String,List<BtmTypeAttributeVO>> batchListHasAttributesByOidCollection(Collection<String> oidCollection) throws ServiceException;
/**
* 鏍规嵁涓氬姟绫诲瀷鑻辨枃鍚嶇О鑾峰彇鍏宠仈鐨勬墍鏈夊睘鎬у璞�
@@ -141,7 +141,7 @@
* @return 鎵�鏈夌殑灞炴�у璞★紝鍖呮嫭绯荤粺鍐呯疆灞炴�э紝key鏄笟鍔＄被鍨嬩富閿紝value鏄寘鍚殑灞炴��
* @throws ServiceException 涓氬姟绫诲瀷涓嶅瓨鍦紝鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
*/
- Map<String,List<OmdBtmTypeAttributeVO>> batchListHasAttributesByIdCollection(Collection<String> idCollection) throws ServiceException;
+ Map<String,List<BtmTypeAttributeVO>> batchListHasAttributesByIdCollection(Collection<String> idCollection) throws ServiceException;
/**
@@ -150,7 +150,7 @@
* @return 寮曠敤鐨勯摼鎺ョ被鍨�
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
*/
- List<OsLinkTypeVO> listLinkTypeForUsedBtmType(String pkBtmType) throws ServiceException;
+ List<LinkTypeVO> listLinkTypeForUsedBtmType(String pkBtmType) throws ServiceException;
/**
* 鏍￠獙涓氬姟绫诲瀷鏄惁琚紩鐢�
@@ -176,7 +176,7 @@
* @return 娣诲姞鍚庣殑涓氬姟绫诲瀷
* @throws ServiceException 娣诲姞鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- OmdBtmTypeDTO addSave(OmdBtmTypeDTO btmTypeDTO, boolean autoCreateTable) throws ServiceException;
+ BtmTypeDTO addSave(BtmTypeDTO btmTypeDTO, boolean autoCreateTable) throws ServiceException;
/**
* 淇敼涓氬姟绫诲瀷
@@ -185,7 +185,7 @@
* @return 淇敼鍚庣殑涓氬姟绫诲瀷
* @throws ServiceException 淇敼鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- OmdBtmTypeDTO editSave(OmdBtmTypeDTO btmTypeDTO, boolean autoEditTable) throws ServiceException;
+ BtmTypeDTO editSave(BtmTypeDTO btmTypeDTO, boolean autoEditTable) throws ServiceException;
/**
* 鍒犻櫎涓氬姟绫诲瀷
@@ -193,7 +193,7 @@
* @param autoDeleteTable 鑷姩鍒犻櫎琛ㄦ牸
* @throws ServiceException 濡傛灉涓氬姟绫诲瀷琚紩鐢紝鎴栬�呭垹闄ゅ嚭閿欐椂浼氭姏鍑哄紓甯�
*/
- void delete(OmdBtmTypeVO btmTypeVO,boolean autoDeleteTable) throws ServiceException;
+ void delete(BtmTypeVO btmTypeVO, boolean autoDeleteTable) throws ServiceException;
/**
* 鎵归噺鍒犻櫎涓氬姟绫诲瀷
@@ -201,7 +201,7 @@
* @param autoDeleteTable 鑷姩鍒犻櫎琛ㄦ牸
* @throws ServiceException 濡傛灉涓氬姟绫诲瀷琚紩鐢紝鎴栬�呭垹闄ゅ嚭閿欐椂浼氭姏鍑哄紓甯�
*/
- void batchDelete(List<OmdBtmTypeVO> btmTypeVOList,boolean autoDeleteTable) throws ServiceException;
+ void batchDelete(List<BtmTypeVO> btmTypeVOList, boolean autoDeleteTable) throws ServiceException;
/**
* 妫�鏌ヤ笟鍔＄被鍨嬩笌鏁版嵁搴撹〃鏄惁涓�鑷�
@@ -209,7 +209,7 @@
* @return 涓嶅悓鐨勫睘鎬т俊鎭�
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
*/
- List<OsModifyAttributeInfoDO> checkDbTableSame(String pkBtmType) throws ServiceException;
+ List<ModifyAttributeInfoDO> checkDbTableSame(String pkBtmType) throws ServiceException;
/**
* 鑾峰彇鏁版嵁搴撹〃锛屾敮鎸佷笟鍔＄被鍨嬪拰瑙嗗浘
@@ -227,28 +227,28 @@
* @param now 褰撳墠鏃堕棿
* @return 灞炴�х殑鏁版嵁瀵硅薄
*/
- OmdBtmTypeAttribute btmTypeAttributeDTO2DO(OmdBtmTypeLinkAttributesDTO attributesDTO, String pkBtmType, String creator, Date now);
+ BtmTypeAttribute btmTypeAttributeDTO2DO(BtmTypeLinkAttributesDTO attributesDTO, String pkBtmType, String creator, Date now);
/**
* 涓氬姟绫诲瀷鐨勫睘鎬ф樉绀哄璞¤浆鎹负鏁版嵁瀵硅薄
* @param thisBtmTypeHasAttributeVOList 涓氬姟绫诲瀷灞炴�ф樉绀哄璞�
* @return 鏁版嵁瀵硅薄
*/
- List<OmdBtmTypeAttribute> btmTypeAttributeVO2DO(List<OmdBtmTypeAttributeVO> thisBtmTypeHasAttributeVOList);
+ List<BtmTypeAttribute> btmTypeAttributeVO2DO(List<BtmTypeAttributeVO> thisBtmTypeHasAttributeVOList);
/**
* 鎵归噺灏嗕笟鍔＄被鍨嬬殑鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param attributeDOList 灞炴�х殑鏁版嵁瀵硅薄鍒楄〃
* @return 灞炴�х殑鏄剧ず瀵硅薄鍒楄〃
*/
- List<OmdBtmTypeAttributeVO> batchBtmTypeAttributeDO2VO(List<OmdBtmTypeAttribute> attributeDOList);
+ List<BtmTypeAttributeVO> batchBtmTypeAttributeDO2VO(List<BtmTypeAttribute> attributeDOList);
/**
* 鎵归噺灏嗕笟鍔＄被鍨嬬殑鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param attributesDO 灞炴�х殑鏁版嵁瀵硅薄
* @return 灞炴�х殑鏄剧ず瀵硅薄鍒楄〃
*/
- OmdBtmTypeAttributeVO btmTypeAttributeDO2VO(OmdBtmTypeAttribute attributesDO);
+ BtmTypeAttributeVO btmTypeAttributeDO2VO(BtmTypeAttribute attributesDO);
/**
* 鑾峰彇涓氬姟绫诲瀷鐨勬寚瀹氬睘鎬�
@@ -256,21 +256,21 @@
* @param attributeIdCollection 灞炴�х殑闆嗗悎锛屽鏋滀负绌哄垯鑾峰彇鍏ㄩ儴
* @return 灞炴�х殑鏄剧ず瀵硅薄
*/
- List<OmdBtmTypeAttribute> listAttributeDOByIdsForBtm(String id, Collection<String> attributeIdCollection);
+ List<BtmTypeAttribute> listAttributeDOByIdsForBtm(String id, Collection<String> attributeIdCollection);
/**
* 鏍规嵁涓氬姟绫诲瀷鐨勭紪鍙疯幏鍙栧睘鎬�
* @param id 涓氬姟绫诲瀷鐨勭紪鍙�
* @return 灞炴�х殑鏄剧ず瀵硅薄
*/
- List<OmdBtmTypeAttributeVO> listAttributeByBtmTypeId(String id);
+ List<BtmTypeAttributeVO> listAttributeByBtmTypeId(String id);
/**
* 鏍规嵁涓氬姟绫诲瀷鐨勪富閿幏鍙栧睘鎬�
* @param oid 涓氬姟绫诲瀷鐨勪富閿�
* @return 灞炴�х殑鏄剧ず瀵硅薄
*/
- List<OmdBtmTypeAttributeVO> listAttributeByBtmTypeOid(String oid);
+ List<BtmTypeAttributeVO> listAttributeByBtmTypeOid(String oid);
/**
* 鎵归噺鏍规嵁涓氬姟绫诲瀷缂栧彿鎴栬�呬富閿幏鍙栧寘鍚殑灞炴��
@@ -279,12 +279,12 @@
* @return key鏄笟鍔＄被鍨嬬殑涓婚敭鎴栬�呯紪鍙凤紝鍊兼槸鍖呭惈鐨勫睘鎬х殑淇℃伅
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欎細鎶涘嚭寮傚父
*/
- List<OmdBtmTypeAttributeVO> batchListAttributeByBtmType(Collection<String> oidsOrIds, boolean queryById) throws ServiceException;
+ List<BtmTypeAttributeVO> batchListAttributeByBtmType(Collection<String> oidsOrIds, boolean queryById) throws ServiceException;
/**
* 鏂板鎴栦慨鏀逛笟鍔＄被鍨�
* @param btmTypeDTO 涓氬姟绫诲瀷椤甸潰浼犺緭瀵硅薄
* @return 鎵ц缁撴灉
*/
- boolean submit(OmdBtmTypeDTO btmTypeDTO);
+ boolean submit(BtmTypeDTO btmTypeDTO);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IOmdBtmTypeAttributeService.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IOmdBtmTypeAttributeService.java
deleted file mode 100644
index a3ccf67..0000000
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IOmdBtmTypeAttributeService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.vci.ubcs.omd.service;
-
-import com.vci.ubcs.omd.dto.OmdBtmTypeLinkAttributesDTO;
-import com.vci.ubcs.omd.entity.OmdBtmTypeAttribute;
-import com.vci.ubcs.omd.vo.OmdAttributeVO;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
-import org.springblade.core.mp.base.BaseService;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * Description:涓氬姟绫诲瀷鍏宠仈灞炴�х殑鏈嶅姟
- *
- * @author LiHang
- * @date 2023/4/23
- */
-public interface IOmdBtmTypeAttributeService extends BaseService<OmdBtmTypeAttribute> {
-
- /**
- * 妫�鏌ュ睘鎬у瓨鍦ㄥ苟娣诲姞
- * @param btmTypeOid 涓氬姟绫诲瀷涓婚敭
- * @param attributesDTOList 椤甸潰浼犺緭瀵硅薄闆嗗悎
- * @param creator 鍒涘缓浜�
- * @param now ts鏃堕棿鎴�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- int checkAndInsert(String btmTypeOid,List<OmdBtmTypeLinkAttributesDTO> attributesDTOList, String creator, Date now);
-
- /**
- * 鎵归噺鎻掑叆
- * @param records 鏁版嵁瀵硅薄闆嗗悎
- */
- int batchInsert(List<OmdBtmTypeAttribute> records);
-
- /**
- * 涓氬姟绫诲瀷涓婚敭鏌ュ睘鎬�
- * @param btmTypeOid 涓氬姟绫诲瀷涓婚敭
- * @return 鏌ヨ缁撴灉
- */
- List<OmdBtmTypeAttributeVO> getAttributeByBtmTypeOid(String btmTypeOid);
-}
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());
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdBtmAttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
similarity index 60%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdBtmAttributeServiceImpl.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
index e46d9e3..94cbe3d 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/OmdBtmAttributeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
@@ -2,14 +2,13 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.omd.dto.OmdBtmTypeLinkAttributesDTO;
-import com.vci.ubcs.omd.entity.OmdBtmTypeAttribute;
-import com.vci.ubcs.omd.mapper.OmdBtmTypeAttributeMapper;
-import com.vci.ubcs.omd.service.IOmdAttributeService;
-import com.vci.ubcs.omd.service.IOmdBtmTypeAttributeService;
-import com.vci.ubcs.omd.vo.OmdAttributeVO;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
-import com.vci.ubcs.omd.wrapper.OmdBtmTypeAttributeWrapper;
+import com.vci.ubcs.omd.dto.BtmTypeLinkAttributesDTO;
+import com.vci.ubcs.omd.entity.BtmTypeAttribute;
+import com.vci.ubcs.omd.mapper.BtmTypeAttributeMapper;
+import com.vci.ubcs.omd.service.IAttributeService;
+import com.vci.ubcs.omd.service.IBtmTypeAttributeService;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
+import com.vci.ubcs.omd.wrapper.BtmTypeAttributeWrapper;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,10 +27,10 @@
* @date 2023/4/23
*/
@Service
-public class OmdBtmAttributeServiceImpl extends ServiceImpl<OmdBtmTypeAttributeMapper, OmdBtmTypeAttribute> implements IOmdBtmTypeAttributeService {
+public class BtmAttributeServiceImpl extends ServiceImpl<BtmTypeAttributeMapper, BtmTypeAttribute> implements IBtmTypeAttributeService {
@Autowired
- private IOmdAttributeService attributeService;
+ private IAttributeService attributeService;
@Override
public boolean deleteLogic(@NotEmpty List<Long> ids) {
@@ -50,13 +49,13 @@
* @return 鍙楀奖鍝嶇殑琛屾暟
*/
@Override
- public int checkAndInsert(String btmTypeOid,List<OmdBtmTypeLinkAttributesDTO> attributesDTOList, String creator, Date now) {
+ public int checkAndInsert(String btmTypeOid, List<BtmTypeLinkAttributesDTO> attributesDTOList, String creator, Date now) {
List<String> attributeIdList = new ArrayList<>();
- List<OmdBtmTypeAttribute> btmTypeAttributeDOList = new ArrayList<>();
+ List<BtmTypeAttribute> btmTypeAttributeDOList = new ArrayList<>();
if (!CollectionUtils.isEmpty(attributesDTOList)) {
attributesDTOList.stream().forEachOrdered(s -> {
attributeService.checkAttribute(s);
- btmTypeAttributeDOList.add(OmdBtmTypeAttributeWrapper.build().copyBtmTypeAttributeDTO2Entity(s,btmTypeOid, creator, now));
+ btmTypeAttributeDOList.add(BtmTypeAttributeWrapper.build().copyBtmTypeAttributeDTO2Entity(s,btmTypeOid, creator, now));
attributeIdList.add(s.getId().toLowerCase().trim());
});
//妫�鏌ュ睘鎬ф槸鍚﹂兘瀛樺湪
@@ -78,7 +77,7 @@
* @param records 鏁版嵁瀵硅薄闆嗗悎
*/
@Override
- public int batchInsert(List<OmdBtmTypeAttribute> records) {
+ public int batchInsert(List<BtmTypeAttribute> records) {
return baseMapper.insertBatchSomeColumn(records);
}
@@ -88,11 +87,11 @@
* @return 鏌ヨ缁撴灉
*/
@Override
- public List<OmdBtmTypeAttributeVO> getAttributeByBtmTypeOid(String btmTypeOid){
+ public List<BtmTypeAttributeVO> getAttributeByBtmTypeOid(String btmTypeOid){
Func.requireNotNull(btmTypeOid,"涓氬姟绫诲瀷涓婚敭");
- return OmdBtmTypeAttributeWrapper.build().listEntityVO(
+ return BtmTypeAttributeWrapper.build().listEntityVO(
Optional.ofNullable(
- baseMapper.selectList(Wrappers.<OmdBtmTypeAttribute>query().lambda().eq(OmdBtmTypeAttribute::getPkBtmType, btmTypeOid))
+ baseMapper.selectList(Wrappers.<BtmTypeAttribute>query().lambda().eq(BtmTypeAttribute::getPkBtmType, btmTypeOid))
).orElseGet(ArrayList::new)
);
}
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
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/OmdAttributeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java
similarity index 71%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/OmdAttributeWrapper.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java
index b53cd91..15dbf9b 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/OmdAttributeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.omd.wrapper;
-import com.vci.ubcs.omd.entity.OmdAttribute;
+import com.vci.ubcs.omd.entity.Attribute;
import com.vci.ubcs.omd.vo.*;
import com.vci.ubcs.system.cache.DictBizCache;
import org.springblade.core.mp.support.BaseEntityWrapper;
@@ -18,10 +18,10 @@
* @author LiHang
* @date 2023/4/3
*/
-public class OmdAttributeWrapper extends BaseEntityWrapper<OmdAttribute, OmdAttributeVO> {
+public class AttributeWrapper extends BaseEntityWrapper<Attribute, AttributeVO> {
- public static OmdAttributeWrapper build() {
- return new OmdAttributeWrapper();
+ public static AttributeWrapper build() {
+ return new AttributeWrapper();
}
/**
@@ -30,8 +30,8 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public OmdAttributeVO entityVO(OmdAttribute entity) {
- OmdAttributeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, OmdAttributeVO.class));
+ public AttributeVO entityVO(Attribute entity) {
+ AttributeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, AttributeVO.class));
vo.setTypeValue(DictBizCache.getValue(vo.getTypeCode(),vo.getTypeKey()));
if (StringUtil.isNotBlank(vo.getReferTypeCode())){
vo.setReferTypeValue(DictBizCache.getValue(vo.getReferTypeCode(),vo.getReferTypeKey()));
@@ -47,7 +47,7 @@
* @param list pojo闆嗗悎
* @return 鏄剧ず瀵硅薄
*/
- public List<OmdAttributeVO> listEntityVO(List<OmdAttribute> list) {
+ public List<AttributeVO> listEntityVO(List<Attribute> list) {
return list.stream().map(this::entityVO).collect(Collectors.toList());
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
new file mode 100644
index 0000000..b917e31
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
@@ -0,0 +1,63 @@
+package com.vci.ubcs.omd.wrapper;
+
+import com.vci.ubcs.omd.dto.BtmTypeLinkAttributesDTO;
+import com.vci.ubcs.omd.entity.BtmTypeAttribute;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * Description:
+ *
+ * @author LiHang
+ * @date 2023/4/23
+ */
+public class BtmTypeAttributeWrapper extends BaseEntityWrapper<BtmTypeAttribute, BtmTypeAttributeVO> {
+
+ public static BtmTypeAttributeWrapper build() {
+ return new BtmTypeAttributeWrapper();
+ }
+
+ /**
+ * do2vo
+ * @param entity pojo
+ * @return 鏄剧ず瀵硅薄
+ */
+ @Override
+ public BtmTypeAttributeVO entityVO(BtmTypeAttribute entity) {
+ BtmTypeAttributeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, BtmTypeAttributeVO.class));
+ // 鍦ㄨ繖閲岃缃灇涓炬樉绀哄��
+ return vo;
+ }
+
+ /**
+ * 鎵归噺杞瑅o
+ * @param list pojo闆嗗悎
+ * @return 鏄剧ず瀵硅薄
+ */
+ public List<BtmTypeAttributeVO> listEntityVO(List<BtmTypeAttribute> list) {
+ return list.stream().map(this::entityVO).collect(Collectors.toList());
+ }
+
+ /**
+ * 鎷疯礉涓氬姟绫诲瀷 鏁版嵁浼犺緭瀵硅薄鍒� 鏁版嵁瀵硅薄
+ *
+ * @param dto 涓氬姟绫诲瀷鏁版嵁浼犺緭瀵硅薄
+ * @param creator 鍒涘缓浜�
+ * @param now 褰撴椂鏃堕棿
+ */
+ public BtmTypeAttribute copyBtmTypeAttributeDTO2Entity(BtmTypeLinkAttributesDTO dto, String btmTypeOid, String creator, Date now){
+ BtmTypeAttribute entity = Objects.requireNonNull(BeanUtil.copy(dto, BtmTypeAttribute.class));
+ entity.setLastModifier(creator);
+ entity.setTs(now);
+ entity.setPkBtmType(btmTypeOid);
+ // 鍦ㄨ繖杩涜閫氱敤瀛楁澶勭悊
+ return entity;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java
new file mode 100644
index 0000000..221bf19
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java
@@ -0,0 +1,61 @@
+package com.vci.ubcs.omd.wrapper;
+
+import com.vci.ubcs.omd.dto.BtmTypeDTO;
+import com.vci.ubcs.omd.entity.BtmType;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * Description:
+ *
+ * @author LiHang
+ * @date 2023/4/23
+ */
+public class BtmTypeWrapper extends BaseEntityWrapper<BtmType, BtmTypeVO> {
+ public static BtmTypeWrapper build() {
+ return new BtmTypeWrapper();
+ }
+
+ /**
+ * do2vo
+ * @param entity pojo
+ * @return 鏄剧ず瀵硅薄
+ */
+ @Override
+ public BtmTypeVO entityVO(BtmType entity) {
+ BtmTypeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, BtmTypeVO.class));
+ // 鍦ㄨ繖閲岃缃灇涓炬樉绀哄��
+ return vo;
+ }
+
+ /**
+ * 鎵归噺杞瑅o
+ * @param list pojo闆嗗悎
+ * @return 鏄剧ず瀵硅薄
+ */
+ public List<BtmTypeVO> listEntityVO(List<BtmType> list) {
+ return list.stream().map(this::entityVO).collect(Collectors.toList());
+ }
+
+ /**
+ * 鎷疯礉涓氬姟绫诲瀷 鏁版嵁浼犺緭瀵硅薄鍒� 鏁版嵁瀵硅薄
+ *
+ * @param dto 涓氬姟绫诲瀷鏁版嵁浼犺緭瀵硅薄
+ * @param creator 鍒涘缓浜�
+ * @param now 褰撴椂鏃堕棿
+ */
+ public BtmType copyBtmTypeDTO2Entity(BtmTypeDTO dto, String creator, Date now){
+ BtmType entity = Objects.requireNonNull(BeanUtil.copy(dto, BtmType.class));
+ entity.setLastModifier(creator);
+ entity.setTs(now);
+ // 鍦ㄨ繖杩涜閫氱敤瀛楁澶勭悊
+ return entity;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/FiledRangeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/FiledRangeWrapper.java
new file mode 100644
index 0000000..6f68fab
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/FiledRangeWrapper.java
@@ -0,0 +1,43 @@
+package com.vci.ubcs.omd.wrapper;
+
+import com.vci.ubcs.omd.entity.FieldRange;
+import com.vci.ubcs.omd.vo.FieldRangeVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * Description: 瀛楁鑼冨洿鐨勫寘瑁呯被
+ *
+ * @author LiHang
+ * @date 2023/4/3
+ */
+public class FiledRangeWrapper extends BaseEntityWrapper<FieldRange, FieldRangeVO> {
+
+ public static FiledRangeWrapper build() {
+ return new FiledRangeWrapper();
+ }
+
+ /**
+ * do2vo
+ * @param entity pojo
+ * @return 鏄剧ず瀵硅薄
+ */
+ @Override
+ public FieldRangeVO entityVO(FieldRange entity) {
+ FieldRangeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, FieldRangeVO.class));
+ return vo;
+ }
+
+ /**
+ * 鎵归噺杞瑅o
+ * @param list pojo闆嗗悎
+ * @return 鏄剧ず瀵硅薄
+ */
+ public List<FieldRangeVO> listEntityVO(List<FieldRange> list) {
+ return list.stream().map(this::entityVO).collect(Collectors.toList());
+ }
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/OmdBtmTypeAttributeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/OmdBtmTypeAttributeWrapper.java
deleted file mode 100644
index dc5946f..0000000
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/OmdBtmTypeAttributeWrapper.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.vci.ubcs.omd.wrapper;
-
-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.vo.OmdBtmTypeAttributeVO;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * Description:
- *
- * @author LiHang
- * @date 2023/4/23
- */
-public class OmdBtmTypeAttributeWrapper extends BaseEntityWrapper<OmdBtmTypeAttribute, OmdBtmTypeAttributeVO> {
-
- public static OmdBtmTypeAttributeWrapper build() {
- return new OmdBtmTypeAttributeWrapper();
- }
-
- /**
- * do2vo
- * @param entity pojo
- * @return 鏄剧ず瀵硅薄
- */
- @Override
- public OmdBtmTypeAttributeVO entityVO(OmdBtmTypeAttribute entity) {
- OmdBtmTypeAttributeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, OmdBtmTypeAttributeVO.class));
- // 鍦ㄨ繖閲岃缃灇涓炬樉绀哄��
- return vo;
- }
-
- /**
- * 鎵归噺杞瑅o
- * @param list pojo闆嗗悎
- * @return 鏄剧ず瀵硅薄
- */
- public List<OmdBtmTypeAttributeVO> listEntityVO(List<OmdBtmTypeAttribute> list) {
- return list.stream().map(this::entityVO).collect(Collectors.toList());
- }
-
- /**
- * 鎷疯礉涓氬姟绫诲瀷 鏁版嵁浼犺緭瀵硅薄鍒� 鏁版嵁瀵硅薄
- *
- * @param dto 涓氬姟绫诲瀷鏁版嵁浼犺緭瀵硅薄
- * @param creator 鍒涘缓浜�
- * @param now 褰撴椂鏃堕棿
- */
- public OmdBtmTypeAttribute copyBtmTypeAttributeDTO2Entity(OmdBtmTypeLinkAttributesDTO dto,String btmTypeOid, String creator, Date now){
- OmdBtmTypeAttribute entity = Objects.requireNonNull(BeanUtil.copy(dto, OmdBtmTypeAttribute.class));
- entity.setLastModifier(creator);
- entity.setTs(now);
- entity.setPkBtmType(btmTypeOid);
- // 鍦ㄨ繖杩涜閫氱敤瀛楁澶勭悊
- return entity;
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/OmdBtmTypeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/OmdBtmTypeWrapper.java
deleted file mode 100644
index 2419e40..0000000
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/OmdBtmTypeWrapper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.vci.ubcs.omd.wrapper;
-
-import com.vci.ubcs.omd.dto.OmdBtmTypeDTO;
-import com.vci.ubcs.omd.entity.OmdBtmType;
-import com.vci.ubcs.omd.vo.OmdBtmTypeVO;
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * Description:
- *
- * @author LiHang
- * @date 2023/4/23
- */
-public class OmdBtmTypeWrapper extends BaseEntityWrapper<OmdBtmType, OmdBtmTypeVO> {
- public static OmdBtmTypeWrapper build() {
- return new OmdBtmTypeWrapper();
- }
-
- /**
- * do2vo
- * @param entity pojo
- * @return 鏄剧ず瀵硅薄
- */
- @Override
- public OmdBtmTypeVO entityVO(OmdBtmType entity) {
- OmdBtmTypeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, OmdBtmTypeVO.class));
- // 鍦ㄨ繖閲岃缃灇涓炬樉绀哄��
- return vo;
- }
-
- /**
- * 鎵归噺杞瑅o
- * @param list pojo闆嗗悎
- * @return 鏄剧ず瀵硅薄
- */
- public List<OmdBtmTypeVO> listEntityVO(List<OmdBtmType> list) {
- return list.stream().map(this::entityVO).collect(Collectors.toList());
- }
-
- /**
- * 鎷疯礉涓氬姟绫诲瀷 鏁版嵁浼犺緭瀵硅薄鍒� 鏁版嵁瀵硅薄
- *
- * @param dto 涓氬姟绫诲瀷鏁版嵁浼犺緭瀵硅薄
- * @param creator 鍒涘缓浜�
- * @param now 褰撴椂鏃堕棿
- */
- public OmdBtmType copyBtmTypeDTO2Entity(OmdBtmTypeDTO dto, String creator, Date now){
- OmdBtmType entity = Objects.requireNonNull(BeanUtil.copy(dto, OmdBtmType.class));
- entity.setLastModifier(creator);
- entity.setTs(now);
- // 鍦ㄨ繖杩涜閫氱敤瀛楁澶勭悊
- return entity;
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/OmdFiledRangeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/OmdFiledRangeWrapper.java
deleted file mode 100644
index 60090b0..0000000
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/OmdFiledRangeWrapper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.vci.ubcs.omd.wrapper;
-
-import com.vci.ubcs.omd.entity.OmdFieldRange;
-import com.vci.ubcs.omd.vo.OmdFieldRangeVO;
-import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.BeanUtil;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * Description: 瀛楁鑼冨洿鐨勫寘瑁呯被
- *
- * @author LiHang
- * @date 2023/4/3
- */
-public class OmdFiledRangeWrapper extends BaseEntityWrapper<OmdFieldRange, OmdFieldRangeVO> {
-
- public static OmdFiledRangeWrapper build() {
- return new OmdFiledRangeWrapper();
- }
-
- /**
- * do2vo
- * @param entity pojo
- * @return 鏄剧ず瀵硅薄
- */
- @Override
- public OmdFieldRangeVO entityVO(OmdFieldRange entity) {
- OmdFieldRangeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, OmdFieldRangeVO.class));
- return vo;
- }
-
- /**
- * 鎵归噺杞瑅o
- * @param list pojo闆嗗悎
- * @return 鏄剧ず瀵硅薄
- */
- public List<OmdFieldRangeVO> listEntityVO(List<OmdFieldRange> list) {
- return list.stream().map(this::entityVO).collect(Collectors.toList());
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/AttributeMapper.xml
similarity index 96%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/AttributeMapper.xml
index d5f53fe..89528cf 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/OmdAttributeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/AttributeMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.omd.mapper.OmdAttributeMapper">
+<mapper namespace="com.vci.ubcs.omd.mapper.AttributeMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="baseResultMap" type="com.vci.ubcs.omd.entity.OmdAttribute">
+ <resultMap id="baseResultMap" type="com.vci.ubcs.omd.entity.Attribute">
<id column="id" property="id"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
@@ -30,7 +30,7 @@
<result column="ts" property="ts" jdbcType="TIMESTAMP"/>
</resultMap>
- <resultMap id="extraResultMap" type="com.vci.ubcs.omd.entity.OmdAttribute">
+ <resultMap id="extraResultMap" type="com.vci.ubcs.omd.entity.Attribute">
<result column="nullable" property="nullable" jdbcType="VARCHAR"/>
<result column="max_length" property="maxLength" jdbcType="NUMERIC"/>
<result column="precision" property="precision" jdbcType="NUMERIC"/>
--
Gitblit v1.9.3