diff --git a/pom.xml b/pom.xml index bfe536ed2..24f536c06 100644 --- a/pom.xml +++ b/pom.xml @@ -35,9 +35,10 @@ ${java.version} ${java.version} 3.0.0-M5 - 3.8.0 + 3.8.1 1.18.24 + 2.7.7 1.5.3.Final UTF-8 @@ -64,13 +65,19 @@ maven-surefire-plugin ${maven-surefire-plugin.version} - + + org.apache.maven.plugins maven-compiler-plugin ${maven-compiler-plugin.version} + + org.springframework.boot + spring-boot-configuration-processor + ${spring.boot.version} + org.projectlombok lombok diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java index 6c78ac7cd..1d286c52f 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java @@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO; import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO; import com.baomidou.mybatisplus.generator.config.po.TableField; import com.baomidou.mybatisplus.generator.config.po.TableInfo; -import com.baomidou.mybatisplus.generator.config.rules.IColumnType; +import org.apache.ibatis.type.JdbcType; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; @@ -39,7 +39,7 @@ public interface CodegenConvert { @Mappings({ @Mapping(source = "name", target = "columnName"), - @Mapping(source = "columnType", target = "dataType", qualifiedByName = "getType"), + @Mapping(source = "metaInfo.jdbcType", target = "dataType", qualifiedByName = "getDataType"), @Mapping(source = "comment", target = "columnComment"), @Mapping(source = "metaInfo.nullable", target = "nullable"), @Mapping(source = "keyFlag", target = "primaryKey"), @@ -49,9 +49,9 @@ public interface CodegenConvert { }) CodegenColumnDO convert(TableField bean); - @Named("getType") - default String getType(IColumnType jdbcType) { - return jdbcType.getType(); + @Named("getDataType") + default String getDataType(JdbcType jdbcType) { + return jdbcType.name(); } // ========== CodegenTableDO 相关 ========== diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java index 470b9969c..f1990f3fc 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java @@ -30,7 +30,7 @@ public class CodegenColumnDO extends BaseDO { private Long id; /** * 表编号 - * + *

* 关联 {@link CodegenTableDO#getId()} */ private Long tableId; @@ -42,8 +42,8 @@ public class CodegenColumnDO extends BaseDO { */ private String columnName; /** - * 字段类型 - * 关联 {@link TableField#getColumnType()}} + * 数据库字段类型 + * 关联 {@link TableField.MetaInfo#getJdbcType()} */ private String dataType; /** @@ -71,7 +71,7 @@ public class CodegenColumnDO extends BaseDO { /** * Java 属性类型 - * + *

* 例如说 String、Boolean 等等 */ private String javaType; @@ -81,7 +81,7 @@ public class CodegenColumnDO extends BaseDO { private String javaField; /** * 字典类型 - * + *

* 关联 DictTypeDO 的 type 属性 */ private String dictType; @@ -106,7 +106,7 @@ public class CodegenColumnDO extends BaseDO { private Boolean listOperation; /** * List 查询操作的条件类型 - * + *

* 枚举 {@link CodegenColumnListConditionEnum} */ private String listOperationCondition; @@ -119,7 +119,7 @@ public class CodegenColumnDO extends BaseDO { /** * 显示类型 - * + *

* 枚举 {@link CodegenColumnHtmlTypeEnum} */ private String htmlType;