group/tourguidegroup_views.py

@@ -2,12 +2,14 @@

                 
              

                 from __future__ import division
              

                 
              

                +import json
              

                 import os
              

                 
              

                 import shortuuid
              

                 from curtail_uuid import CurtailUUID
              

                 from django.conf import settings
              

                 from django.core.files.storage import default_storage
              

                +from django.core.serializers.json import DjangoJSONEncoder
              

                 from logit import logit
              

                 from TimeConvert import TimeConvert as tc
              

                 
              
@@ -16,7 +18,7 @@ from group.models import GroupInfo, GroupUserInfo

                 from utils.error.errno_utils import GroupStatusCode, UserStatusCode
              

                 from utils.error.response_utils import response
              

                 from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_info, set_group_users_info
              

                -from utils.redis.rkeys import TOUR_GUIDE_GROUP_CUR_SESSION
              

                +from utils.redis.rkeys import TOUR_GUIDE_GROUP_CUR_GATHER_INFO, TOUR_GUIDE_GROUP_CUR_SESSION
              

                 from utils.redis.rtourguide import set_tour_guide_own_group
              

                 
              

                 
              
@@ -240,6 +242,10 @@ def tg_group_gather_start_api(request):

                     set_group_info(group)
              

                 
              

                     # 更新Session
              

                -    r.set(TOUR_GUIDE_GROUP_CUR_SESSION, shortuuid.uuid())
              

                +    r.pipeline().set(TOUR_GUIDE_GROUP_CUR_SESSION % group_id, shortuuid.uuid()).set(TOUR_GUIDE_GROUP_CUR_GATHER_INFO % group_id, json.dumps({
              

                +        'gather_at': gather_at,
              

                +        'gather_lon': gather_lon,
              

                +        'gather_lat': gather_lat,
              

                +    }, cls=DjangoJSONEncoder)).execute()
              

                 
              

                     return response(200, u'Set Tour Guide Group Gather Info Success', u'设置旅行团集合信息成功')
              

group/tourguidegroupuser_views.py

@@ -15,8 +15,8 @@ from utils.error.response_utils import response

                 from utils.group_photo_utils import get_current_photos
              

                 from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_users_info
              

                 from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET,
              

                -                               GROUP_USERS_QUIT_SET, GROUP_USERS_REFUSED_SET, TOUR_GUIDE_GROUP_CUR_SESSION,
              

                -                               TOUR_GUIDE_GROUP_GEO_INFO, TOUR_GUIDE_GROUP_USER_GEO_LIST)
              

                +                               GROUP_USERS_QUIT_SET, GROUP_USERS_REFUSED_SET, TOUR_GUIDE_GROUP_CUR_GATHER_INFO,
              

                +                               TOUR_GUIDE_GROUP_CUR_SESSION, TOUR_GUIDE_GROUP_GEO_INFO, TOUR_GUIDE_GROUP_USER_GEO_LIST)
              

                 from utils.redis.rtourguide import get_tour_guide_own_group
              

                 
              

                 
              
@@ -152,9 +152,12 @@ def tgu_group_user_locations_api(request):

                     if not GroupUserInfo.objects.filter(group_id=group_id, user_id=admin_id, subadmin=True, status=True).exists():
              

                         return response(GroupStatusCode.NO_LOCATION_PERMISSION)
              

                 
              

                +    # 获取集合经纬度
              

                +    gather_info = json.loads(r.get(TOUR_GUIDE_GROUP_CUR_GATHER_INFO % group_id) or '{}')
              

                +
              

                     return response(200, 'Get Tour Guide Group All User Location Success', u'获取旅行团用户地理位置信息成功', {
              

                         'group_id': group_id,
              

                -        'locations': r.georadius(TOUR_GUIDE_GROUP_GEO_INFO % group_id, 0, 0, '+inf', unit='m', withdist=True, withcoord=True, sort='ASC')
              

                +        'locations': r.georadius(TOUR_GUIDE_GROUP_GEO_INFO % group_id, gather_info.get('gather_lon', 0), gather_info.get('gather_lat', 0), '+inf', unit='m', withdist=True, withcoord=True, sort='ASC')
              

                         # 'locations': [['x', 0.33, (2.68220901489e-06, 1.26736058093e-06)]]
              

                     })
              

                 
              

utils/redis/rkeys.py

@@ -9,6 +9,7 @@ PROFILE_INFO = 'profile:info:%s'  # STRING，用户信息，user_id

                 # 导游相关
              

                 TOUR_GUIDE_GROUP_GEO_INFO = 'tour:guide:group:geo:info:%s'  # ZSET，旅游团地理位置信息，group_id
              

                 TOUR_GUIDE_GROUP_CUR_SESSION = 'tour:guide:group:cur:session:%s'  # STRING，旅游团当前Session，group_id，导游设置集合时间的时候更新
              

                +TOUR_GUIDE_GROUP_CUR_GATHER_INFO = 'tour:guide:group:cur:gather:info:%s'  # STRING，旅游团当前Session，group_id，导游设置集合时间的时候更新
              

                 TOUR_GUIDE_GROUP_USER_GEO_LIST = 'tour:guide:group:user:geo:list:%s:%s:%s'  # LIST，旅游团当前用户地理位置列表，group_id、session_id、user_id
              

                 
              

                 TOUR_GUIDE_GROUP_USER_OWN = 'tour:guide:group:user:own:%s'  # STRING，导游当前拥有的旅行团，user_id，导游创建旅行团的时候更新