Commit fd03e44

author

piexlMax(奇淼

committed

refactor(字典详情): 优化字典详情查询逻辑,移除预加载改为按需加载

1 parent c546e6d commit fd03e44Copy full SHA for fd03e44

File tree

1 file changed

+18

-8

lines changed

server/service/system
- sys_dictionary_detail.go

1 file changed

+18

-8

lines changed

`‎server/service/system/sys_dictionary_detail.go‎`

Lines changed: 18 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func (dictionaryDetailService *DictionaryDetailService) updateChildrenLevelAndPa`
`166`	`166`	`//@return: sysDictionaryDetail system.SysDictionaryDetail, err error`
`167`	`167`
`168`	`168`	`func (dictionaryDetailService *DictionaryDetailService) GetSysDictionaryDetail(id uint) (sysDictionaryDetail system.SysDictionaryDetail, err error) {`
`169`		`- err = global.GVA_DB.Preload("Children").Where("id = ?", id).First(&sysDictionaryDetail).Error`
	`169`	`+ err = global.GVA_DB.Where("id = ?", id).First(&sysDictionaryDetail).Error`
`170`	`170`	`return`
`171`	`171`	`}`
`172`	`172`
`@@ -205,14 +205,14 @@ func (dictionaryDetailService *DictionaryDetailService) GetSysDictionaryDetailIn`
`205`	`205`	`if err != nil {`
`206`	`206`	`return`
`207`	`207`	`}`
`208`		`- err = db.Preload("Children").Limit(limit).Offset(offset).Order("sort").Find(&sysDictionaryDetails).Error`
	`208`	`+ err = db.Limit(limit).Offset(offset).Order("sort").Find(&sysDictionaryDetails).Error`
`209`	`209`	`return sysDictionaryDetails, total, err`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`// 按照字典id获取字典全部内容的方法`
`213`	`213`	`func (dictionaryDetailService *DictionaryDetailService) GetDictionaryList(dictionaryID uint) (list []system.SysDictionaryDetail, err error) {`
`214`	`214`	`var sysDictionaryDetails []system.SysDictionaryDetail`
`215`		`- err = global.GVA_DB.Preload("Children").Find(&sysDictionaryDetails, "sys_dictionary_id = ?", dictionaryID).Error`
	`215`	`+ err = global.GVA_DB.Find(&sysDictionaryDetails, "sys_dictionary_id = ?", dictionaryID).Error`
`216`	`216`	`return sysDictionaryDetails, err`
`217`	`217`	`}`
`218`	`218`
`@@ -265,19 +265,29 @@ func (dictionaryDetailService *DictionaryDetailService) GetDictionaryDetailsByPa`
`265`	`265`	`db = db.Where("parent_id IS NULL")`
`266`	`266`	`}`
`267`	`267`
	`268`	`+ err = db.Order("sort").Find(&list).Error`
	`269`	`+ if err != nil {`
	`270`	`+ return list, err`
	`271`	`+ }`
	`272`	`+`
	`273`	`+ // 如果需要包含子级数据,使用递归方式加载所有层级的子项`
`268`	`274`	`if req.IncludeChildren {`
`269`		`- db = db.Preload("Children")`
	`275`	`+ for i := range list {`
	`276`	`+ err = dictionaryDetailService.loadChildren(&list[i])`
	`277`	`+ if err != nil {`
	`278`	`+ return list, err`
	`279`	`+ }`
	`280`	`+ }`
`270`	`281`	`}`
`271`	`282`
`272`		`- err = db.Order("sort").Find(&list).Error`
`273`	`283`	`return list, err`
`274`	`284`	`}`
`275`	`285`
`276`	`286`	`// 按照字典type获取字典全部内容的方法`
`277`	`287`	`func (dictionaryDetailService *DictionaryDetailService) GetDictionaryListByType(t string) (list []system.SysDictionaryDetail, err error) {`
`278`	`288`	`var sysDictionaryDetails []system.SysDictionaryDetail`
`279`	`289`	`db := global.GVA_DB.Model(&system.SysDictionaryDetail{}).Joins("JOIN sys_dictionaries ON sys_dictionaries.id = sys_dictionary_details.sys_dictionary_id")`
`280`		`- err = db.Debug().Preload("Children").Find(&sysDictionaryDetails, "type = ?", t).Error`
	`290`	`+ err = db.Find(&sysDictionaryDetails, "type = ?", t).Error`
`281`	`291`	`return sysDictionaryDetails, err`
`282`	`292`	`}`
`283`	`293`
`@@ -308,15 +318,15 @@ func (dictionaryDetailService *DictionaryDetailService) GetDictionaryTreeListByT`
`308`	`318`	`// 按照字典id+字典内容value获取单条字典内容`
`309`	`319`	`func (dictionaryDetailService *DictionaryDetailService) GetDictionaryInfoByValue(dictionaryID uint, value string) (detail system.SysDictionaryDetail, err error) {`
`310`	`320`	`var sysDictionaryDetail system.SysDictionaryDetail`
`311`		`- err = global.GVA_DB.Preload("Children").First(&sysDictionaryDetail, "sys_dictionary_id = ? and value = ?", dictionaryID, value).Error`
	`321`	`+ err = global.GVA_DB.First(&sysDictionaryDetail, "sys_dictionary_id = ? and value = ?", dictionaryID, value).Error`
`312`	`322`	`return sysDictionaryDetail, err`
`313`	`323`	`}`
`314`	`324`
`315`	`325`	`// 按照字典type+字典内容value获取单条字典内容`
`316`	`326`	`func (dictionaryDetailService *DictionaryDetailService) GetDictionaryInfoByTypeValue(t string, value string) (detail system.SysDictionaryDetail, err error) {`
`317`	`327`	`var sysDictionaryDetails system.SysDictionaryDetail`
`318`	`328`	`db := global.GVA_DB.Model(&system.SysDictionaryDetail{}).Joins("JOIN sys_dictionaries ON sys_dictionaries.id = sys_dictionary_details.sys_dictionary_id")`
`319`		`- err = db.Preload("Children").First(&sysDictionaryDetails, "sys_dictionaries.type = ? and sys_dictionary_details.value = ?", t, value).Error`
	`329`	`+ err = db.First(&sysDictionaryDetails, "sys_dictionaries.type = ? and sys_dictionary_details.value = ?", t, value).Error`
`320`	`330`	`return sysDictionaryDetails, err`
`321`	`331`	`}`
`322`	`332`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit fd03e44

File tree

1 file changed

1 file changed

`‎server/service/system/sys_dictionary_detail.go‎`

0 commit comments