Merge pull request #582 from songzhibin97/gva_gormv2_dev

feat:完善前后端回滚交互信息交换

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 代表回滚 ...
 
 }

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,

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
 }