BJ_ZTEITS-Developers / parking-cloud-yudao

Commit df479f627e45b513de169e8f8b747689a7edb6c0

Authored by gaibu
1 parent bbb27df5

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

Inline Side-by-side
Showing 2 changed files with 13 additions and 2 deletions
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java
  View file @df479f6
1 1 package cn.iocoder.yudao.module.infra.convert.codegen;
2 2  
  3 +import cn.hutool.core.collection.CollUtil;
3 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 5 import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenDetailRespVO;
5 6 import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenPreviewRespVO;
... ... @@ -33,7 +34,15 @@ public interface CodegenConvert {
33 34 })
34 35 CodegenTableDO convert(TableInfo bean);
35 36  
36   - List<CodegenColumnDO> convertList(List<TableField> list);
  37 + default List<CodegenColumnDO> convertList(List<TableField> list){
  38 + return CollUtil.map(list,t->convert(t),true);
  39 + }
  40 +
  41 + default CodegenColumnDO convert(TableField bean) {
  42 + CodegenColumnDO codegenColumnDO = convert0(bean);
  43 + codegenColumnDO.setDataType(bean.getColumnType().getType());
  44 + return codegenColumnDO;
  45 + }
37 46  
38 47 @Mappings({
39 48 @Mapping(source = "name", target = "columnName"),
... ... @@ -45,7 +54,7 @@ public interface CodegenConvert {
45 54 @Mapping(source = "columnType.type", target = "javaType"),
46 55 @Mapping(source = "propertyName", target = "javaField"),
47 56 })
48   - CodegenColumnDO convert(TableField bean);
  57 + CodegenColumnDO convert0(TableField bean);
49 58  
50 59 // ========== CodegenTableDO 相关 ==========
51 60  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
  View file @df479f6
... ... @@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.infra.enums.codegen.CodegenColumnListConditionEnu
6 6 import com.baomidou.mybatisplus.annotation.KeySequence;
7 7 import com.baomidou.mybatisplus.annotation.TableId;
8 8 import com.baomidou.mybatisplus.annotation.TableName;
  9 +import com.baomidou.mybatisplus.generator.config.po.TableField;
9 10 import lombok.Data;
10 11 import lombok.EqualsAndHashCode;
11 12 import lombok.experimental.Accessors;
... ... @@ -42,6 +43,7 @@ public class CodegenColumnDO extends BaseDO {
42 43 private String columnName;
43 44 /**
44 45 * 字段类型
  46 + * 关联 {@link TableField#getColumnType()}}
45 47 */
46 48 private String dataType;
47 49 /**
... ...