浏览代码

fix:增加count功能

chenjunkai 6 年之前
父节点
当前提交
c4a6b45125
共有 1 个文件被更改,包括 7 次插入4 次删除
  1. 7 4
      Controller/VodBucket.py

+ 7 - 4
Controller/VodBucket.py

@@ -151,7 +151,7 @@ class UidBucketView(View):
             return response.json(444, 'rank')
         dvqs = Device_Info.objects.filter(UID=uid)
         if not dvqs.exists():
-            return response.json(10,'设备不存在')
+            return response.json(10, '设备不存在')
         try:
             smqs = Store_Meal.objects.filter(id=rank).values("bucket__storeDay", "day", "bucket_id")
             if not smqs.exists():
@@ -196,8 +196,11 @@ class UidBucketView(View):
         if uid:
             ubqs = ubqs.filter(uid=uid)
         ubqs = ubqs.values('id', 'uid', 'channel', 'status', 'endTime', 'bucket__bucket',
-                                                          'bucket__storeDay', 'bucket__area')
-        res = list(ubqs[(page - 1) * line:page * line])
+                           'bucket__storeDay', 'bucket__area')
+        res = {
+            'datas': list(ubqs[(page - 1) * line:page * line])
+            'count': ubqs.count()
+        }
         return response.json(0, res)
 
     def do_update(self, request_dict, response):
@@ -227,6 +230,6 @@ class UidBucketView(View):
         if uid:
             ubqs = ubqs.filter(uid=uid)
         ubqs = ubqs.values('id', 'uid', 'channel', 'status', 'endTime', 'bucket__bucket',
-                                                          'bucket__storeDay', 'bucket__area')
+                           'bucket__storeDay', 'bucket__area')
         res = list(ubqs[(page - 1) * line:page * line])
         return response.json(0, res)