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

gaibu
1 parent bbb27df5
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
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
 package cn.iocoder.yudao.module.infra.convert.codegen;
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenDetailRespVO;
 import cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.CodegenPreviewRespVO;
@@ -33,7 +34,15 @@ public interface CodegenConvert {
     })
     CodegenTableDO convert(TableInfo bean);
-    List<CodegenColumnDO> convertList(List<TableField> list);
+    default List<CodegenColumnDO> convertList(List<TableField> list){
+       return CollUtil.map(list,t->convert(t),true);
+    }
+
+    default CodegenColumnDO convert(TableField bean) {
+        CodegenColumnDO codegenColumnDO = convert0(bean);
+        codegenColumnDO.setDataType(bean.getColumnType().getType());
+        return codegenColumnDO;
+    }
     @Mappings({
             @Mapping(source = "name", target = "columnName"),
@@ -45,7 +54,7 @@ public interface CodegenConvert {
             @Mapping(source = "columnType.type", target = "javaType"),
             @Mapping(source = "propertyName", target = "javaField"),
     })
-    CodegenColumnDO convert(TableField bean);
+    CodegenColumnDO convert0(TableField bean);
     // ========== CodegenTableDO 相关 ==========
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.infra.enums.codegen.CodegenColumnListConditionEnu
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.generator.config.po.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -42,6 +43,7 @@ public class CodegenColumnDO extends BaseDO {
     private String columnName;
     /**
      * 字段类型
+     * 关联 {@link TableField#getColumnType()}}
      */
     private String dataType;
     /**