|
|
@@ -62,15 +62,27 @@ class NotificationView(View):
|
|
|
if etk:
|
|
|
eto = ETkObject(etk)
|
|
|
uid = eto.uid
|
|
|
+ # uid += channel
|
|
|
if len(uid) != 20:
|
|
|
return JsonResponse(status=200, data={'code': 404, 'msg': 'data is not exist'})
|
|
|
else:
|
|
|
utko = UidTokenObject(uidToken)
|
|
|
uid = utko.UID
|
|
|
+ # uid += channel
|
|
|
redisObj = RedisObject(db=6)
|
|
|
- # pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)
|
|
|
- pkey = '{uid}_ptl'.format(uid=uid)
|
|
|
+ pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)
|
|
|
ykey = '{uid}_redis_qs'.format(uid=uid)
|
|
|
+
|
|
|
+ # 新增下拉时候传进来的时间间隔
|
|
|
+ time_interval = request_dict.get('time_interval', None)
|
|
|
+ # 新增假设数据库UidPushModel已经新增了时间间隔字段
|
|
|
+ # 新增下拉选中的时候，发送一个下拉请求,并且传进来time_interval
|
|
|
+ if time_interval:
|
|
|
+ UidPushModel.objects.filter().update(time_interval=time_interval)
|
|
|
+ time_interval = UidPushModel.objects.filter(time_interval=time_interval)
|
|
|
+ else:
|
|
|
+ time_interval = UidPushModel.objects.filter(time_interval=time_interval)
|
|
|
+
|
|
|
# 判断redisObj.get_data(key=pkey):不为空
|
|
|
if redisObj.get_data(key=pkey):
|
|
|
res_data = {'code': 0, 'msg': 'success!'}
|
|
|
@@ -80,7 +92,8 @@ class NotificationView(View):
|
|
|
redis_list = eval(redisObj.get_data(key=ykey))
|
|
|
else:
|
|
|
# 设置推送时间为60秒一次
|
|
|
- redisObj.set_data(key=pkey, val=1, expire=60)
|
|
|
+ redisObj.set_data(key=pkey, val=1, expire=time_interval)
|
|
|
+ # redisObj.set_data(key=pkey, val=1, expire=60)
|
|
|
print("从数据库查到数据")
|
|
|
# 从数据库查询出来
|
|
|
uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid,uid_set__detect_status=1). \
|
WuYiPei