BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 431c029b6061b9ab9fb724e5cf3998417af381e3

Authored by gaibu
1 parent df479f62

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

Inline Side-by-side
Showing 1 changed file with 10 additions and 12 deletions
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java
  View file @431c029
1 1 package cn.iocoder.yudao.module.infra.convert.codegen;
2 2  
3   -import cn.hutool.core.collection.CollUtil;
4 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 4 import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenDetailRespVO;
6 5 import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenPreviewRespVO;
... ... @@ -12,9 +11,11 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO;
12 11 import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO;
13 12 import com.baomidou.mybatisplus.generator.config.po.TableField;
14 13 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
  14 +import com.baomidou.mybatisplus.generator.config.rules.IColumnType;
15 15 import org.mapstruct.Mapper;
16 16 import org.mapstruct.Mapping;
17 17 import org.mapstruct.Mappings;
  18 +import org.mapstruct.Named;
18 19 import org.mapstruct.factory.Mappers;
19 20  
20 21 import java.util.List;
... ... @@ -34,19 +35,11 @@ public interface CodegenConvert {
34 35 })
35 36 CodegenTableDO convert(TableInfo bean);
36 37  
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   - }
  38 + List<CodegenColumnDO> convertList(List<TableField> list);
46 39  
47 40 @Mappings({
48 41 @Mapping(source = "name", target = "columnName"),
49   - @Mapping(source = "type", target = "dataType"),
  42 + @Mapping(source = "columnType", target = "dataType", qualifiedByName = "getType"),
50 43 @Mapping(source = "comment", target = "columnComment"),
51 44 @Mapping(source = "metaInfo.nullable", target = "nullable"),
52 45 @Mapping(source = "keyFlag", target = "primaryKey"),
... ... @@ -54,7 +47,12 @@ public interface CodegenConvert {
54 47 @Mapping(source = "columnType.type", target = "javaType"),
55 48 @Mapping(source = "propertyName", target = "javaField"),
56 49 })
57   - CodegenColumnDO convert0(TableField bean);
  50 + CodegenColumnDO convert(TableField bean);
  51 +
  52 + @Named("getType")
  53 + default String getType(IColumnType jdbcType) {
  54 + return jdbcType.getType();
  55 + }
58 56  
59 57 // ========== CodegenTableDO 相关 ==========
60 58  
... ...