From c699071f0588bb2a7b4b4a4f0f645c96a3384cd0 Mon Sep 17 00:00:00 2001
From: xiexiaojun <xie1xiao1jun@qq.com>
Date: Wed, 29 May 2019 20:30:59 +0800
Subject: [PATCH] 1

1
---
 data/view/gtools/common.go | 22 +++++++++++++++++++---
 data/view/gtools/def.go    |  6 ++++++
 data/view/gtools/gtools.go |  2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 data/view/gtools/def.go

diff --git a/data/view/gtools/common.go b/data/view/gtools/common.go
index 4f82445..4a25cf9 100644
--- a/data/view/gtools/common.go
+++ b/data/view/gtools/common.go
@@ -55,7 +55,7 @@ func OnGetPackageInfo(orm *mysqldb.MySqlDB, tabls map[string]string) generate.Ge
 		sct.SetStructName(OnGetCamelName(tab)) //大驼峰
 		sct.SetNotes(desc)
 		//构造元素
-
+		OnGetTableElement(orm, tab)
 		//--------end
 
 		pkg.AddStruct(sct)
@@ -64,10 +64,26 @@ func OnGetPackageInfo(orm *mysqldb.MySqlDB, tabls map[string]string) generate.Ge
 	return pkg
 }
 
-// //获取表列及注释
-func OnGetTables(orm *mysqldb.MySqlDB, tab string) []generate.GenElement {
+// 获取表列及注释
+func OnGetTableElement(orm *mysqldb.MySqlDB, tab string) []generate.GenElement {
 	var el []generate.GenElement
+	var list []struct {
+		Field string `gorm:"Field"`
+		Type  string `gorm:"Type"`
+		Key   string `gorm:"key"`
+		Desc  string `gorm:"Comment"`
+	}
 
+	//获取表注释
+	orm.Raw("show FULL COLUMNS from ?;", tab).Find(&list)
+	for _, v := range list {
+		var tmp generate.GenElement
+		tmp.SetName(OnGetCamelName(v.Field))
+		tmp.SetNotes(v.Desc)
+		tmp.SetType(v.Type)
+	}
+
+	return el
 }
 
 //大驼峰或者首字母大写
diff --git a/data/view/gtools/def.go b/data/view/gtools/def.go
new file mode 100644
index 0000000..4981b69
--- /dev/null
+++ b/data/view/gtools/def.go
@@ -0,0 +1,6 @@
+package gtools
+
+var TypeDicMp = map[string]string{
+	"1000": "M",
+	"900":  "CM",
+}
diff --git a/data/view/gtools/gtools.go b/data/view/gtools/gtools.go
index ee013cc..0f654c2 100644
--- a/data/view/gtools/gtools.go
+++ b/data/view/gtools/gtools.go
@@ -10,6 +10,6 @@ func Execute() {
 	orm := mysqldb.OnInitDBOrm(config.GetMysqlConStr())
 	defer orm.OnDestoryDB()
 
-	packageInfo := OnGetPackageInfo(orm, OnGetTables(orm))
+	OnGetPackageInfo(orm, OnGetTables(orm))
 
 }