From 78db1ace6db75d777080dbc7eedcd3abcfc6216b Mon Sep 17 00:00:00 2001
From: hawk <317642196@qq.com>
Date: Wed, 21 Sep 2022 23:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E7=BC=96=E8=BE=91=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=85=BC=E5=AE=B9mysql8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mdd/generator/mapper/GenTableMapper.java    | 2 +-
 .../mdd/generator/service/impl/GenerateServiceImpl.java  | 6 +++---
 .../src/main/java/com/mdd/generator/util/GenUtil.java    | 9 +++++----
 .../src/main/java/com/mdd/generator/vo/DbTableVo.java    | 1 +
 4 files changed, 10 insertions(+), 8 deletions(-)

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 36746426..d88d8971 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<GenTable> {
             "#{name}" +
         "</foreach>",
     "</script>"})
-    List<Map<String, String>> selectDbTableListByNames(String[] tableNames);
+    List<DbTableVo> 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 e3c71f84..ce2b3afe 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<Map<String, String>> tables = genTableMapper.selectDbTableListByNames(tableNames);
-            for (Map<String, String> map : tables) {
+            List<DbTableVo> 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<GenTableColumn> 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 24b44c79..3c4c505d 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<String, String> 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 17036fc0..99526825 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;    // 更新时间