Ver código fonte

今日修改

Administrator 2 anos atrás
pai
commit
12c69c893e

+ 2 - 2
configs/config.go

@@ -73,8 +73,8 @@ func ConfigInit() {
 	Engine, err = xorm.NewEngine("mysql", fmt.Sprintf("%s:%s@(%s:%s)/%s?charset=utf8", config.Get("mysql.user"), config.Get("mysql.password"), config.Get("mysql.host"), config.Get("mysql.port"), config.Get("mysql.database")))
 	Engine.Ping() //连接测试
 	//TODO  显示sql
-	Engine.ShowSQL(true)
-	Engine.Logger().ShowSQL(true)
+	//Engine.ShowSQL(true)
+	//Engine.Logger().ShowSQL(true)
 	RedisDb = redis.NewClient(&redis.Options{
 		Addr:     fmt.Sprintf("%s:%s", config.Get("redis.host"), config.Get("redis.port")), // Redis地址
 		Password: "",                                                                       // Redis密码,如果没有则为空字符串

+ 1 - 0
create.yaml

@@ -0,0 +1 @@
+create:

+ 0 - 87
dao/UserDao.go

@@ -1,87 +0,0 @@
-package dao
-
-import (
-	"fmt"
-	"go-create/configs"
-	"go-create/domain"
-)
-
-func GetByIdUser(id int) (domain.User, error) {
-	var user domain.User
-	_, err := configs.Engine.Where("id = ?", id).Get(&user)
-	if err != nil {
-		return user, err
-	}
-	return user, nil
-}
-
-func GetInIdListUser(ids []int) ([]domain.User, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.User{})
-	if err != nil {
-		return make([]domain.User, 0), err
-	}
-	defer rows.Close()
-	var list []domain.User
-	for rows.Next() {
-		var u domain.User
-		list = append(list, u)
-	}
-	return list, nil
-}
-
-func GetListUser(user domain.User, pageNum, pageSize int) (domain.BaseListVo, error) {
-	var arr []domain.User
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &user)
-	if err != nil {
-		return domain.BaseListVo{}, err
-	}
-	var vo domain.BaseListVo
-	if err != nil {
-		return vo, err
-	}
-	vo.PageNum = pageNum
-	vo.PageSize = pageSize
-	vo.List = make([]any, len(arr))
-	for i, v := range arr {
-		vo.List[i] = v
-	}
-	vo.Total = int(Count)
-	return vo, nil
-}
-
-func SaveUser(user *domain.User) (domain.User, error) {
-	_, err := configs.Engine.Table("user").Insert(&user)
-	if err != nil {
-		panic(err)
-		return *user, err
-	}
-	return *user, nil
-}
-
-func SetUser(userMap map[string]interface{}, id int) (domain.User, bool, error) {
-	var user domain.User
-	_, err := configs.Engine.Table("user").Where("id = ?", id).Update(userMap)
-	if err != nil {
-		return user, false, err
-	}
-	return user, true, nil
-}
-
-func DeleteUser(user domain.User) bool {
-	i, err := configs.Engine.Where("id = ?", user.Id).Delete(&user)
-	if err != nil {
-		return false
-	}
-	return i > 0
-}
-func SelectByObject(User domain.User, pageNum, pageSize int) {
-	var res []domain.User
-	err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").Find(&res, &User)
-	if err != nil {
-		panic(err)
-		return
-	}
-	for _, v := range res {
-		fmt.Println(v)
-	}
-}

+ 0 - 8
domain/BaseListVo.go

@@ -1,8 +0,0 @@
-package domain
-
-type BaseListVo struct {
-	PageNum  int   `json:"pageNum"`
-	PageSize int   `json:"pageSize"`
-	Total    int   `json:"total"`
-	List     []any `json:"list"`
-}

+ 0 - 23
domain/User.go

@@ -1,23 +0,0 @@
-package domain
-
-import "fmt"
-
-// User
-type User struct {
-	Id            int64  `json:"id"`                                   // 11 0 注释:
-	Username      string `xorm:"username"  json:"username"`            // 255 0 注释:账号
-	Password      string `xorm:"password"  json:"password"`            // 255 0 注释:密码
-	CreationTime  int    `xorm:"creation_time"  json:"creationTime"`   // 11 0 注释:账号创建时间
-	LoginTime     int    `xorm:"login_time"  json:"loginTime"`         // 11 0 注释:登录时间
-	Status        string `xorm:"status"  json:"status"`                // 255 0 注释:账号状态
-	RoleId        int    `xorm:"role_id"  json:"roleId"`               // 11 0 注释:角色id
-	Phone         string `xorm:"phone"  json:"phone"`                  // 255 0 注释:手机
-	Email         string `xorm:"email"  json:"email"`                  // 255 0 注释:邮箱
-	Name          string `xorm:"name"  json:"name"`                    // 255 0 注释:用户名
-	Avatar        string `xorm:"avatar"  json:"avatar"`                // 255 0 注释:头像
-	RecommendCode string `xorm:"recommend_code"  json:"recommendCode"` // 255 0 注释:推荐码
-}
-
-func (receiver User) String() string {
-	return fmt.Sprint("User{Id:", receiver.Id, ",Username:", receiver.Username, ",Password:", receiver.Password, ",CreationTime:", receiver.CreationTime, ",LoginTime:", receiver.LoginTime, ",Status:", receiver.Status, ",RoleId:", receiver.RoleId, ",Phone:", receiver.Phone, ",Email:", receiver.Email, ",Name:", receiver.Name, ",Avatar:", receiver.Avatar, ",RecommendCode:", receiver.RecommendCode, "}")
-}

+ 1 - 1
go.mod

@@ -1,6 +1,6 @@
 module go-create
 
-go 1.22
+go 1.19
 
 require (
 	github.com/go-redis/redis/v8 v8.11.5

+ 9 - 8
main.go

@@ -3,6 +3,8 @@ package main
 import (
 	"bufio"
 	"go-create/configs"
+	"go-create/service"
+	"go-create/tmpl"
 	"go-create/util"
 	"html/template"
 	"os"
@@ -14,6 +16,7 @@ func init() {
 func main() {
 	//初始化
 	util.InitMTableArray(configs.Engine)
+	service.InitTable()
 	//执行生成,go
 	//util.MysqlToStruct()
 	//util.MysqlToDao()
@@ -21,8 +24,6 @@ func main() {
 	//执行生成,vue
 	//util.MysqlToVueApi()
 
-	//TODO 结构体 MTables 中的字段不允许外界访问:aaBbName
-	LoadDaoTemplate("E:\\project\\kkc\\go-xorm-create\\domain\\Dao.go")
 }
 
 // LoadStructTemplate 加载结构体生成模板
@@ -30,14 +31,14 @@ func LoadStructTemplate(url string) {
 	os.Truncate(url, 0)
 	file, _ := os.OpenFile(url, os.O_CREATE|os.O_RDWR, 0666)
 	defer file.Close()
-
+	//os.Stdout
 	writer := bufio.NewWriter(file)
 
-	tmpl, err := template.ParseFiles("./tmpl/struct.go.template")
+	t, err := template.ParseFiles("./tmpl/struct.go.template")
 	if err != nil {
 		panic(err)
 	}
-	err = tmpl.Execute(writer, util.MTables)
+	err = t.Execute(writer, tmpl.MTables)
 	if err != nil {
 		panic(err)
 	}
@@ -49,13 +50,13 @@ func LoadDaoTemplate(url string) {
 	file, _ := os.OpenFile(url, os.O_CREATE|os.O_RDWR, 0666)
 	defer file.Close()
 
-	writer := bufio.NewWriter(file)
+	writer := bufio.NewWriterSize(file, 1<<31)
 
-	tmpl, err := template.ParseFiles("./tmpl/dao.go.template")
+	t, err := template.ParseFiles("./tmpl/dao.go.template")
 	if err != nil {
 		panic(err)
 	}
-	err = tmpl.Execute(writer, util.MTables)
+	err = t.Execute(writer, tmpl.MTables)
 	if err != nil {
 		panic(err)
 	}

+ 46 - 0
service/BaseListVo.go

@@ -0,0 +1,46 @@
+package service
+
+import "fmt"
+
+type BaseListVo struct {
+	PageNum  int   `json:"pageNum"`
+	PageSize int   `json:"pageSize"`
+	Total    int   `json:"total"`
+	List     []any `json:"list"`
+}
+
+// GenTable
+type GenTable struct {
+	Id           int64  `json:"id"`                                 // 11 0 注释:id
+	TableName    string `xorm:"table_name"  json:"tableName"`       // 255 0 注释:数据库名
+	TableComment string `xorm:"table_comment"  json:"tableComment"` // 255 0 注释:数据库注释
+	Name         string `xorm:"name"  json:"name"`                  // 255 0 注释:名字
+	RouterName   string `xorm:"router_name"  json:"routerName"`     // 255 0 注释:路由名
+	Remark       string `xorm:"remark"  json:"remark"`              // 255 0 注释:备注
+}
+
+func (receiver GenTable) String() string {
+	return fmt.Sprint("GenTable{Id:", receiver.Id, ",TableName:", receiver.TableName, ",TableComment:", receiver.TableComment, ",Name:", receiver.Name, ",RouterName:", receiver.RouterName, ",Remark:", receiver.Remark, "}")
+}
+
+// GenTableColumn
+type GenTableColumn struct {
+	Id            int64  `json:"id"`                                   // 11 0 注释:id
+	TableId       int64  `xorm:"table_id"  json:"tableId"`             // 11 0 注释:表格id
+	Sort          int64  `xorm:"sort"  json:"sort"`                    // 255 0 注释:排序
+	ColumnName    string `xorm:"column_name"  json:"columnName"`       // 255 0 注释:字段名
+	ColumnComment string `xorm:"column_comment"  json:"columnComment"` // 255 0 注释:字段注释
+	ColumnType    string `xorm:"column_type"  json:"columnType"`       // 255 0 注释:字段类型
+	GoType        string `xorm:"go_type"  json:"goType"`               // 255 0 注释:go类型
+	GoField       string `xorm:"go_field"  json:"goField"`             // 255 0 注释:go字段名
+	IsKey         string `xorm:"is_key"  json:"isKey"`                 // 1 0 注释:是否主键
+	IsIncrement   string `xorm:"is_increment"  json:"isIncrement"`     // 1 0 注释:是否自增
+	IsRequired    string `xorm:"is_required"  json:"isRequired"`       // 1 0 注释:是否未必填
+	QueryType     string `xorm:"query_type"  json:"queryType"`         // 1 0 注释:查询方式
+	VueShowType   string `xorm:"vue_show_type"  json:"vueShowType"`    // 255 0 注释:前端显示类型
+	DictType      string `xorm:"dict_type"  json:"dictType"`           // 255 0 注释:字典类型
+}
+
+func (receiver GenTableColumn) String() string {
+	return fmt.Sprint("GenTableColumn{Id:", receiver.Id, ",TableId:", receiver.TableId, ",Sort:", receiver.Sort, ",ColumnName:", receiver.ColumnName, ",ColumnComment:", receiver.ColumnComment, ",ColumnType:", receiver.ColumnType, ",GoType:", receiver.GoType, ",GoField:", receiver.GoField, ",IsKey:", receiver.IsKey, ",IsIncrement:", receiver.IsIncrement, ",IsRequired:", receiver.IsRequired, ",QueryType:", receiver.QueryType, ",VueShowType:", receiver.VueShowType, ",DictType:", receiver.DictType, "}")
+}

+ 74 - 0
service/GenTableColumnDao.go

@@ -0,0 +1,74 @@
+package service
+
+import (
+	"go-create/configs"
+)
+
+func GetGenTableColumnById(id int64) (GenTableColumn, error) {
+	var genTableColumn GenTableColumn
+	_, err := configs.Engine.Table("gen_table_column").Where("id = ?", id).Get(&genTableColumn)
+	if err != nil {
+		return genTableColumn, err
+	}
+	return genTableColumn, nil
+}
+
+func GetGenTableColumnListInId(ids []int64) ([]GenTableColumn, error) {
+	rows, err := configs.Engine.Table("gen_table_column").In("id", ids).Rows(&GenTableColumn{})
+	if err != nil {
+		return make([]GenTableColumn, 0), err
+	}
+	defer rows.Close()
+	var list []GenTableColumn
+	for rows.Next() {
+		var u GenTableColumn
+		list = append(list, u)
+	}
+	return list, nil
+}
+
+func GetGenTableColumnList(genTableColumn GenTableColumn, pageNum, pageSize int) (BaseListVo, error) {
+	var arr []GenTableColumn
+	Count, err := configs.Engine.Table("gen_table_column").Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &genTableColumn)
+	var vo BaseListVo
+	if err != nil {
+		return vo, err
+	}
+	if err != nil {
+		return vo, err
+	}
+	vo.PageNum = pageNum
+	vo.PageSize = pageSize
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
+	}
+	vo.Total = int(Count)
+	return vo, nil
+}
+
+func SaveGenTableColumn(genTableColumn *GenTableColumn) (GenTableColumn, error) {
+	_, err := configs.Engine.Table("gen_table_column").Insert(&genTableColumn)
+	if err != nil {
+		return *genTableColumn, err
+	}
+	return *genTableColumn, nil
+}
+
+func SetGenTableColumn(genTableColumnMap map[string]interface{}, id int64) (GenTableColumn, bool, error) {
+	var genTableColumn GenTableColumn
+	_, err := configs.Engine.Table("gen_table_column").Where("id = ?", id).Update(genTableColumnMap)
+	if err != nil {
+		return genTableColumn, false, err
+	}
+	return genTableColumn, true, nil
+}
+
+func DeleteGenTableColumn(id int64) bool {
+	var genTableColumn GenTableColumn
+	i, err := configs.Engine.Table("gen_table_column").Where("id = ?", id).Delete(&genTableColumn)
+	if err != nil {
+		return false
+	}
+	return i > 0
+}

+ 72 - 0
service/GenTableDao.go

@@ -0,0 +1,72 @@
+package service
+
+import "go-create/configs"
+
+func GetGenTableById(id int64) (GenTable, error) {
+	var genTable GenTable
+	_, err := configs.Engine.Where("id = ?", id).Get(&genTable)
+	if err != nil {
+		return genTable, err
+	}
+	return genTable, nil
+}
+
+func GetGenTableListInId(ids []int64) ([]GenTable, error) {
+	rows, err := configs.Engine.Table("gen_table").In("id", ids).Rows(&GenTable{})
+	if err != nil {
+		return make([]GenTable, 0), err
+	}
+	defer rows.Close()
+	var list []GenTable
+	for rows.Next() {
+		var u GenTable
+		list = append(list, u)
+	}
+	return list, nil
+}
+
+func GetGenTableList(genTable GenTable, pageNum, pageSize int) (BaseListVo, error) {
+	var arr []GenTable
+	Count, err := configs.Engine.Table("gen_table").Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &genTable)
+	var vo BaseListVo
+	if err != nil {
+		return vo, err
+	}
+	if err != nil {
+		return vo, err
+	}
+	vo.PageNum = pageNum
+	vo.PageSize = pageSize
+	vo.List = make([]any, len(arr))
+	for i, v := range arr {
+		vo.List[i] = v
+	}
+	vo.Total = int(Count)
+	return vo, nil
+}
+
+func SaveGenTable(genTable *GenTable) (GenTable, error) {
+	_, err := configs.Engine.Table("gen_table").Insert(&genTable)
+	if err != nil {
+		return *genTable, err
+	}
+	return *genTable, nil
+}
+
+func SetGenTable(genTableMap map[string]interface{}, id int64) (GenTable, bool, error) {
+	var genTable GenTable
+	_, err := configs.Engine.Table("gen_table").Table("gen_table").Where("id = ?", id).Update(genTableMap)
+	if err != nil {
+		return genTable, false, err
+	}
+	return genTable, true, nil
+}
+
+func DeleteGenTable(id int64) bool {
+	var genTable GenTable
+	i, err := configs.Engine.Table("gen_table").Where("id = ?", id).Delete(&genTable)
+	if err != nil {
+		return false
+	}
+	return i > 0
+}

+ 75 - 0
service/InitTable.go

@@ -0,0 +1,75 @@
+package service
+
+import (
+	"go-create/util"
+)
+
+type GTable struct {
+	GenTable       GenTable
+	GenTableColumn []GenTableColumn
+}
+
+var GTables = make([]GTable, 0)
+
+// InitTable 初始化表格生成
+func InitTable() {
+	for i := range util.MTables {
+		table := util.MTables[i]
+		//表格
+		gt := GenTable{
+			TableName:    table.Name,
+			TableComment: table.Comment,
+			Name:         table.GreatHump,
+			RouterName:   table.LittleHump,
+			Remark:       table.Comment,
+		}
+
+		list, _ := GetGenTableList(gt, 1, 1)
+		if list.Total == 0 {
+			gt, _ = SaveGenTable(&gt)
+		} else {
+			gt = list.List[0].(GenTable)
+		}
+
+		gtcs := make([]GenTableColumn, 0)
+		for j := range table.MColumns {
+			column := table.MColumns[j]
+			gtc := GenTableColumn{
+				TableId:       gt.Id,
+				Sort:          int64(j),
+				ColumnName:    column.Name,
+				ColumnComment: column.Comment,
+				ColumnType:    column.SqlTypeName,
+				GoType:        util.FormatSqlType(column.SqlTypeName),
+				GoField:       column.GreatHump,
+				IsKey: func() string {
+					if column.IsKey {
+						return "1"
+					}
+					return "0"
+				}(),
+				IsIncrement: "0",
+				IsRequired:  "0",
+				QueryType:   "",
+				VueShowType: "",
+				DictType:    "",
+			}
+			subList, _ := GetGenTableColumnList(gtc, 1, 1)
+			if subList.Total == 0 {
+				gtc, _ = SaveGenTableColumn(&gtc)
+			} else {
+				gtc = subList.List[0].(GenTableColumn)
+			}
+
+			gtcs = append(gtcs, gtc)
+		}
+		GTables = append(GTables, GTable{
+			GenTable:       gt,
+			GenTableColumn: gtcs,
+		})
+	}
+}
+
+type VMTemple struct {
+	Name string
+}

+ 0 - 88
text/TextFile

@@ -1,88 +0,0 @@
-package router
-
-import (
-	"demo/data/dao/manage"
-	"demo/data/domain"
-	"demo/share"
-	"encoding/json"
-	"github.com/gin-gonic/gin"
-	"github.com/spf13/cast"
-)
-
-func Base" + table.AaBbName + "Router(group *gin.RouterGroup) {
-	Base" + table.AaBbName + "Group := group.Group("/back/base")
-	PushRouter(Base" + table.AaBbName + "Group, "GET", "/" + table.aaBbName + "", GetBase" + table.AaBbName + "ById)
-	PushRouter(Base" + table.AaBbName + "Group, "POST", "/" + table.aaBbName + "/list", GetBase" + table.AaBbName + "List)
-	PushRouter(Base" + table.AaBbName + "Group, "POST", "/" + table.aaBbName + "/in", GetBase" + table.AaBbName + "ListInId)
-	PushRouter(Base" + table.AaBbName + "Group, "POST", "/" + table.aaBbName + "", SaveBase" + table.AaBbName + ")
-	PushRouter(Base" + table.AaBbName + "Group, "PUT", "/" + table.aaBbName + "", UpdateBase" + table.AaBbName + ")
-	PushRouter(Base" + table.AaBbName + "Group, "DELETE", "/" + table.aaBbName + "", DeleteBase" + table.AaBbName + ")
-}
-
-func GetBase" + table.AaBbName + "ById(c *gin.Context) {
-	id := c.Param("id")
-	" + table.aaBbName + ", err := manage.Get" + table.AaBbName + "ById(cast.ToInt64(id))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "用户查询不存在"))
-	}
-	c.JSON(200, CreateResultData(" + table.aaBbName + "))
-}
-
-func GetBase" + table.AaBbName + "List(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	param, _ := data("param")
-	pageNum, _ := data("pageNum")
-	pageSize, _ := data("pageSize")
-	" + table.aaBbName + " := domain." + table.AaBbName + "{}
-	err := json.Unmarshal([]byte(cast.ToString(param)), &" + table.aaBbName + ")
-	list, err := manage.Get" + table.AaBbName + "List(" + table.aaBbName + ", cast.ToInt(pageNum), cast.ToInt(pageSize))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func GetBase" + table.AaBbName + "ListInId(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	idsString, _ := data("ids")
-	var ids []int64
-	err := json.Unmarshal([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.Get" + table.AaBbName + "ListInId(ids)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func SaveBase" + table.AaBbName + "(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	" + table.aaBbName + "Param, _ := data("" + table.aaBbName + "")
-	" + table.aaBbName + " := domain." + table.AaBbName + "{}
-	err := json.Unmarshal([]byte(cast.ToString(" + table.aaBbName + "Param)), &" + table.aaBbName + ")
-	save" + table.AaBbName + ", err := manage.Save" + table.AaBbName + "(&" + table.aaBbName + ")
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "保存错误"))
-	}
-	c.JSON(200, CreateResultData(save" + table.AaBbName + "))
-}
-
-func UpdateBase" + table.AaBbName + "(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	" + table.aaBbName + ", _ := data("" + table.aaBbName + "")
-	id, _ := data("id")
-
-	set" + table.AaBbName + ", b, err := manage.Set" + table.AaBbName + "(cast.ToStringMap(" + table.aaBbName + "), cast.ToInt64(id))
-	if err != nil || !b {
-		c.JSON(200, CreateResultError(500, "修改错误"))
-	}
-	c.JSON(200, CreateResultData(set" + table.AaBbName + "))
-}
-
-func DeleteBase" + table.AaBbName + "(c *gin.Context) {
-	id := c.Param("id")
-	res := manage.Delete" + table.AaBbName + "(cast.ToInt64(id))
-	if !res {
-		c.JSON(200, CreateResultError(500, "删除错误"))
-	}
-	c.JSON(200, CreateResult())
-}

+ 15 - 16
util/MysqlBaseData.go

@@ -9,17 +9,17 @@ import (
 )
 
 type MTable struct {
-	Name     string
-	AaBbName string
-	aaBbName string
-	Comment  string
-	existId  bool
-	MColumns []MColumn
+	Name       string
+	GreatHump  string
+	LittleHump string
+	Comment    string
+	ExistId    bool
+	MColumns   []MColumn
 }
 type MColumn struct {
-	Name        string //aa_bb
-	AaBbName    string
-	aaBbName    string
+	Name        string
+	GreatHump   string
+	LittleHump  string
 	Comment     string
 	SqlTypeName string
 	TypeName    string
@@ -33,8 +33,8 @@ func (receiver MTable) String() string {
 	return fmt.Sprintf("Name:%s,Comment:%s,MColumns:%s\n\n\n", receiver.Name, receiver.Comment, receiver.MColumns)
 }
 func (receiver MColumn) String() string {
-	return fmt.Sprintf("Name:%s,AaBbName:%s,aaBbName:%s,Comment:%s,SqlTypeName:%s,TypeName:%s,Length:%d,Length2:%d\n",
-		receiver.Name, receiver.AaBbName, receiver.aaBbName, receiver.Comment, receiver.SqlTypeName, receiver.TypeName, receiver.Length, receiver.Length2)
+	return fmt.Sprintf("Name:%s,GreatHump:%s,LittleHump:%s,Comment:%s,SqlTypeName:%s,TypeName:%s,Length:%d,Length2:%d\n",
+		receiver.Name, receiver.GreatHump, receiver.LittleHump, receiver.Comment, receiver.SqlTypeName, receiver.TypeName, receiver.Length, receiver.Length2)
 }
 
 var MTables = make([]MTable, 0)
@@ -51,22 +51,22 @@ func InitMTableArray(engine *xorm.Engine) {
 	for _, meta := range metas {
 		var mTable MTable
 		mTable.Name = meta.Name
-		mTable.AaBbName, mTable.aaBbName = formatName(meta.Name)
+		mTable.GreatHump, mTable.LittleHump = formatName(meta.Name)
 		mTable.Comment = meta.Comment
 
 		var cols = meta.Columns()
 		for i := range cols {
 			var mColumn MColumn
 			mColumn.Name = cols[i].Name
-			mColumn.AaBbName, mColumn.aaBbName = formatName(cols[i].Name)
+			mColumn.GreatHump, mColumn.LittleHump = formatName(cols[i].Name)
 			mColumn.IsKey = cols[i].IsPrimaryKey
 
 			if cols[i].IsPrimaryKey && cols[i].IsAutoIncrement {
-				mTable.existId = true
+				mTable.ExistId = true
 			}
 			mColumn.Comment = cols[i].Comment
 			mColumn.SqlTypeName = cols[i].SQLType.Name
-			mColumn.TypeName = formatSqlType(mColumn.SqlTypeName)
+			mColumn.TypeName = FormatSqlType(mColumn.SqlTypeName)
 			mColumn.VueTypeName = formatSqlToVueType(mColumn.SqlTypeName)
 			mColumn.Length = cols[i].Length
 			mColumn.Length2 = cols[i].Length2
@@ -74,7 +74,6 @@ func InitMTableArray(engine *xorm.Engine) {
 
 		}
 		MTables = append(MTables, mTable)
-		fmt.Println(mTable)
 	}
 }
 

+ 72 - 69
util/MysqlCreateGo.go

@@ -11,11 +11,13 @@ import (
 const base_url = "D:\\project\\study\\kkc\\kkc-go\\"
 
 // 修改mysql数据库对应的go类型
-func formatSqlType(str string) string {
+func FormatSqlType(str string) string {
 	str = strings.ToLower(str)
 	switch str {
 	case "varchar":
 		return "string"
+	case "char":
+		return "string"
 	case "int":
 		return "int64"
 	case "decimal":
@@ -35,26 +37,26 @@ func formatSqlType(str string) string {
 func MysqlToStruct() {
 	var structString = "package domain\n\nimport (\n    \"fmt\"\n    \"time\"\n)\n\n"
 	for _, mtable := range MTables {
-		structString += fmt.Sprint("//", mtable.AaBbName, " ", mtable.Comment, "\n",
-			"type ", mtable.AaBbName, " struct {\n")
+		structString += fmt.Sprint("//", mtable.GreatHump, " ", mtable.Comment, "\n",
+			"type ", mtable.GreatHump, " struct {\n")
 
 		cols := mtable.MColumns
 		var toString = ""
 		for i := range cols {
-			if cols[i].aaBbName == "id" && cols[i].IsKey {
-				structString += fmt.Sprint("    ", cols[i].AaBbName, " int64 `json:\"", cols[i].aaBbName, "\"`",
+			if cols[i].LittleHump == "id" && cols[i].IsKey {
+				structString += fmt.Sprint("    ", cols[i].GreatHump, " int64 `json:\"", cols[i].LittleHump, "\"`",
 					"// ", cols[i].Length, " ", cols[i].Length2, " 注释:", cols[i].Comment, "\n")
-				toString += fmt.Sprint(cols[i].AaBbName, ":\", receiver.", cols[i].AaBbName, ", \",")
+				toString += fmt.Sprint(cols[i].GreatHump, ":\", receiver.", cols[i].GreatHump, ", \",")
 
 			} else {
-				structString += fmt.Sprint("    ", cols[i].AaBbName, " ", cols[i].TypeName, " `xorm:\"", cols[i].Name, "\"  json:\"", cols[i].aaBbName, "\"`",
+				structString += fmt.Sprint("    ", cols[i].GreatHump, " ", cols[i].TypeName, " `xorm:\"", cols[i].Name, "\"  json:\"", cols[i].LittleHump, "\"`",
 					"// ", cols[i].Length, " ", cols[i].Length2, " 注释:", cols[i].Comment, "\n")
-				toString += fmt.Sprint(cols[i].AaBbName, ":\", receiver.", cols[i].AaBbName, ", \",")
+				toString += fmt.Sprint(cols[i].GreatHump, ":\", receiver.", cols[i].GreatHump, ", \",")
 			}
 		}
 		structString += "}\n\n"
-		structString += fmt.Sprint("func (receiver ", mtable.AaBbName, ") String() string {\n")
-		structString += fmt.Sprint("    return fmt.Sprint(\"", mtable.AaBbName, "{", toString[0:len(toString)-1], "}\")\n}\n\n")
+		structString += fmt.Sprint("func (receiver ", mtable.GreatHump, ") String() string {\n")
+		structString += fmt.Sprint("    return fmt.Sprint(\"", mtable.GreatHump, "{", toString[0:len(toString)-1], "}\")\n}\n\n")
 		fmt.Println(structString)
 	}
 	fileUrl := base_url + "\\data\\domain\\DoMain.go"
@@ -78,11 +80,11 @@ func MysqlToDao() {
 	tables := MTables
 	for _, table := range tables {
 		var dao = ""
-		fileName := table.AaBbName + "Dao.go"
+		fileName := table.GreatHump + "Dao.go"
 		dao += "package manage\n\nimport (\n\t\"demo/configs\"\n\t\"demo/data/domain\"\n\t\"demo/data/domain/vo\"\n)\n"
 		//get
 		if table.Name == "role_authority" {
-			fmt.Println(table.existId, "====================>")
+			fmt.Println(table.ExistId, "====================>")
 		}
 		var idColumn MColumn
 		for _, column := range table.MColumns {
@@ -92,34 +94,34 @@ func MysqlToDao() {
 			}
 		}
 		//没有id的不适用
-		if table.existId {
-			dao += "func Get" + table.AaBbName + "ById(id int64) (domain." + table.AaBbName + ", error) {" +
-				"\n\tvar " + table.aaBbName + " domain." + table.AaBbName + "" +
-				"\n\t_, err := configs.Engine.Where(\"id = ?\", id).Get(&" + table.aaBbName + ")" +
+		if table.ExistId {
+			dao += "func Get" + table.GreatHump + "ById(id int64) (domain." + table.GreatHump + ", error) {" +
+				"\n\tvar " + table.LittleHump + " domain." + table.GreatHump + "" +
+				"\n\t_, err := configs.Engine.Where(\"id = ?\", id).Get(&" + table.LittleHump + ")" +
 				"\n\tif err != nil {" +
-				"\n\t\treturn " + table.aaBbName + ", err" +
+				"\n\t\treturn " + table.LittleHump + ", err" +
 				"\n\t}" +
-				"\n\treturn " + table.aaBbName + ", nil" +
+				"\n\treturn " + table.LittleHump + ", nil" +
 				"\n}\n\n"
 		}
-		dao += "func Get" + table.AaBbName + "ListInId(ids []int64) ([]domain." + table.AaBbName + ", error) {" +
-			"\n\trows, err := configs.Engine.In(\"id\", ids).Rows(&domain." + table.AaBbName + "{})" +
+		dao += "func Get" + table.GreatHump + "ListInId(ids []int64) ([]domain." + table.GreatHump + ", error) {" +
+			"\n\trows, err := configs.Engine.In(\"id\", ids).Rows(&domain." + table.GreatHump + "{})" +
 			"\n\tif err != nil {" +
-			"\n\t\treturn make([]domain." + table.AaBbName + ", 0), err" +
+			"\n\t\treturn make([]domain." + table.GreatHump + ", 0), err" +
 			"\n\t}" +
 			"\n\tdefer rows.Close()" +
-			"\n\tvar list []domain." + table.AaBbName + "" +
+			"\n\tvar list []domain." + table.GreatHump + "" +
 			"\n\tfor rows.Next() {" +
-			"\n\t\tvar u domain." + table.AaBbName + "" +
+			"\n\t\tvar u domain." + table.GreatHump + "" +
 			"\n\t\tlist = append(list, u)" +
 			"\n\t}" +
 			"\n\treturn list, nil" +
 			"\n}\n\n"
 
 		//list
-		dao += "func Get" + table.AaBbName + "List(" + table.aaBbName + " domain." + table.AaBbName + ", pageNum, pageSize int) (vo.BaseListVo, error) {" +
-			"\n\tvar arr []domain." + table.AaBbName +
-			"\n\tCount, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc(\"id\").FindAndCount(&arr, &" + table.aaBbName + ")" +
+		dao += "func Get" + table.GreatHump + "List(" + table.LittleHump + " domain." + table.GreatHump + ", pageNum, pageSize int) (vo.BaseListVo, error) {" +
+			"\n\tvar arr []domain." + table.GreatHump +
+			"\n\tCount, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc(\"id\").FindAndCount(&arr, &" + table.LittleHump + ")" +
 			"\n\tvar vo vo.BaseListVo" +
 			"\n\tif err != nil {" +
 			"\n\t\treturn vo, err" +
@@ -137,25 +139,25 @@ func MysqlToDao() {
 			"\n\treturn vo, nil" +
 			"\n}\n\n"
 
-		dao += "func Save" + table.AaBbName + "(" + table.aaBbName + " *domain." + table.AaBbName + ") (domain." + table.AaBbName + ", error) {" +
-			"\n\t_, err := configs.Engine.Insert(&" + table.aaBbName + ")" +
+		dao += "func Save" + table.GreatHump + "(" + table.LittleHump + " *domain." + table.GreatHump + ") (domain." + table.GreatHump + ", error) {" +
+			"\n\t_, err := configs.Engine.Insert(&" + table.LittleHump + ")" +
 			"\n\tif err != nil {" +
-			"\n\t\treturn *" + table.aaBbName + ", err" +
+			"\n\t\treturn *" + table.LittleHump + ", err" +
 			"\n\t}" +
-			"\n\treturn *" + table.aaBbName + ", nil" +
+			"\n\treturn *" + table.LittleHump + ", nil" +
 			"\n}\n\n"
-		dao += "func Set" + table.AaBbName + "(" + table.aaBbName + "Map map[string]interface{}, id int64) (domain." + table.AaBbName + ", bool, error) {" +
-			"\n\tvar " + table.aaBbName + " domain." + table.AaBbName + "" +
-			"\n\t_, err := configs.Engine.Table(\"" + table.Name + "\").Where(\"" + idColumn.Name + " = ?\", id).Update(" + table.aaBbName + "Map)" +
+		dao += "func Set" + table.GreatHump + "(" + table.LittleHump + "Map map[string]interface{}, id int64) (domain." + table.GreatHump + ", bool, error) {" +
+			"\n\tvar " + table.LittleHump + " domain." + table.GreatHump + "" +
+			"\n\t_, err := configs.Engine.Table(\"" + table.Name + "\").Where(\"" + idColumn.Name + " = ?\", id).Update(" + table.LittleHump + "Map)" +
 			"\n\tif err != nil {" +
-			"\n\t\treturn " + table.aaBbName + ", false, err" +
+			"\n\t\treturn " + table.LittleHump + ", false, err" +
 			"\n\t}" +
-			"\n\treturn " + table.aaBbName + ", true, nil" +
+			"\n\treturn " + table.LittleHump + ", true, nil" +
 			"\n}\n\n"
-		if table.existId {
-			dao += "func Delete" + table.AaBbName + "(id int64) bool {" +
-				"\n\tvar " + table.aaBbName + " domain." + table.AaBbName +
-				"\n\ti, err := configs.Engine.Where(\"id = ?\", id).Delete(&" + table.aaBbName + ")" +
+		if table.ExistId {
+			dao += "func Delete" + table.GreatHump + "(id int64) bool {" +
+				"\n\tvar " + table.LittleHump + " domain." + table.GreatHump +
+				"\n\ti, err := configs.Engine.Where(\"id = ?\", id).Delete(&" + table.LittleHump + ")" +
 				"\n\tif err != nil {" +
 				"\n\t\treturn false" +
 				"\n\t}" +
@@ -187,80 +189,81 @@ func MysqlToBaseCRUDRouter() {
 	var getRouterFunc = ""
 	for i := range tables {
 		table := tables[i]
-		getRouterFunc += "//Base" + table.AaBbName + "Router(group)\n"
+		getRouterFunc += "//Base" + table.GreatHump + "Router(group)\n"
 		routerHeader +=
-			"\nfunc Base" + table.AaBbName + "Router(group *gin.RouterGroup) {" +
-				"\n\tBase" + table.AaBbName + "Group := group.Group(\"/back/base\")" +
-				"\n\tPushRouter(Base" + table.AaBbName + "Group, \"GET\", \"/" + table.aaBbName + "\", GetBase" + table.AaBbName + "ById)" +
-				"\n\tPushRouter(Base" + table.AaBbName + "Group, \"POST\", \"/" + table.aaBbName + "/list\", GetBase" + table.AaBbName + "List)" +
-				"\n\tPushRouter(Base" + table.AaBbName + "Group, \"POST\", \"/" + table.aaBbName + "/in\", GetBase" + table.AaBbName + "ListInId)" +
-				"\n\tPushRouter(Base" + table.AaBbName + "Group, \"POST\", \"/" + table.aaBbName + "\", SaveBase" + table.AaBbName + ")" +
-				"\n\tPushRouter(Base" + table.AaBbName + "Group, \"PUT\", \"/" + table.aaBbName + "\", UpdateBase" + table.AaBbName + ")" +
-				"\n\tPushRouter(Base" + table.AaBbName + "Group, \"DELETE\", \"/" + table.aaBbName + "\", DeleteBase" + table.AaBbName + ")" +
+			"\nfunc Base" + table.GreatHump + "Router(group *gin.RouterGroup) {" +
+				"\n\tBase" + table.GreatHump + "Group := group.Group(\"/back/base\")" +
+				"\n\tPushRouter(Base" + table.GreatHump + "Group, \"GET\", \"/" + table.LittleHump + "\", GetBase" + table.GreatHump + "ById)" +
+				"\n\tPushRouter(Base" + table.GreatHump + "Group, \"POST\", \"/" + table.LittleHump + "/list\", GetBase" + table.GreatHump + "List)" +
+				"\n\tPushRouter(Base" + table.GreatHump + "Group, \"POST\", \"/" + table.LittleHump + "/in\", GetBase" + table.GreatHump + "ListInId)" +
+				"\n\tPushRouter(Base" + table.GreatHump + "Group, \"POST\", \"/" + table.LittleHump + "\", SaveBase" + table.GreatHump + ")" +
+				"\n\tPushRouter(Base" + table.GreatHump + "Group, \"PUT\", \"/" + table.LittleHump + "\", UpdateBase" + table.GreatHump + ")" +
+				"\n\tPushRouter(Base" + table.GreatHump + "Group, \"DELETE\", \"/" + table.LittleHump + "\", DeleteBase" + table.GreatHump + ")" +
 				"\n}\n"
 		routerBody +=
-			"\nfunc GetBase" + table.AaBbName + "ById(c *gin.Context) {" +
+			"\nfunc GetBase" + table.GreatHump + "ById(c *gin.Context) {" +
 				"\n\tid := c.Param(\"id\")" +
-				"\n\t" + table.aaBbName + ", err := manage.Get" + table.AaBbName + "ById(cast.ToInt64(id))" +
+				"\n\t" + table.LittleHump + ", err := manage.Get" + table.GreatHump + "ById(cast.ToInt64(id))" +
 				"\n\tif err != nil {" +
 				"\n\t\tc.JSON(200, CreateResultError(500, \"用户查询不存在\"))" +
 				"\n\t}" +
-				"\n\tc.JSON(200, CreateResultData(" + table.aaBbName + "))" +
+				"\n\tc.JSON(200, CreateResultData(" + table.LittleHump + "))" +
 				"\n}" +
 				"\n" +
-				"\nfunc GetBase" + table.AaBbName + "List(c *gin.Context) {" +
+				"\nfunc GetBase" + table.GreatHump + "List(c *gin.Context) {" +
 				"\n\tdata := share.GetJsonAnyParam(c)" +
 				"\n\tparam, _ := data(\"param\")" +
 				"\n\tpageNum, _ := data(\"pageNum\")" +
 				"\n\tpageSize, _ := data(\"pageSize\")" +
-				"\n\t" + table.aaBbName + " := domain." + table.AaBbName + "{}" +
-				"\n\terr := json.Unmarshal([]byte(cast.ToString(param)), &" + table.aaBbName + ")" +
-				"\n\tlist, err := manage.Get" + table.AaBbName + "List(" + table.aaBbName + ", cast.ToInt(pageNum), cast.ToInt(pageSize))" +
+				"\n\t" + table.LittleHump + " := domain." + table.GreatHump + "{}" +
+				//"\n\terr := json.Unmarshal([]byte(cast.ToString(param)), &" + table.LittleHump + ")" +
+				"\n\terr := mapstructure.Decode(param, &" + table.LittleHump + ")\n\tif err != nil {\n\t\tc.JSON(200, CreateResultError(500, \"json转换错误\"))\n\t}" +
+				"\n\tlist, err := manage.Get" + table.GreatHump + "List(" + table.LittleHump + ", cast.ToInt(pageNum), cast.ToInt(pageSize))" +
 				"\n\tif err != nil {" +
 				"\n\t\tc.JSON(200, CreateResultError(500, \"查询错误\"))" +
 				"\n\t}" +
 				"\n\tc.JSON(200, CreateResultData(list))" +
 				"\n}" +
 				"\n" +
-				"\nfunc GetBase" + table.AaBbName + "ListInId(c *gin.Context) {" +
+				"\nfunc GetBase" + table.GreatHump + "ListInId(c *gin.Context) {" +
 				"\n\tdata := share.GetJsonAnyParam(c)" +
 				"\n\tidsString, _ := data(\"ids\")" +
 				"\n\tvar ids []int64" +
 				"\n\terr := json.Unmarshal([]byte(cast.ToString(idsString)), &ids)" +
-				"\n\tlist, err := manage.Get" + table.AaBbName + "ListInId(ids)" +
+				"\n\tlist, err := manage.Get" + table.GreatHump + "ListInId(ids)" +
 				"\n\tif err != nil {" +
 				"\n\t\tc.JSON(200, CreateResultError(500, \"查询错误\"))" +
 				"\n\t}" +
 				"\n\tc.JSON(200, CreateResultData(list))" +
 				"\n}" +
 				"\n" +
-				"\nfunc SaveBase" + table.AaBbName + "(c *gin.Context) {" +
+				"\nfunc SaveBase" + table.GreatHump + "(c *gin.Context) {" +
 				"\n\tdata := share.GetJsonAnyParam(c)" +
-				"\n\t" + table.aaBbName + "Param, _ := data(\"" + table.aaBbName + "\")" +
-				"\n\t" + table.aaBbName + " := domain." + table.AaBbName + "{}" +
-				"\n\terr := json.Unmarshal([]byte(cast.ToString(" + table.aaBbName + "Param)), &" + table.aaBbName + ")" +
-				"\n\tsave" + table.AaBbName + ", err := manage.Save" + table.AaBbName + "(&" + table.aaBbName + ")" +
+				"\n\t" + table.LittleHump + "Param, _ := data(\"" + table.LittleHump + "\")" +
+				"\n\t" + table.LittleHump + " := domain." + table.GreatHump + "{}" +
+				"\n\terr := json.Unmarshal([]byte(cast.ToString(" + table.LittleHump + "Param)), &" + table.LittleHump + ")" +
+				"\n\tsave" + table.GreatHump + ", err := manage.Save" + table.GreatHump + "(&" + table.LittleHump + ")" +
 				"\n\tif err != nil {" +
 				"\n\t\tc.JSON(200, CreateResultError(500, \"保存错误\"))" +
 				"\n\t}" +
-				"\n\tc.JSON(200, CreateResultData(save" + table.AaBbName + "))" +
+				"\n\tc.JSON(200, CreateResultData(save" + table.GreatHump + "))" +
 				"\n}" +
 				"\n" +
-				"\nfunc UpdateBase" + table.AaBbName + "(c *gin.Context) {" +
+				"\nfunc UpdateBase" + table.GreatHump + "(c *gin.Context) {" +
 				"\n\tdata := share.GetJsonAnyParam(c)" +
-				"\n\t" + table.aaBbName + ", _ := data(\"" + table.aaBbName + "\")" +
+				"\n\t" + table.LittleHump + ", _ := data(\"" + table.LittleHump + "\")" +
 				"\n\tid, _ := data(\"id\")" +
 				"\n" +
-				"\n\tset" + table.AaBbName + ", b, err := manage.Set" + table.AaBbName + "(cast.ToStringMap(" + table.aaBbName + "), cast.ToInt64(id))" +
+				"\n\tset" + table.GreatHump + ", b, err := manage.Set" + table.GreatHump + "(cast.ToStringMap(" + table.LittleHump + "), cast.ToInt64(id))" +
 				"\n\tif err != nil || !b {" +
 				"\n\t\tc.JSON(200, CreateResultError(500, \"修改错误\"))" +
 				"\n\t}" +
-				"\n\tc.JSON(200, CreateResultData(set" + table.AaBbName + "))" +
+				"\n\tc.JSON(200, CreateResultData(set" + table.GreatHump + "))" +
 				"\n}" +
 				"\n" +
-				"\nfunc DeleteBase" + table.AaBbName + "(c *gin.Context) {" +
+				"\nfunc DeleteBase" + table.GreatHump + "(c *gin.Context) {" +
 				"\n\tid := c.Param(\"id\")" +
-				"\n\tres := manage.Delete" + table.AaBbName + "(cast.ToInt64(id))" +
+				"\n\tres := manage.Delete" + table.GreatHump + "(cast.ToInt64(id))" +
 				"\n\tif !res {" +
 				"\n\t\tc.JSON(200, CreateResultError(500, \"删除错误\"))" +
 				"\n\t}" +

+ 31 - 17
util/MysqlCreateVue.go

@@ -8,6 +8,8 @@ func formatSqlToVueType(str string) string {
 	switch str {
 	case "varchar":
 		return "string"
+	case "char":
+		return "string"
 	case "int":
 		return "number"
 	case "decimal":
@@ -29,47 +31,59 @@ func MysqlToVueApi() {
 	for i := range MTables {
 		table := MTables[i]
 		//添加名字
-		objectList += "export class " + table.AaBbName + "{"
+		objectList += "export class " + table.GreatHump + "{"
+		ct := "\n\tstatic Create(){\n        return new " + table.GreatHump + "("
 		for j := range table.MColumns {
 			column := table.MColumns[j]
-			objectList += "\n\t" + column.aaBbName + ": " + column.VueTypeName
+			objectList += "\n\t" + column.LittleHump + ": " + column.VueTypeName
+			ct += "null,"
+			//switch column.VueTypeName {
+			//case "number":
+			//	ct += "0,"
+			//	break
+			//case "string":
+			//	ct += "\"\","
+			//}
 		}
+		objectList += ct + ");\n    }"
+
 		objectList += "\n\n\tconstructor("
 		for j := range table.MColumns {
 			column := table.MColumns[j]
-			objectList += column.aaBbName + ": " + column.VueTypeName + ", "
+			objectList += column.LittleHump + ": " + column.VueTypeName + ", "
 		}
 		objectList += ") {"
 		for j := range table.MColumns {
 			column := table.MColumns[j]
-			objectList += "\n\t\tthis." + column.aaBbName + " = " + column.aaBbName + ";"
+			objectList += "\n\t\tthis." + column.LittleHump + " = " + column.LittleHump + ";"
 		}
 		objectList += "\n\t}\n}\n\n"
 		//生成api
-		apiList += "export function GetBase" + table.AaBbName + "ById(id: number | string) {" +
-			"\n    return api.GetDataByPath(\"/back/base/" + table.aaBbName + "?id=\" + id, {}, true) as Promise<ResponseData<" + table.AaBbName + ">>;" +
+		apiList += "export function GetBase" + table.GreatHump + "ById(id: number | string) {" +
+			"\n    return api.GetDataByPath(\"/back/base/" + table.LittleHump + "?id=\" + id, {}, true) as Promise<ResponseData<" + table.GreatHump + ">>;" +
 			"\n}" +
 			"\n" +
-			"\nexport function GetBase" + table.AaBbName + "ListBy" + table.AaBbName + "(" + table.AaBbName + ": " + table.AaBbName + ") {" +
-			"\n    return api.PostDataByPath(\"/back/base/" + table.aaBbName + "/list\", {" + table.aaBbName + ": " + table.AaBbName + "}, true) as Promise<ResponseData<BaseListVo<" + table.AaBbName + ">[]>>;" +
+			//"\nexport function GetBase" + table.GreatHump + "ListBy" + table.GreatHump + "(" + table.GreatHump + ": " + table.GreatHump + ", pageNum = 1, pageSize = 10) {" +
+			"\nexport function GetBase" + table.GreatHump + "ListBy" + table.GreatHump + "(param: " + table.GreatHump + ", pageNum = 1, pageSize = 10) {" +
+			"\n    return api.PostDataByPath(\"/back/base/" + table.LittleHump + "/list\", {param: param,pageNum: pageNum,pageSize: pageSize}, true) as Promise<ResponseData<BaseListVo<" + table.GreatHump + ">[]>>;" +
 			"\n}" +
 			"\n" +
-			"\nexport function GetBase" + table.AaBbName + "ListByIds(ids: number[] | string[]) {" +
-			"\n    return api.PostDataByPath(\"/back/base/" + table.aaBbName + "/in\", {" +
+			"\nexport function GetBase" + table.GreatHump + "ListByIds(ids: number[] | string[]) {" +
+			"\n    return api.PostDataByPath(\"/back/base/" + table.LittleHump + "/in\", {" +
 			"\n        ids: ids" +
-			"\n    }, true) as Promise<ResponseData<" + table.AaBbName + "[]>>;" +
+			"\n    }, true) as Promise<ResponseData<" + table.GreatHump + "[]>>;" +
 			"\n}" +
 			"\n" +
-			"\nexport function SaveBase" + table.AaBbName + "(" + table.AaBbName + ": " + table.AaBbName + ") {" +
-			"\n    return api.PostDataByPath(\"/back/base/" + table.aaBbName + "\", {article: " + table.AaBbName + "}, true) as Promise<ResponseData<" + table.AaBbName + ">>;" +
+			"\nexport function SaveBase" + table.GreatHump + "(" + table.GreatHump + ": " + table.GreatHump + ") {" +
+			"\n    return api.PostDataByPath(\"/back/base/" + table.LittleHump + "\", {article: " + table.GreatHump + "}, true) as Promise<ResponseData<" + table.GreatHump + ">>;" +
 			"\n}" +
 			"\n" +
-			"\nexport function UpdateBase" + table.AaBbName + "(" + table.AaBbName + ": " + table.AaBbName + ", id: number | string) {" +
-			"\n    return api.GetDataByPath(\"/back/base/" + table.aaBbName + "\", {" + table.aaBbName + ": " + table.AaBbName + ", id: id}, true) as Promise<ResponseData<" + table.AaBbName + ">>;" +
+			"\nexport function UpdateBase" + table.GreatHump + "(" + table.GreatHump + ": " + table.GreatHump + ", id: number | string) {" +
+			"\n    return api.GetDataByPath(\"/back/base/" + table.LittleHump + "\", {" + table.LittleHump + ": " + table.GreatHump + ", id: id}, true) as Promise<ResponseData<" + table.GreatHump + ">>;" +
 			"\n}" +
 			"\n" +
-			"\nexport function DeleteBase" + table.AaBbName + "ById(id: number | string) {" +
-			"\n    return api.GetDataByPath(\"/back/base/" + table.aaBbName + "?id=\" + id, {}, true) as Promise<ResponseData<any>>;" +
+			"\nexport function DeleteBase" + table.GreatHump + "ById(id: number | string) {" +
+			"\n    return api.GetDataByPath(\"/back/base/" + table.LittleHump + "?id=\" + id, {}, true) as Promise<ResponseData<any>>;" +
 			"\n}\n\n"
 	}