|
@@ -83,10 +83,10 @@ class DetectControllerView(View):
|
|
uid = request_dict.get('uid', None)
|
|
uid = request_dict.get('uid', None)
|
|
if uid:
|
|
if uid:
|
|
qs = qs.filter(devUid=uid)
|
|
qs = qs.filter(devUid=uid)
|
|
- dvqs = Device_Info.objects.filter(UID=uid).values('Type','NickName')
|
|
|
|
|
|
+ dvqs = Device_Info.objects.filter(UID=uid).values('Type', 'NickName')
|
|
uid_type_dict = {uid: {'type': dvqs[0]['Type'], 'NickName': dvqs[0]['NickName']}}
|
|
uid_type_dict = {uid: {'type': dvqs[0]['Type'], 'NickName': dvqs[0]['NickName']}}
|
|
else:
|
|
else:
|
|
- dvqs = Device_Info.objects.filter(userID_id=userID).values('UID', 'Type','NickName')
|
|
|
|
|
|
+ dvqs = Device_Info.objects.filter(userID_id=userID).values('UID', 'Type', 'NickName')
|
|
uid_type_dict = {}
|
|
uid_type_dict = {}
|
|
for dv in dvqs:
|
|
for dv in dvqs:
|
|
uid_type_dict[dv['UID']] = {'type': dv['Type'], 'NickName': dv['NickName']}
|
|
uid_type_dict[dv['UID']] = {'type': dv['Type'], 'NickName': dv['NickName']}
|
|
@@ -255,9 +255,8 @@ class NotificationView(View):
|
|
uid_set_qs = UidSetModel.objects.filter(uid=uid, detect_status=1)
|
|
uid_set_qs = UidSetModel.objects.filter(uid=uid, detect_status=1)
|
|
if uid_set_qs.exists():
|
|
if uid_set_qs.exists():
|
|
uid_set_id = uid_set_qs[0].id
|
|
uid_set_id = uid_set_qs[0].id
|
|
- uid_push_qs = UidPushModel.objects.filter(uid_set__id=uid_set_id).values('token_val', 'app_type',
|
|
|
|
- 'appBundleId', 'push_type',
|
|
|
|
- 'userID_id', 'userID__NickName')
|
|
|
|
|
|
+ uid_push_qs = UidPushModel.objects.filter(uid_set__id=uid_set_id). \
|
|
|
|
+ values('token_val', 'app_type', 'appBundleId', 'push_type', 'userID_id', 'userID__NickName')
|
|
if uid_set_qs.exists():
|
|
if uid_set_qs.exists():
|
|
redisObj = RedisObject(db=6)
|
|
redisObj = RedisObject(db=6)
|
|
pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)
|
|
pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)
|