代码生成

2026-04-23 02:48:34 +08:00 · 2022-01-03 19:03:39 +08:00
parent 1a1f137725
commit b6a8fe5e1b
53 changed files with 2467 additions and 459 deletions
--- a/apps/develop/services/gen_table.go
+++ b/apps/develop/services/gen_table.go
@@ -6,6 +6,7 @@ import (
 	"pandax/base/biz"
 	"pandax/base/config"
 	"pandax/base/global"
+	"pandax/base/utils"
 	"strings"
 )

@@ -17,16 +18,16 @@ import (

 type (
 	SysGenTableModel interface {
-		FindDbTablesListPage(page, pageSize int, data entity.DevGenTable) (*[]entity.DevGenTable, int64)
-		FindDbTableOne(tableName string) *entity.DevGenTable
+		FindDbTablesListPage(page, pageSize int, data entity.DBTables) (*[]entity.DBTables, int64)
+		FindDbTableOne(tableName string) *entity.DBTables

 		// 导入表数据
 		Insert(data entity.DevGenTable)
-		FindOne(dictCode int64) *entity.DevGenTable
-		FindTree(data entity.DevGenTable) *[]entity.ToolsGenTableExtend
+		FindOne(data entity.DevGenTable, exclude bool) *entity.DevGenTable
+		FindTree(data entity.DevGenTable) *[]entity.DevGenTable
 		FindListPage(page, pageSize int, data entity.DevGenTable) (*[]entity.DevGenTable, int64)
 		Update(data entity.DevGenTable) *entity.DevGenTable
-		Delete(dictCode []int64)
+		Delete(tableIds []int64)
 	}

 	devGenTableModelImpl struct {
@@ -38,36 +39,52 @@ var DevGenTableModelDao SysGenTableModel = &devGenTableModelImpl{
 	table: "dev_gen_tables",
 }

-func (m *devGenTableModelImpl) FindDbTablesListPage(page, pageSize int, data entity.DevGenTable) (*[]entity.DevGenTable, int64) {
-	list := make([]entity.DevGenTable, 0)
+func (m *devGenTableModelImpl) FindDbTablesListPage(page, pageSize int, data entity.DBTables) (*[]entity.DBTables, int64) {
+	list := make([]entity.DBTables, 0)
+	pgdata := make([]map[string]interface{}, 0)
 	var total int64 = 0
 	offset := pageSize * (page - 1)
-	if config.Conf.Server.DbType != "mysql" && config.Conf.Server.DbType == "postgresql" {
+	if config.Conf.Server.DbType != "mysql" && config.Conf.Server.DbType != "postgresql" {
 		biz.ErrIsNil(errors.New("只支持mysql和postgresql数据库"), "只支持mysql和postgresql数据库")
 	}
+
 	db := global.Db.Table("information_schema.tables")
-	db = db.Where("TABLE_NAME not in (select table_name from `" + config.Conf.Gen.Dbname + "`.sys_tables) ")
-	db = db.Where("table_schema= ? ", config.Conf.Gen.Dbname)
-
-	if data.TableName != "" {
-		db = db.Where("table_name = ?", data.TableName)
+	if config.Conf.Server.DbType == "mysql" {
+		db = db.Where("table_schema= ? ", config.Conf.Gen.Dbname)
+	}
+	if config.Conf.Server.DbType == "postgresql" {
+		db = db.Where("table_schema = ? ", "public")
+	}
+	db = db.Where("table_name NOT LIKE 'dev_%'")
+	if data.TableName != "" {
+		db = db.Where("table_name like ?", "%"+data.TableName+"%")
+	}
+	if config.Conf.Server.DbType == "mysql" {
+		err := db.Limit(pageSize).Offset(offset).Find(&list).Offset(-1).Limit(-1).Count(&total).Error
+		biz.ErrIsNil(err, "查询配置分页列表信息失败")
+		return &list, total
+	} else {
+		err := db.Limit(pageSize).Offset(offset).Find(&pgdata).Offset(-1).Limit(-1).Count(&total).Error
+		biz.ErrIsNil(err, "查询配置分页列表信息失败")
+		for _, pd := range pgdata {
+			list = append(list, entity.DBTables{TableName: utils.B2S(pd["table_name"].([]uint8))})
+		}
+		return &list, total
 	}
-
-	err := db.Count(&total).Error
-	err = db.Limit(pageSize).Offset(offset).Find(&list).Error
-	biz.ErrIsNil(err, "查询配置分页列表信息失败")
-	return &list, total
 }

-func (m *devGenTableModelImpl) FindDbTableOne(tableName string) *entity.DevGenTable {
-	resData := new(entity.DevGenTable)
+func (m *devGenTableModelImpl) FindDbTableOne(tableName string) *entity.DBTables {
+	resData := new(entity.DBTables)
 	if config.Conf.Server.DbType != "mysql" && config.Conf.Server.DbType == "postgresql" {
 		biz.ErrIsNil(errors.New("只支持mysql和postgresql数据库"), "只支持mysql和postgresql数据库")
 	}
 	db := global.Db.Table("information_schema.tables")
-	db = db.Where("table_schema= ? ", config.Conf.Gen.Dbname)
-	biz.IsTrue(tableName != "", "table name cannot be empty！")
-
+	if config.Conf.Server.DbType != "mysql" {
+		db = db.Where("table_schema= ? ", config.Conf.Gen.Dbname)
+	}
+	if config.Conf.Server.DbType != "postgresql" {
+		db = db.Where("table_schema= ? ", "public")
+	}
 	db = db.Where("table_name = ?", tableName)
 	err := db.First(&resData).Error
 	biz.ErrIsNil(err, err.Error())
@@ -79,19 +96,31 @@ func (m *devGenTableModelImpl) Insert(dgt entity.DevGenTable) {
 	biz.ErrIsNil(err, "新增生成代码表失败")
 	for i := 0; i < len(dgt.Columns); i++ {
 		dgt.Columns[i].TableId = dgt.TableId
-		SysSysConfigModelDao.Insert(dgt.Columns[i])
+		DevTableColumnModelDao.Insert(dgt.Columns[i])
 	}
 }

-func (m *devGenTableModelImpl) FindOne(tableId int64) *entity.DevGenTable {
+func (m *devGenTableModelImpl) FindOne(data entity.DevGenTable, exclude bool) *entity.DevGenTable {
 	resData := new(entity.DevGenTable)
-	err := global.Db.Table(m.table).Where("`table_id` = ?", tableId).First(resData).Error
+	db := global.Db.Table(m.table)
+	if data.TableName != "" {
+		db = db.Where("table_name = ?", data.TableName)
+	}
+	if data.TableId != 0 {
+		db = db.Where("table_id = ?", data.TableId)
+	}
+	if data.TableComment != "" {
+		db = db.Where("table_comment = ?", data.TableComment)
+	}
+	err := db.First(resData).Error
 	biz.ErrIsNil(err, "查询配置信息失败")
+	list := DevTableColumnModelDao.FindList(entity.DevGenTableColumn{TableId: resData.TableId}, exclude)
+	resData.Columns = *list
 	return resData
 }

-func (m *devGenTableModelImpl) FindTree(data entity.DevGenTable) *[]entity.ToolsGenTableExtend {
-	resData := make([]entity.ToolsGenTableExtend, 0)
+func (m *devGenTableModelImpl) FindTree(data entity.DevGenTable) *[]entity.DevGenTable {
+	resData := make([]entity.DevGenTable, 0)
 	db := global.Db.Table(m.table)

 	if data.TableName != "" {
@@ -108,7 +137,7 @@ func (m *devGenTableModelImpl) FindTree(data entity.DevGenTable) *[]entity.Tools
 	for i := 0; i < len(resData); i++ {
 		var col entity.DevGenTableColumn
 		col.TableId = resData[i].TableId
-		columns := SysSysConfigModelDao.FindList(col)
+		columns := DevTableColumnModelDao.FindList(col, false)
 		resData[i].Columns = *columns
 	}
 	return &resData
@@ -173,7 +202,7 @@ func (m *devGenTableModelImpl) Update(data entity.DevGenTable) *entity.DevGenTab
 				}
 			}
 		}
-		SysSysConfigModelDao.Update(data.Columns[i])
+		DevTableColumnModelDao.Update(data.Columns[i])
 	}
 	return &data
 }
@@ -200,7 +229,7 @@ func (e *devGenTableModelImpl) DeleteTables(tableId int64) bool {
 }

 func (m *devGenTableModelImpl) Delete(configIds []int64) {
-	err := global.Db.Table(m.table).Delete(&entity.DevGenTable{}, "`table_id` in (?)", configIds).Error
+	err := global.Db.Table(m.table).Delete(&entity.DevGenTable{}, "table_id in (?)", configIds).Error
 	biz.ErrIsNil(err, "删除生成代码信息失败")
 	return
 }
--- a/apps/develop/services/gen_table_column.go
+++ b/apps/develop/services/gen_table_column.go
@@ -16,37 +16,25 @@ import (

 type (
 	SysGenTableColumnModel interface {
-		FindDbTablesColumnListPage(page, pageSize int, data entity.DevGenTableColumn) (*[]entity.DevGenTableColumn, int64)
-		FindDbTableColumnList(tableName string) *[]entity.DevGenTableColumn
+		FindDbTablesColumnListPage(page, pageSize int, data entity.DBColumns) (*[]entity.DBColumns, int64)
+		FindDbTableColumnList(tableName string) *[]entity.DBColumns

 		Insert(data entity.DevGenTableColumn) *entity.DevGenTableColumn
-		FindList(data entity.DevGenTableColumn) *[]entity.DevGenTableColumn
+		FindList(data entity.DevGenTableColumn, exclude bool) *[]entity.DevGenTableColumn
 		Update(data entity.DevGenTableColumn) *entity.DevGenTableColumn
 	}

 	devTableColumnModelImpl struct {
-		table              string
-		ColumnTypeStr      []string //数据库字符串类型
-		ColumnTypeTime     []string //数据库时间类型
-		ColumnTypeNumber   []string //数据库数字类型
-		ColumnNameNotEdit  []string //页面不需要编辑字段
-		ColumnNameNotList  []string //页面不需要显示的列表字段
-		ColumnNameNotQuery []string //页面不需要查询字段
+		table string
 	}
 )

-var SysSysConfigModelDao SysGenTableColumnModel = &devTableColumnModelImpl{
-	table:              "dev_gen_table_columns",
-	ColumnTypeStr:      []string{"char", "varchar", "narchar", "varchar2", "tinytext", "text", "mediumtext", "longtext"},
-	ColumnTypeTime:     []string{"datetime", "time", "date", "timestamp"},
-	ColumnTypeNumber:   []string{"tinyint", "smallint", "mediumint", "int", "number", "integer", "bigint", "float", "float", "double", "decimal"},
-	ColumnNameNotEdit:  []string{"id", "created_by", "created_at", "updated_by", "updated_at", "deleted_at"},
-	ColumnNameNotList:  []string{"id", "created_by", "updated_by", "created_at", "updated_at", "deleted_at"},
-	ColumnNameNotQuery: []string{"id", "created_by", "updated_by", "created_at", "updated_at", "deleted_at", "remark"},
+var DevTableColumnModelDao SysGenTableColumnModel = &devTableColumnModelImpl{
+	table: "dev_gen_table_columns",
 }

-func (m *devTableColumnModelImpl) FindDbTablesColumnListPage(page, pageSize int, data entity.DevGenTableColumn) (*[]entity.DevGenTableColumn, int64) {
-	list := make([]entity.DevGenTableColumn, 0)
+func (m *devTableColumnModelImpl) FindDbTablesColumnListPage(page, pageSize int, data entity.DBColumns) (*[]entity.DBColumns, int64) {
+	list := make([]entity.DBColumns, 0)
 	var total int64 = 0
 	offset := pageSize * (page - 1)
 	if config.Conf.Server.DbType != "mysql" && config.Conf.Server.DbType == "postgresql" {
@@ -66,8 +54,8 @@ func (m *devTableColumnModelImpl) FindDbTablesColumnListPage(page, pageSize int,
 	return &list, total
 }

-func (m *devTableColumnModelImpl) FindDbTableColumnList(tableName string) *[]entity.DevGenTableColumn {
-	resData := make([]entity.DevGenTableColumn, 0)
+func (m *devTableColumnModelImpl) FindDbTableColumnList(tableName string) *[]entity.DBColumns {
+	resData := make([]entity.DBColumns, 0)
 	if config.Conf.Server.DbType != "mysql" && config.Conf.Server.DbType == "postgresql" {
 		biz.ErrIsNil(errors.New("只支持mysql和postgresql数据库"), "只支持mysql和postgresql数据库")
 	}
@@ -87,10 +75,20 @@ func (m *devTableColumnModelImpl) Insert(dgt entity.DevGenTableColumn) *entity.D
 	return &dgt
 }

-func (m *devTableColumnModelImpl) FindList(data entity.DevGenTableColumn) *[]entity.DevGenTableColumn {
+func (m *devTableColumnModelImpl) FindList(data entity.DevGenTableColumn, exclude bool) *[]entity.DevGenTableColumn {
 	list := make([]entity.DevGenTableColumn, 0)
-	err := global.Db.Table(m.table).Where("table_id = ?", data.TableId).Find(&list).Error
-
+	db := global.Db.Table(m.table).Where("table_id = ?", data.TableId)
+	if exclude {
+		notIn := make([]string, 6)
+		notIn = append(notIn, "id")
+		notIn = append(notIn, "create_by")
+		notIn = append(notIn, "update_by")
+		notIn = append(notIn, "created_at")
+		notIn = append(notIn, "updated_at")
+		notIn = append(notIn, "deleted_at")
+		db = db.Where(" column_name not in(?)", notIn)
+	}
+	err := db.Find(&list).Error
 	biz.ErrIsNil(err, "查询生成代码字段表信息失败")
 	return &list
 }