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的处理接口
@@ -143,7 +144,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 +154,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;