From 0cec342facbecfd2fa10488e01eefba6359c2934 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Wed, 22 Apr 2020 22:16:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=A8=A1=E5=9E=8B=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/tools/systables.go | 13 ++++++------- models/tools/systables.go | 32 ++++++++++++++++++++++---------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/apis/tools/systables.go b/apis/tools/systables.go index 5c8b7c9..5c88a92 100644 --- a/apis/tools/systables.go +++ b/apis/tools/systables.go @@ -31,7 +31,7 @@ func GetSysTableList(c *gin.Context) { pageIndex = tools2.StrToInt(err, index) } - data.TableName = c.Request.FormValue("tableName") + data.TBName = c.Request.FormValue("tableName") result, count, err := data.GetPage(pageSize, pageIndex) tools2.HasError(err, "", -1) @@ -83,13 +83,13 @@ func InsertSysTable(c *gin.Context) { var data tools.SysTables var dbTable tools.DBTables var dbColumn tools.DBColumns - data.TableName = c.Request.FormValue("tables") + data.TBName = c.Request.FormValue("tables") data.CreateBy = tools2.GetUserIdStr(c) - dbTable.TableName = data.TableName + dbTable.TableName = data.TBName dbtable, err := dbTable.Get() - dbColumn.TableName = data.TableName + dbColumn.TableName = data.TBName tablenamelist := strings.Split(dbColumn.TableName, "_") for i := 0; i < len(tablenamelist); i++ { strStart := string([]byte(tablenamelist[i])[:1]) @@ -204,9 +204,8 @@ func UpdateSysTable(c *gin.Context) { // @Router /api/v1/sys/tables/info/{tableId} [delete] func DeleteSysTables(c *gin.Context) { var data tools.SysTables - id, err := tools2.StringToInt(c.Param("tableId")) - data.TableId = id - _, err = data.Delete() + IDS := tools2.IdsStrToIdsIntGroup("tableId", c) + _, err := data.BatchDelete(IDS) tools2.HasError(err, "删除失败", 500) var res app.Response res.Msg = "删除成功" diff --git a/models/tools/systables.go b/models/tools/systables.go index d5b29a0..78025bc 100644 --- a/models/tools/systables.go +++ b/models/tools/systables.go @@ -6,15 +6,15 @@ import ( ) type SysTables struct { - TableId int `gorm:"primary_key;auto_increment" json:"tableId"` //表编码 - TableName string `gorm:"type:varchar(255);" json:"tableName"` //表名称 - TableComment string `gorm:"type:varchar(255);" json:"tableComment"` //表备注 - ClassName string `gorm:"type:varchar(255);" json:"className"` //类名 + TableId int `gorm:"primary_key;auto_increment" json:"tableId"` //表编码 + TBName string `gorm:"column:table_name;type:varchar(255);" json:"tableName"` //表名称 + TableComment string `gorm:"type:varchar(255);" json:"tableComment"` //表备注 + ClassName string `gorm:"type:varchar(255);" json:"className"` //类名 TplCategory string `gorm:"type:varchar(255);" json:"tplCategory"` PackageName string `gorm:"type:varchar(255);" json:"packageName"` //包名 - ModuleName string `gorm:"type:varchar(255);" json:"moduleName"` //模块名 + ModuleName string `gorm:"type:varchar(255);" json:"moduleName"` //模块名 BusinessName string `gorm:"type:varchar(255);" json:"businessName"` - FunctionName string `gorm:"type:varchar(255);" json:"functionName"` //功能名称 + FunctionName string `gorm:"type:varchar(255);" json:"functionName"` //功能名称 FunctionAuthor string `gorm:"type:varchar(255);" json:"functionAuthor"` //功能作者 PkColumn string `gorm:"type:varchar(255);" json:"pkColumn"` PkGoField string `gorm:"type:varchar(255);" json:"pkGoField"` @@ -38,6 +38,10 @@ type SysTables struct { models.BaseModel } +func (SysTables) TableName() string { + return "sys_tables" +} + type Params struct { TreeCode string `gorm:"-" json:"treeCode"` TreeParentCode string `gorm:"-" json:"treeParentCode"` @@ -49,8 +53,8 @@ func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int, erro table := orm.Eloquent.Select("*").Table("sys_tables") - if e.TableName != "" { - table = table.Where("table_name = ?", e.TableName) + if e.TBName != "" { + table = table.Where("table_name = ?", e.TBName) } if e.TableComment != "" { table = table.Where("table_comment = ?", e.TableComment) @@ -70,8 +74,8 @@ func (e *SysTables) Get() (SysTables, error) { var err error table := orm.Eloquent.Select("*").Table("sys_tables") - if e.TableName != "" { - table = table.Where("table_name = ?", e.TableName) + if e.TBName != "" { + table = table.Where("table_name = ?", e.TBName) } if e.TableId != 0 { table = table.Where("table_id = ?", e.TableId) @@ -138,3 +142,11 @@ func (e *SysTables) Delete() (success bool, err error) { success = true return } + +func (e *SysTables) BatchDelete(id []int) (Result bool, err error) { + if err = orm.Eloquent.Table(e.TableName()).Where(" table_id in (?)", id).Delete(&SysColumns{}).Error; err != nil { + return + } + Result = true + return +}