|
|
@@ -68,23 +68,8 @@ class NotificationView(View):
|
|
|
uid = utko.UID
|
|
|
# uid += channel
|
|
|
redisObj = RedisObject(db=6)
|
|
|
-<<<<<<< .mine
|
|
|
pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)
|
|
|
-=======
|
|
|
- pkey = '{uid}_ptl'.format(uid=uid)
|
|
|
->>>>>>> .theirs
|
|
|
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!'}
|
WuYiPei