From d79b4ab6769434e71893624f6331fc347c33a29f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 21 Jan 2019 15:25:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=88=97ex?=
 =?UTF-8?q?tra=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/generator/domain/ColumnInfo.java  | 17 +++++++++++++++--
 .../java/com/ruoyi/generator/util/GenUtils.java |  1 +
 .../resources/mapper/generator/GenMapper.xml    |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/ColumnInfo.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/ColumnInfo.java
index 7afab267..c4032a53 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/ColumnInfo.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/ColumnInfo.java
@@ -18,7 +18,7 @@ public class ColumnInfo
 
     /** 列描述 */
     private String columnComment;
-    
+
     /** 列配置 */
     private ColumnConfigInfo configInfo;
 
@@ -31,6 +31,9 @@ public class ColumnInfo
     /** Java属性名称(第一个字母小写)，如：user_name => userName */
     private String attrname;
 
+    /** 执行计划（包含了与索引相关的一些细节信息） */
+    private String extra;
+
     public String getColumnName()
     {
         return columnName;
@@ -99,7 +102,17 @@ public class ColumnInfo
     {
         this.attrType = attrType;
     }
-    
+
+    public String getExtra()
+    {
+        return extra;
+    }
+
+    public void setExtra(String extra)
+    {
+        this.extra = extra;
+    }
+
     public ColumnConfigInfo getConfigInfo()
     {
         return configInfo;
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index a6747836..e67f1784 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -44,6 +44,7 @@ public class GenUtils
             String attrName = StringUtils.convertToCamelCase(column.getColumnName());
             column.setAttrName(attrName);
             column.setAttrname(StringUtils.uncapitalize(attrName));
+            column.setExtra(column.getExtra());
 
             // 列的数据类型，转换成Java类型
             String attrType = javaTypeMap.get(column.getDataType());
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenMapper.xml
index 4653bee2..45bf4bd8 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenMapper.xml
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectTableColumnsByName" parameterType="String" resultMap="ColumnInfoResult">
-		select column_name, data_type, column_comment from information_schema.columns
+		select column_name, data_type, column_comment, extra from information_schema.columns
         where table_name = #{tableName} and table_schema = (select database()) order by ordinal_position
 	</select>