浏览代码

kvs视频列表返回分页总数

peng 2 年之前
父节点
当前提交
df541b53eb
共有 1 个文件被更改,包括 8 次插入3 次删除
  1. 8 3
      Controller/AWS/KVSController.py

+ 8 - 3
Controller/AWS/KVSController.py

@@ -339,15 +339,20 @@ class KVSView(View):
                 stream_name=serial_number,
                 api_name='GET_IMAGES'
             )
-            stream_list = kinesis_fragments_obj.get_list_fragments(serial_number, start_time, end_time)[
-                          (page - 1) * size:page * size]
+            stream_list = kinesis_fragments_obj.get_list_fragments(serial_number, start_time, end_time)
+            total_page = len(stream_list)
+            stream_list = stream_list[(page - 1) * size:page * size]
             for item in stream_list:
                 temp_start_time = (item['startTime'] - datetime.timedelta(hours=8)).replace(tzinfo=datetime.timezone.utc)
                 temp_end_time = temp_start_time + datetime.timedelta(seconds=300)
                 item['image'] = kinesis_images_obj.get_images(serial_number, temp_start_time, temp_end_time)
                 item['startTime'] = int(item['startTime'].timestamp())
                 item['endTime'] = int(item['endTime'].timestamp())
-            return response.json(0, stream_list)
+            res = {
+                'totalPage': total_page,
+                'fragments': stream_list
+            }
+            return response.json(0, res)
         except Exception as e:
             print(e)
             return response.json(500, repr(e))