From ea70e9c6ba2b6643b7d6fc77a8f2f8a28e22ee25 Mon Sep 17 00:00:00 2001 From: xxj <346944475@qq.com> Date: Fri, 2 Jul 2021 18:10:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20model=3D>table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/view/genfunc/def.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/view/genfunc/def.go b/data/view/genfunc/def.go index 434df74..54c47e6 100755 --- a/data/view/genfunc/def.go +++ b/data/view/genfunc/def.go @@ -182,7 +182,7 @@ func {{$obj.StructName}}Mgr(db *gorm.DB) *_{{$obj.StructName}}Mgr { panic(fmt.Errorf("{{$obj.StructName}}Mgr need init by db")) } ctx, cancel := context.WithCancel(context.Background()) - return &_{{$obj.StructName}}Mgr{_BaseMgr: &_BaseMgr{DB: db.Model({{$obj.StructName}}{}), isRelated: globalIsRelated,ctx:ctx,cancel:cancel,timeout:-1}} + return &_{{$obj.StructName}}Mgr{_BaseMgr: &_BaseMgr{DB: db.Table("{{GetTablePrefixName $obj.TableName}}"), isRelated: globalIsRelated,ctx:ctx,cancel:cancel,timeout:-1}} } // GetTableName get sql table name.获取数据库名字 @@ -190,16 +190,16 @@ func (obj *_{{$obj.StructName}}Mgr) GetTableName() string { return "{{GetTablePrefixName $obj.TableName}}" } -// Get 获取 +// Get 获取 func (obj *_{{$obj.StructName}}Mgr) Get() (result {{$obj.StructName}}, err error) { - err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Find(&result).Error + err = obj.DB.WithContext(obj.ctx).Model({{$obj.StructName}}{}).Find(&result).Error {{GenPreloadList $obj.PreloadList false}} return } // Gets 获取批量结果 func (obj *_{{$obj.StructName}}Mgr) Gets() (results []*{{$obj.StructName}}, err error) { - err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Find(&results).Error + err = obj.DB.WithContext(obj.ctx).Model({{$obj.StructName}}{}).Find(&results).Error {{GenPreloadList $obj.PreloadList true}} return } @@ -221,7 +221,7 @@ func (obj *_{{$obj.StructName}}Mgr) GetByOption(opts ...Option) (result {{$obj.S o.apply(&options) } - err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where(options.query).Find(&result).Error + err = obj.DB.WithContext(obj.ctx).Model({{$obj.StructName}}{}).Where(options.query).Find(&result).Error {{GenPreloadList $obj.PreloadList false}} return } @@ -235,7 +235,7 @@ func (obj *_{{$obj.StructName}}Mgr) GetByOptions(opts ...Option) (results []*{{$ o.apply(&options) } - err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where(options.query).Find(&results).Error + err = obj.DB.WithContext(obj.ctx).Model({{$obj.StructName}}{}).Where(options.query).Find(&results).Error {{GenPreloadList $obj.PreloadList true}} return } @@ -244,20 +244,20 @@ func (obj *_{{$obj.StructName}}Mgr) GetByOptions(opts ...Option) (results []*{{$ {{range $oem := $obj.Em}} // GetFrom{{$oem.ColStructName}} 通过{{$oem.ColName}}获取内容 {{$oem.Notes}} {{if $oem.IsMulti}} func (obj *_{{$obj.StructName}}Mgr) GetFrom{{$oem.ColStructName}}({{CapLowercase $oem.ColStructName}} {{$oem.Type}}) (results []*{{$obj.StructName}}, err error) { - err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where("{{$oem.ColNameEx}} = ?", {{CapLowercase $oem.ColStructName}}).Find(&results).Error + err = obj.DB.WithContext(obj.ctx).Model({{$obj.StructName}}{}).Where("{{$oem.ColNameEx}} = ?", {{CapLowercase $oem.ColStructName}}).Find(&results).Error {{GenPreloadList $obj.PreloadList true}} return } {{else}} func (obj *_{{$obj.StructName}}Mgr) GetFrom{{$oem.ColStructName}}({{CapLowercase $oem.ColStructName}} {{$oem.Type}}) (result {{$obj.StructName}}, err error) { - err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where("{{$oem.ColNameEx}} = ?", {{CapLowercase $oem.ColStructName}}).Find(&result).Error + err = obj.DB.WithContext(obj.ctx).Model({{$obj.StructName}}{}).Where("{{$oem.ColNameEx}} = ?", {{CapLowercase $oem.ColStructName}}).Find(&result).Error {{GenPreloadList $obj.PreloadList false}} return } {{end}} // GetBatchFrom{{$oem.ColStructName}} 批量查找 {{$oem.Notes}} func (obj *_{{$obj.StructName}}Mgr) GetBatchFrom{{$oem.ColStructName}}({{CapLowercase $oem.ColStructName}}s []{{$oem.Type}}) (results []*{{$obj.StructName}}, err error) { - err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where("{{$oem.ColNameEx}} IN (?)", {{CapLowercase $oem.ColStructName}}s).Find(&results).Error + err = obj.DB.WithContext(obj.ctx).Model({{$obj.StructName}}{}).Where("{{$oem.ColNameEx}} IN (?)", {{CapLowercase $oem.ColStructName}}s).Find(&results).Error {{GenPreloadList $obj.PreloadList true}} return } @@ -266,7 +266,7 @@ func (obj *_{{$obj.StructName}}Mgr) GetBatchFrom{{$oem.ColStructName}}({{CapLowe {{range $ofm := $obj.Primary}} // {{GenFListIndex $ofm 1}} primary or index 获取唯一内容 func (obj *_{{$obj.StructName}}Mgr) {{GenFListIndex $ofm 1}}({{GenFListIndex $ofm 2}}) (result {{$obj.StructName}}, err error) { - err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where("{{GenFListIndex $ofm 3}}", {{GenFListIndex $ofm 4}}).Find(&result).Error + err = obj.DB.WithContext(obj.ctx).Model({{$obj.StructName}}{}).Where("{{GenFListIndex $ofm 3}}", {{GenFListIndex $ofm 4}}).Find(&result).Error {{GenPreloadList $obj.PreloadList false}} return } @@ -275,7 +275,7 @@ func (obj *_{{$obj.StructName}}Mgr) GetBatchFrom{{$oem.ColStructName}}({{CapLowe {{range $ofm := $obj.Index}} // {{GenFListIndex $ofm 1}} 获取多个内容 func (obj *_{{$obj.StructName}}Mgr) {{GenFListIndex $ofm 1}}({{GenFListIndex $ofm 2}}) (results []*{{$obj.StructName}}, err error) { - err = obj.DB.WithContext(obj.ctx).Table(obj.GetTableName()).Where("{{GenFListIndex $ofm 3}}", {{GenFListIndex $ofm 4}}).Find(&results).Error + err = obj.DB.WithContext(obj.ctx).Model({{$obj.StructName}}{}).Where("{{GenFListIndex $ofm 3}}", {{GenFListIndex $ofm 4}}).Find(&results).Error {{GenPreloadList $obj.PreloadList true}} return }