|
@@ -103,7 +103,8 @@ class DevicePushService:
|
|
|
@return: uid_push_qs
|
|
|
"""
|
|
|
if event_type not in [606, 607]:
|
|
|
- uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid, uid_set__detect_status=1). \
|
|
|
+ uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid, uid_set__detect_status=1) \
|
|
|
+ .exclude(token_val='0'). \
|
|
|
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',
|
|
@@ -116,7 +117,8 @@ class DevicePushService:
|
|
|
button_qs = UserAudioVideoPush.objects.filter(uid=uid).values('buttonUser1', 'buttonUser2')
|
|
|
if button_qs.exists():
|
|
|
primary_user_id = button_qs[0]['buttonUser1'] if button == '1' else button_qs[0]['buttonUser2']
|
|
|
- uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid, userID_id=primary_user_id). \
|
|
|
+ uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid, userID_id=primary_user_id) \
|
|
|
+ .exclude(token_val='0'). \
|
|
|
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',
|
|
@@ -460,7 +462,7 @@ class DevicePushService:
|
|
|
return push_result
|
|
|
except Exception as e:
|
|
|
ERROR_INFO_LOGGER.info(
|
|
|
- '发送推送线程异常params:{},error_line:{},error_msg:{}'.format(kwargs, e.__traceback__.tb_lineno, repr(e)))
|
|
|
+ '发送推送线程异常uid:{},error_line:{},error_msg:{}'.format(kwargs['uid'], e.__traceback__.tb_lineno, repr(e)))
|
|
|
return False
|
|
|
|
|
|
@staticmethod
|