diff --git a/server/like-generator/src/main/java/com/mdd/generator/mapper/GenTableMapper.java b/server/like-generator/src/main/java/com/mdd/generator/mapper/GenTableMapper.java index 367464262965449f61287c648caa57215da1cca9..d88d8971e5937a4f7c85e3b6ffe3a5f7d70e5ffc 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/mapper/GenTableMapper.java +++ b/server/like-generator/src/main/java/com/mdd/generator/mapper/GenTableMapper.java @@ -54,7 +54,7 @@ public interface GenTableMapper extends IBaseMapper { "#{name}" + "", ""}) - List> selectDbTableListByNames(String[] tableNames); + List selectDbTableListByNames(String[] tableNames); /** * 根据表名查询列信息 diff --git a/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java index e3c71f84dd3c4dd07c6e52e640a535f0706833d9..ce2b3afefe589779a7d3b53c0c37fd1ac09f360b 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java @@ -187,8 +187,8 @@ public class GenerateServiceImpl implements IGenerateService { @Transactional public void importTable(String[] tableNames) { try { - List> tables = genTableMapper.selectDbTableListByNames(tableNames); - for (Map map : tables) { + List tables = genTableMapper.selectDbTableListByNames(tableNames); + for (DbTableVo map : tables) { // 生成表信息 GenTable table = new GenTable(); GenUtil.initTable(table, map); @@ -196,7 +196,7 @@ public class GenerateServiceImpl implements IGenerateService { // 生成列信息 if (row > 0) { - String tableName = map.get("table_name"); + String tableName = map.getTableName(); List genTableColumns = genTableMapper.selectDbTableColumnsByName(tableName); for (GenTableColumn column : genTableColumns) { GenUtil.initColumn(column, table); diff --git a/server/like-generator/src/main/java/com/mdd/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/mdd/generator/util/GenUtil.java index 24b44c79b7c3d701df88b282b3eddc14458f4255..3c4c505d59a1f79e2f2f01513462fd7c23821721 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/mdd/generator/util/GenUtil.java @@ -9,6 +9,7 @@ import com.mdd.generator.constant.JavaConstants; import com.mdd.generator.constant.SqlConstants; import com.mdd.generator.entity.GenTable; import com.mdd.generator.entity.GenTableColumn; +import com.mdd.generator.vo.DbTableVo; import org.apache.commons.lang3.RegExUtils; import java.util.Arrays; @@ -23,12 +24,12 @@ public class GenUtil { * @param table 表 * @param map 参数 */ - public static void initTable(GenTable table, Map map) { - String tableName = map.get("table_name"); - String tableDesc = map.get("table_comment"); + public static void initTable(GenTable table, DbTableVo map) { + String tableName = map.getTableName(); + String tableDesc = map.getTableComment(); table.setTableName(tableName); table.setTableComment(tableDesc); - table.setAuthorName(map.getOrDefault("author_name", "")); + table.setAuthorName(map.getAuthorName()); table.setEntityName(GenUtil.toClassName(tableName)); table.setModuleName(GenUtil.toModuleName(tableName)); table.setFunctionName(GenUtil.replaceText(tableDesc)); diff --git a/server/like-generator/src/main/java/com/mdd/generator/vo/DbTableVo.java b/server/like-generator/src/main/java/com/mdd/generator/vo/DbTableVo.java index 17036fc0852adcf1c81c7a75442d7f7f449d649a..99526825d08038f755231fe2080f57d2c9c07c57 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/vo/DbTableVo.java +++ b/server/like-generator/src/main/java/com/mdd/generator/vo/DbTableVo.java @@ -14,6 +14,7 @@ public class DbTableVo implements Serializable { private String tableName; // 表的名称 private String tableComment; // 表的描述 + private String authorName; // 作者名称 private String createTime; // 创建时间 private String updateTime; // 更新时间