hxd/zky_mandate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 代码生成-导入表错误处理

Browse Source
This commit is contained in:
yxh 2023-01-30 18:02:27 +08:00
parent 953b1200e8
commit db0b773269
1 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
internal/app/system/logic/toolsGenTable/tools_gen_table.go
View File

@ -144,42 +144,33 @@ func (s *sToolsGenTable) SelectDbTableListByNames(ctx context.Context, tableName
func (s *sToolsGenTable) ImportGenTable(ctx context.Context, tableList []*entity.ToolsGenTable) error {
if tableList != nil {
err := g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
for _, table := range tableList {
tableName := table.TableName
// 保存列信息
genTableColumns, err := service.ToolsGenTableColumn().SelectDbTableColumnsByName(ctx, tableName)
if err != nil || len(genTableColumns) <= 0 {
_ = tx.Rollback()
return gerror.New("获取列数据失败")
}
err = s.InitTable(ctx, table, genTableColumns)
if err != nil {
_ = tx.Rollback()
return err
}
result, err1 := tx.Model(dao.ToolsGenTable.Table()).Insert(table)
if err1 != nil {
_ = tx.Rollback()
return err1
}
tmpId, err2 := result.LastInsertId()
if err2 != nil || tmpId <= 0 {
_ = tx.Rollback()
return gerror.New("保存数据失败")
}
table.TableId = tmpId
for _, column := range genTableColumns {
service.ToolsGenTableColumn().InitColumnField(column, table)
_, err3 := tx.Model(dao.ToolsGenTableColumn.Table()).Insert(column)
if err3 != nil {
_ = tx.Rollback()
return gerror.New("保存列数据失败")
err := g.Try(ctx, func(ctx context.Context) {
for _, table := range tableList {
tableName := table.TableName
// 保存列信息
genTableColumns, err := service.ToolsGenTableColumn().SelectDbTableColumnsByName(ctx, tableName)
liberr.ErrIsNil(ctx, err, "获取列数据失败")
if len(genTableColumns) <= 0 {
liberr.ErrIsNil(ctx, gerror.New("获取列数据失败"))
}
err = s.InitTable(ctx, table, genTableColumns)
liberr.ErrIsNil(ctx, err)
result, err1 := tx.Model(dao.ToolsGenTable.Table()).Insert(table)
liberr.ErrIsNil(ctx, err1)
tmpId, err2 := result.LastInsertId()
liberr.ErrIsNil(ctx, err2, "保存数据失败")
if tmpId <= 0 {
liberr.ErrIsNil(ctx, gerror.New("保存数据失败"))
}
table.TableId = tmpId
for _, column := range genTableColumns {
service.ToolsGenTableColumn().InitColumnField(column, table)
_, err3 := tx.Model(dao.ToolsGenTableColumn.Table()).Insert(column)
liberr.ErrIsNil(ctx, err3, "保存列数据失败")
}
}
}
return nil
})
return err
})
return err
} else {