BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 3df24e11d2c25ae93207bfde7210e5d1cd7dc443

Authored by 芋道源码
Committed by Gitee
2 parents 073f1925 431c029b

!363 基础设施-代码生成-整个模块不能使用 

Merge pull request !363 from 与或非/issues/202
Inline Side-by-side
Showing 2 changed files with 10 additions and 1 deletions
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java
  View file @3df24e1
@@ -11,9 +11,11 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO; @@ -11,9 +11,11 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO;
11 import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO; 11 import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO;
12 import com.baomidou.mybatisplus.generator.config.po.TableField; 12 import com.baomidou.mybatisplus.generator.config.po.TableField;
13 import com.baomidou.mybatisplus.generator.config.po.TableInfo; 13 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
  14 +import com.baomidou.mybatisplus.generator.config.rules.IColumnType;
14 import org.mapstruct.Mapper; 15 import org.mapstruct.Mapper;
15 import org.mapstruct.Mapping; 16 import org.mapstruct.Mapping;
16 import org.mapstruct.Mappings; 17 import org.mapstruct.Mappings;
  18 +import org.mapstruct.Named;
17 import org.mapstruct.factory.Mappers; 19 import org.mapstruct.factory.Mappers;
18 20
19 import java.util.List; 21 import java.util.List;
@@ -37,7 +39,7 @@ public interface CodegenConvert { @@ -37,7 +39,7 @@ public interface CodegenConvert {
37 39
38 @Mappings({ 40 @Mappings({
39 @Mapping(source = "name", target = "columnName"), 41 @Mapping(source = "name", target = "columnName"),
40 - @Mapping(source = "type", target = "dataType"), 42 + @Mapping(source = "columnType", target = "dataType", qualifiedByName = "getType"),
41 @Mapping(source = "comment", target = "columnComment"), 43 @Mapping(source = "comment", target = "columnComment"),
42 @Mapping(source = "metaInfo.nullable", target = "nullable"), 44 @Mapping(source = "metaInfo.nullable", target = "nullable"),
43 @Mapping(source = "keyFlag", target = "primaryKey"), 45 @Mapping(source = "keyFlag", target = "primaryKey"),
@@ -47,6 +49,11 @@ public interface CodegenConvert { @@ -47,6 +49,11 @@ public interface CodegenConvert {
47 }) 49 })
48 CodegenColumnDO convert(TableField bean); 50 CodegenColumnDO convert(TableField bean);
49 51
  52 + @Named("getType")
  53 + default String getType(IColumnType jdbcType) {
  54 + return jdbcType.getType();
  55 + }
  56 +
50 // ========== CodegenTableDO 相关 ========== 57 // ========== CodegenTableDO 相关 ==========
51 58
52 // List<CodegenTableRespVO> convertList02(List<CodegenTableDO> list); 59 // List<CodegenTableRespVO> convertList02(List<CodegenTableDO> list);
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
  View file @3df24e1
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.infra.enums.codegen.CodegenColumnListConditionEnu @@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.infra.enums.codegen.CodegenColumnListConditionEnu
6 import com.baomidou.mybatisplus.annotation.KeySequence; 6 import com.baomidou.mybatisplus.annotation.KeySequence;
7 import com.baomidou.mybatisplus.annotation.TableId; 7 import com.baomidou.mybatisplus.annotation.TableId;
8 import com.baomidou.mybatisplus.annotation.TableName; 8 import com.baomidou.mybatisplus.annotation.TableName;
  9 +import com.baomidou.mybatisplus.generator.config.po.TableField;
9 import lombok.Data; 10 import lombok.Data;
10 import lombok.EqualsAndHashCode; 11 import lombok.EqualsAndHashCode;
11 import lombok.experimental.Accessors; 12 import lombok.experimental.Accessors;
@@ -42,6 +43,7 @@ public class CodegenColumnDO extends BaseDO { @@ -42,6 +43,7 @@ public class CodegenColumnDO extends BaseDO {
42 private String columnName; 43 private String columnName;
43 /** 44 /**
44 * 字段类型 45 * 字段类型
  46 + * 关联 {@link TableField#getColumnType()}}
45 */ 47 */
46 private String dataType; 48 private String dataType;
47 /** 49 /**