Deka_123/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

refactor(region):合并行政区划的Service和Repository。

Browse Source
This commit is contained in:
徐涛 2022-08-16 00:09:39 +08:00
parent 1bafdd7dca
commit d856eda6c1
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
repository/region.go
View File

@ -1,24 +0,0 @@
package repository
import (
"electricity_bill_calc/cache"
"electricity_bill_calc/global"
"electricity_bill_calc/model"
)
type _RegionRepository struct{}
var RegionRepo _RegionRepository
func (_RegionRepository) FetchRegion(code string) (*model.Region, error) {
cachedRegion, _ := cache.RetreiveData[model.Region]("region", code)
if cachedRegion != nil {
return cachedRegion, nil
}
region := new(model.Region)
has, err := global.DBConn.ID(code).NoAutoCondition().Get(region)
if has {
cache.CacheData(region, "region", code)
}
return _postProcessSingle(region, has, err)
}

21
service/region.go
View File

@ -1,9 +1,9 @@
package service package service
import ( import (
"electricity_bill_calc/cache"
"electricity_bill_calc/global" "electricity_bill_calc/global"
"electricity_bill_calc/model" "electricity_bill_calc/model"
"electricity_bill_calc/repository"
"xorm.io/builder" "xorm.io/builder"
) )
@ -21,15 +21,15 @@ func (_RegionService) FetchSubRegions(parent string) ([]model.Region, error) {
return regions, err return regions, err
} }
func (_RegionService) FetchAllParentRegions(code string) ([]model.Region, error) { func (r _RegionService) FetchAllParentRegions(code string) ([]model.Region, error) {
regions := make([]model.Region, 0) regions := make([]model.Region, 0)
region, err := repository.RegionRepo.FetchRegion(code) region, err := r.fetchRegion(code)
if err != nil { if err != nil {
return regions, err return regions, err
} }
regions = append(regions, *region) regions = append(regions, *region)
for region.Level > 1 { for region.Level > 1 {
region, err = repository.RegionRepo.FetchRegion(region.Parent) region, err = r.fetchRegion(region.Parent)
if err != nil { if err != nil {
return make([]model.Region, 0), nil return make([]model.Region, 0), nil
} }
@ -37,3 +37,16 @@ func (_RegionService) FetchAllParentRegions(code string) ([]model.Region, error)
} }
return regions, nil return regions, nil
} }
func (_RegionService) fetchRegion(code string) (*model.Region, error) {
cachedRegion, _ := cache.RetreiveData[model.Region]("region", code)
if cachedRegion != nil {
return cachedRegion, nil
}
region := new(model.Region)
has, err := global.DBConn.ID(code).NoAutoCondition().Get(region)
if has {
cache.CacheData(region, "region", code)
}
return _postProcessSingle(region, has, err)
}