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-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMySqlMapperProcessor.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

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);
 	}
 

--
Gitblit v1.9.3