liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- GetStores添加provinceCode

Browse Source
This commit is contained in:
gazebo
2019-08-22 19:19:01 +08:00
parent 6b06041140
commit 881198d0f1
1 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
business/jxstore/cms/store.go
View File

@@ -13,7 +13,6 @@ import (
"git.rosy.net.cn/jx-callback/business/auth2" "git.rosy.net.cn/jx-callback/business/auth2"
"git.rosy.net.cn/jx-callback/business/authz" "git.rosy.net.cn/jx-callback/business/authz"
"git.rosy.net.cn/baseapi/platformapi/autonavi"
"git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/platformapi/dingdingapi"
"git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
@@ -40,8 +39,10 @@ const (
type StoreExt struct { type StoreExt struct {
model.Store model.Store
FloatLng float64 `json:"lng"` FloatLng float64 `json:"lng"`
FloatLat float64 `json:"lat"` FloatLat float64 `json:"lat"`
ProvinceCode int `json:"provinceCode"`
ProvinceName string `json:"provinceName"` ProvinceName string `json:"provinceName"`
CityName string `json:"cityName"` CityName string `json:"cityName"`
DistrictName string `json:"districtName"` DistrictName string `json:"districtName"`
@@ -177,6 +178,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
t1.operator_role2, t1.operator_role2,
t1.printer_font_size, t1.printer_font_size,
province.code province_code,
province.name province_name, province.name province_name,
city.name city_name, city.name city_name,
district.name district_name, district.name district_name,
@@ -336,7 +338,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
} }
sql += sqlWhere + ` sql += sqlWhere + `
GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, 32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63 GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, 32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64
ORDER BY t1.id DESC ORDER BY t1.id DESC
/*LIMIT ? OFFSET ?*/` /*LIMIT ? OFFSET ?*/`
pageSize = jxutils.FormalizePageSize(pageSize) pageSize = jxutils.FormalizePageSize(pageSize)
@@ -404,29 +406,29 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
retVal.Stores = retVal.Stores[offset : offset+pageSize] retVal.Stores = retVal.Stores[offset : offset+pageSize]
} }
if needConver2Baidu { if needConver2Baidu {
task := tasksch.NewParallelTask("坐标转换", tasksch.NewParallelConfig().SetParallelCount(4).SetBatchSize(autonavi.MaxConvertCount), ctx, // task := tasksch.NewParallelTask("坐标转换", tasksch.NewParallelConfig().SetParallelCount(4).SetBatchSize(autonavi.MaxConvertCount), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
var coords []*autonavi.Coordinate // var coords []*autonavi.Coordinate
for _, v := range batchItemList { // for _, v := range batchItemList {
store := v.(*StoreExt) // store := v.(*StoreExt)
coords = append(coords, &autonavi.Coordinate{ // coords = append(coords, &autonavi.Coordinate{
Lng: store.FloatLng, // Lng: store.FloatLng,
Lat: store.FloatLat, // Lat: store.FloatLat,
}) // })
} // }
coords, err = api.AutonaviAPI.BatchCoordinateConvert(coords, autonavi.CoordSysBaidu) // coords, err = api.AutonaviAPI.BatchCoordinateConvert(coords, autonavi.CoordSysBaidu)
if err == nil { // if err == nil {
for k, v := range batchItemList { // for k, v := range batchItemList {
store := v.(*StoreExt) // store := v.(*StoreExt)
coord := coords[k] // coord := coords[k]
store.FloatLng = coord.Lng // store.FloatLng = coord.Lng
store.FloatLat = coord.Lat // store.FloatLat = coord.Lat
} // }
} // }
return retVal, err // return retVal, err
}, retVal.Stores) // }, retVal.Stores)
task.Run() // task.Run()
task.GetResult(0) // task.GetResult(0)
} }
// if mapLimit { // if mapLimit {
// retVal.TotalCount = len(retVal.Stores) // retVal.TotalCount = len(retVal.Stores)