|
@@ -217,8 +217,8 @@ class UidBucketView(View):
|
|
return response.json(10, '过期了')
|
|
return response.json(10, '过期了')
|
|
|
|
|
|
def do_delete(self, request_dict, response):
|
|
def do_delete(self, request_dict, response):
|
|
- id = request_dict.get('id', None)
|
|
|
|
try:
|
|
try:
|
|
|
|
+ id = request_dict.get('id', None)
|
|
page = int(request_dict.get('page', None))
|
|
page = int(request_dict.get('page', None))
|
|
line = int(request_dict.get('line', None))
|
|
line = int(request_dict.get('line', None))
|
|
d_ubqs = UID_Bucket.objects.filter(id=id)
|
|
d_ubqs = UID_Bucket.objects.filter(id=id)
|
|
@@ -228,14 +228,11 @@ class UidBucketView(View):
|
|
OssCrdModel.objects.filter(uid=uid, channel=channel).delete()
|
|
OssCrdModel.objects.filter(uid=uid, channel=channel).delete()
|
|
except Exception as e:
|
|
except Exception as e:
|
|
return response.json(10, repr(e))
|
|
return response.json(10, repr(e))
|
|
- uid = request_dict.get('uid', None)
|
|
|
|
- ubqs = UID_Bucket.objects
|
|
|
|
- if uid:
|
|
|
|
- ubqs = ubqs.filter(uid=uid)
|
|
|
|
- ubqs = ubqs.values('id', 'uid', 'channel', 'status', 'endTime', 'bucket__bucket',
|
|
|
|
- 'bucket__storeDay', 'bucket__area')
|
|
|
|
- res = {
|
|
|
|
- 'datas': list(ubqs[(page - 1) * line:page * line]),
|
|
|
|
- 'count': ubqs.count()
|
|
|
|
- }
|
|
|
|
- return response.json(0, res)
|
|
|
|
|
|
+ else:
|
|
|
|
+ ubqs = UID_Bucket.objects.values('id', 'uid', 'channel', 'status', 'endTime', 'bucket__bucket',
|
|
|
|
+ 'bucket__storeDay', 'bucket__area')
|
|
|
|
+ res = {
|
|
|
|
+ 'datas': list(ubqs[(page - 1) * line:page * line]),
|
|
|
|
+ 'count': ubqs.count()
|
|
|
|
+ }
|
|
|
|
+ return response.json(0, res)
|