diff --git a/server/model/sys_autocode_history.go b/server/model/sys_autocode_history.go index 74465c80c558daa186f53684416db2ac7d60d798..62ceaaa06c916d003158a4e5ce2ca6ac3fe12fc5 100644 --- a/server/model/sys_autocode_history.go +++ b/server/model/sys_autocode_history.go @@ -6,11 +6,13 @@ import "gin-vue-admin/global" type SysAutoCodeHistory struct { global.GVA_MODEL - TableName string `json:"tableName"` - RequestMeta string `gorm:"type:text" json:"requestMeta,omitempty"` // 前端传入的结构化信息 - AutoCodePath string `gorm:"type:text" json:"autoCodePath"` // 其他meta信息 path;path - InjectionMeta string `gorm:"type:text" json:"injectionMeta"` // 注入的内容 RouterPath@functionName@RouterString; - ApiIDs string `json:"apiIDs"` // api表注册内容 + TableName string `json:"tableName,omitempty"` + RequestMeta string `gorm:"type:text" json:"requestMeta,omitempty"` // 前端传入的结构化信息 + AutoCodePath string `gorm:"type:text" json:"autoCodePath,omitempty"` // 其他meta信息 path;path + InjectionMeta string `gorm:"type:text" json:"injectionMeta,omitempty"` // 注入的内容 RouterPath@functionName@RouterString; + StructName string `json:"structName"` + StructCNName string `json:"structCNName"` + ApiIDs string `json:"apiIDs,omitempty"` // api表注册内容 Flag int // 表示对应状态 0 代表创建, 1 代表回滚 ... } diff --git a/server/service/sys_auto_code.go b/server/service/sys_auto_code.go index efd116b8f1bbeb850ca8456c4763a24c62714e7c..a4db85fc0760f06ed48100bb56f080557c06dac6 100644 --- a/server/service/sys_auto_code.go +++ b/server/service/sys_auto_code.go @@ -185,6 +185,8 @@ func CreateTemp(autoCode model.AutoCodeStruct, ids ...uint) (err error) { if autoCode.TableName != "" { err = CreateAutoCodeHistory( string(meta), + autoCode.StructName, + autoCode.Description, bf.String(), injectionCodeMeta.String(), autoCode.TableName, @@ -193,6 +195,8 @@ func CreateTemp(autoCode model.AutoCodeStruct, ids ...uint) (err error) { } else { err = CreateAutoCodeHistory( string(meta), + autoCode.StructName, + autoCode.Description, bf.String(), injectionCodeMeta.String(), autoCode.StructName, diff --git a/server/service/sys_autocode_history.go b/server/service/sys_autocode_history.go index fbbc5b393f7887663243e7494e729c1acbd58bac..757da9f8271ca6b46e9fadffa839c596e0ef7d34 100644 --- a/server/service/sys_autocode_history.go +++ b/server/service/sys_autocode_history.go @@ -11,11 +11,13 @@ import ( ) // CreateAutoCodeHistory RouterPath : RouterPath@RouterString;RouterPath2@RouterString2 -func CreateAutoCodeHistory(meta, autoCodePath string, injectionMeta string, tableName string, apiIds string) error { +func CreateAutoCodeHistory(meta, structName, structCNName, autoCodePath string, injectionMeta string, tableName string, apiIds string) error { return global.GVA_DB.Create(&model.SysAutoCodeHistory{ RequestMeta: meta, AutoCodePath: autoCodePath, InjectionMeta: injectionMeta, + StructName: structName, + StructCNName: structCNName, TableName: tableName, ApiIDs: apiIds, }).Error @@ -74,6 +76,6 @@ func GetSysHistoryPage(info request.PageInfo) (err error, list interface{}, tota db := global.GVA_DB var fileLists []model.SysAutoCodeHistory err = db.Find(&fileLists).Count(&total).Error - err = db.Limit(limit).Offset(offset).Order("updated_at desc").Select("id,created_at,updated_at,table_name,auto_code_path,injection_meta,api_ids,flag").Find(&fileLists).Error + err = db.Limit(limit).Offset(offset).Order("updated_at desc").Select("id,created_at,updated_at,struct_name,struct_cn_name,flag").Find(&fileLists).Error return err, fileLists, total }