From d9183aa80ae17d36b79dda48c6b1d7fa22a80ee3 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期三, 22 一月 2025 11:20:41 +0800
Subject: [PATCH] 现场型号代号/人员/组织接口调试
---
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllMapperProcessor.java | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
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 b211b73..7e4ee9d 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
@@ -16,6 +16,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Locale;
/**
* Description:DLL鐨勫鐞嗘帴鍙�
@@ -87,47 +88,37 @@
return mapper.createViewBySql(viewCreateSql);
}
-
public int createTableBySql(String tableName, String attributeSql) {
return mapper.createTableBySql(tableName, attributeSql);
}
-
public int commentTable(String tableName, String comment) {
return mapper.commentTable(tableName, comment);
}
-
public int commentColumnTable(String tableName, String columnName, String comment) {
return mapper.commentColumnTable(tableName, columnName, comment);
}
-
public int modifyTableBySql(String tableName, String attributeSql) {
return mapper.modifyTableBySql(tableName, attributeSql);
}
-
public int addColumn2TableBySql(String tableName, String attributeSql) {
return mapper.addColumn2TableBySql(tableName, attributeSql);
}
-
public int dropTable(String tableName) {
return mapper.dropTable(tableName);
}
-
public int checkTableExist(String tableName) {
return mapper.checkTableExist(tableName);
}
-
public int countAll(String tableName) {
return mapper.countAll(tableName);
}
-
-
/**
* 鑾峰彇瀛楁鍒涘缓sql
@@ -143,7 +134,7 @@
}
mappingBO.setNullable(attributeVO.isNullableFlag());
mappingBO.setDefaultValue(attributeVO.getDefaultValue());
- return mappingBO.toString() + (StringUtil.equals(attributeVO.getId(),"OID") ? StringPool.SPACE + "primary key" + StringPool.SPACE : "");
+ return mappingBO.toString() + (StringUtil.equals(attributeVO.getId().toLowerCase(Locale.ROOT),"OID".toLowerCase(Locale.ROOT)) ? StringPool.SPACE + "primary key" + StringPool.SPACE : "");
}
@@ -153,18 +144,18 @@
List<VciFieldTypeEnum> fieldTypes = listFieldInMapByColumnStr(columnStr, map);
VciFieldTypeEnum finalField = null;
int i = Integer.MAX_VALUE;
- if (CollectionUtils.isEmpty(fieldTypes)){
- return null;
- }
if (fieldTypes.size() == 1){
return fieldTypes.get(0);
}
for (VciFieldTypeEnum fieldType : fieldTypes) {
- DdlFieldMappingAttrBO bo = map.get(fieldType);
- int i1 = Math.abs(bo.getDataLength() - length);
- if (i1 < i){
- finalField = fieldType;
- i = i1;
+ if (fieldType.equals(VciFieldTypeEnum.VTString)) {
+ finalField = VciFieldTypeEnum.VTString;
+ }
+ if (fieldType.equals(VciFieldTypeEnum.VTDateTime)){
+ finalField = VciFieldTypeEnum.VTDateTime;
+ }
+ if (fieldType.equals(VciFieldTypeEnum.VTInteger) && length <= 26){
+ finalField = VciFieldTypeEnum.VTInteger;
}
}
return finalField;
--
Gitblit v1.9.3