zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!370 fix: 代码生成字段转换错误 

Merge pull request !370 from 与或非/issues/202
pull/2/head
芋道源码 2023-01-11 14:41:28 +00:00 committed by Gitee
parent 0bbf45ce51 215a3767ae
commit f246428bef
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java
View File

@ -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 cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO;
import com.baomidou.mybatisplus.generator.config.po.TableField; import com.baomidou.mybatisplus.generator.config.po.TableField;
import com.baomidou.mybatisplus.generator.config.po.TableInfo; 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.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;
import org.mapstruct.Mappings; import org.mapstruct.Mappings;
@ -39,7 +39,7 @@ public interface CodegenConvert {
@Mappings({ @Mappings({
@Mapping(source = "name", target = "columnName"), @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 = "comment", target = "columnComment"),
@Mapping(source = "metaInfo.nullable", target = "nullable"), @Mapping(source = "metaInfo.nullable", target = "nullable"),
@Mapping(source = "keyFlag", target = "primaryKey"), @Mapping(source = "keyFlag", target = "primaryKey"),
@ -49,9 +49,9 @@ public interface CodegenConvert {
}) })
CodegenColumnDO convert(TableField bean); CodegenColumnDO convert(TableField bean);
@Named("getType") @Named("getDataType")
default String getType(IColumnType jdbcType) { default String getDataType(JdbcType jdbcType) {
return jdbcType.getType(); return jdbcType.name();
} }
// ========== CodegenTableDO 相关 ========== // ========== CodegenTableDO 相关 ==========

14
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
View File

@ -30,7 +30,7 @@ public class CodegenColumnDO extends BaseDO {
private Long id; private Long id;
/** /**
* 表编号 * 表编号
* * <p>
* 关联 {@link CodegenTableDO#getId()} * 关联 {@link CodegenTableDO#getId()}
*/ */
private Long tableId; private Long tableId;
@ -42,8 +42,8 @@ public class CodegenColumnDO extends BaseDO {
*/ */
private String columnName; private String columnName;
/** /**
* 字段类型 * 数据库字段类型
* 关联 {@link TableField#getColumnType()}} * 关联 {@link TableField.MetaInfo#getJdbcType()}
*/ */
private String dataType; private String dataType;
/** /**
@ -71,7 +71,7 @@ public class CodegenColumnDO extends BaseDO {
/** /**
* Java 属性类型 * Java 属性类型
* * <p>
* 例如说 String、Boolean 等等 * 例如说 String、Boolean 等等
*/ */
private String javaType; private String javaType;
@ -81,7 +81,7 @@ public class CodegenColumnDO extends BaseDO {
private String javaField; private String javaField;
/** /**
* 字典类型 * 字典类型
* * <p>
* 关联 DictTypeDO 的 type 属性 * 关联 DictTypeDO 的 type 属性
*/ */
private String dictType; private String dictType;
@ -106,7 +106,7 @@ public class CodegenColumnDO extends BaseDO {
private Boolean listOperation; private Boolean listOperation;
/** /**
* List 查询操作的条件类型 * List 查询操作的条件类型
* * <p>
* 枚举 {@link CodegenColumnListConditionEnum} * 枚举 {@link CodegenColumnListConditionEnum}
*/ */
private String listOperationCondition; private String listOperationCondition;
@ -119,7 +119,7 @@ public class CodegenColumnDO extends BaseDO {
/** /**
* 显示类型 * 显示类型
* * <p>
* 枚举 {@link CodegenColumnHtmlTypeEnum} * 枚举 {@link CodegenColumnHtmlTypeEnum}
*/ */
private String htmlType; private String htmlType;