后台界面云存用户新增播放时间段过滤

AdminController/ServeManagementController.py

@@ -751,6 +751,9 @@ class serveManagement(View):
         ucode = request_dict.getlist('ucode', None)
         version = request_dict.getlist('version', None)
 
+        # 日志表查询
+        logTimeRange = request_dict.getlist('logTimeRange[]', None)
+
         pageNo = request_dict.get('pageNo', None)
         pageSize = request_dict.get('pageSize', None)
         if not all([pageNo, pageSize]):
@@ -810,6 +813,16 @@ class serveManagement(View):
 
             cg_qs = CloudLogModel.objects.filter(
                 operation='cloudstorage/queryvodlist')
+            if logTimeRange:
+                logStartTime, logEndTime = int(
+                    logTimeRange[0][:-3]), int(logTimeRange[1][:-3])
+                cg_qs = cg_qs.filter(
+                    time__gte=logStartTime,
+                    time__lte=logEndTime)
+                # 过滤套餐关联的UID_Bucket数据
+                uid_bucket_qs = uid_bucket_qs.filter(
+                    uid__in=cg_qs.values('uid'))
+
             list_data = []
             count = uid_bucket_qs.count()
             uid_bucket_qs = uid_bucket_qs[(page - 1) * line:page * line]
@@ -887,6 +900,8 @@ class serveManagement(View):
         ucode = request_dict.getlist('ucode', None)
         version = request_dict.getlist('version', None)
 
+        # 日志表查询
+        logTimeRange = request_dict.getlist('logTimeRange[]', None)
 
         try:
             uid_bucket_qs = UID_Bucket.objects.all()
@@ -940,6 +955,12 @@ class serveManagement(View):
 
             cg_qs = CloudLogModel.objects.filter(
                 operation='cloudstorage/queryvodlist')
+            if logTimeRange:
+                logStartTime, logEndTime = int(
+                    logTimeRange[0][:-3]), int(logTimeRange[1][:-3])
+                cg_qs = cg_qs.filter(
+                    time__gte=logStartTime,
+                    time__lte=logEndTime)
             list_data = []
             count = uid_bucket_qs.count()
             for uid_bucket in uid_bucket_qs: