|
|
@@ -22,7 +22,7 @@ from AnsjerPush.Config.aiConfig import DEVICE_EVENT_TYPE
|
|
|
from AnsjerPush.config import CONFIG_INFO, CONFIG_CN, MULTI_CHANNEL_TYPE_LIST
|
|
|
from AnsjerPush.config import JPUSH_CONFIG, FCM_CONFIG, APNS_CONFIG, BASE_DIR, APNS_MODE, XMPUSH_CONFIG, OPPOPUSH_CONFIG
|
|
|
from Model.models import UidPushModel, SysMsgModel, DeviceSharePermission, DeviceChannelUserSet, \
|
|
|
- DeviceChannelUserPermission, UidSetModel
|
|
|
+ DeviceChannelUserPermission, UidSetModel, Device_Info
|
|
|
from Object.ETkObject import ETkObject
|
|
|
from Object.UidTokenObject import UidTokenObject
|
|
|
from Object.utils import LocalDateTimeUtil
|
|
|
@@ -54,7 +54,10 @@ class DevicePushService:
|
|
|
@classmethod
|
|
|
def query_uid_push(cls, uid, event_type):
|
|
|
"""
|
|
|
- 查询uid_set与push数据列表
|
|
|
+ 查询uid_push和uid_set数据
|
|
|
+ @param uid: uid
|
|
|
+ @param event_type: 事件类型
|
|
|
+ @return: uid_push_qs
|
|
|
"""
|
|
|
if event_type != 606:
|
|
|
uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid, uid_set__detect_status=1). \
|
|
|
@@ -62,7 +65,10 @@ class DevicePushService:
|
|
|
'lang', 'm_code', 'tz', 'uid_set__nickname', 'uid_set__detect_interval', 'uid_set__detect_group',
|
|
|
'uid_set__channel', 'uid_set__ai_type', 'uid_set__device_type', 'uid_set__new_detect_interval')
|
|
|
else:
|
|
|
- uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid). \
|
|
|
+ # 一键通话只推主用户
|
|
|
+ device_info_qs = Device_Info.objects.filter(UID=uid).values('vodPrimaryUserID')
|
|
|
+ primary_user_id = device_info_qs[0]['vodPrimaryUserID']
|
|
|
+ uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid, userID_id=primary_user_id). \
|
|
|
values('token_val', 'app_type', 'appBundleId', 'm_code', 'push_type', 'userID_id', 'userID__NickName',
|
|
|
'lang', 'm_code', 'tz', 'uid_set__nickname', 'uid_set__detect_interval', 'uid_set__detect_group',
|
|
|
'uid_set__channel', 'uid_set__ai_type', 'uid_set__device_type', 'uid_set__new_detect_interval')
|
peng