查找video_playback_time表（设备活跃）

AdminController/dataSystemManagement/DeviceDataController.py

@@ -13,7 +13,7 @@ import requests
 from django.db.models import Count
 from django.views.generic.base import View
 
-from Model.models import Device_Info, CountryModel, VodHlsModel, UidSetModel, DeviceTypeModel
+from Model.models import Device_Info, CountryModel, UidSetModel, DeviceTypeModel, VideoPlaybackTimeModel
 from Service.CommonService import CommonService
 
 
@@ -324,18 +324,18 @@ class DeviceDataView(View):
         e_time = datetime.datetime.fromtimestamp(int(end_time))
         time_list = CommonService.cutting_time(s_time, e_time, unit_time)
         try:
-            vod_hls_model_qs = VodHlsModel.objects.filter(time__range=(start_time, end_time))
-            if not vod_hls_model_qs.exists():
+            video_playback_time_qs = VideoPlaybackTimeModel.objects.filter(startTime__range=(start_time, end_time))
+            if not video_playback_time_qs.exists():
                 return response.json(173)
-            device_info = list(vod_hls_model_qs.values('uid').order_by('uid').distinct())
+            device_info = list(video_playback_time_qs.values('uid').order_by('uid').distinct())
             device_info_list = [item[key] for item in device_info for key in item]
             count_all = len(device_info_list)
             res = {}
             vod_list = []
             region_list = []
             for item in time_list:
-                vod_hls_qs = vod_hls_model_qs.filter(time__range=(item[0], item[1]))
-                uid_qs = vod_hls_qs.values('uid').order_by('uid').distinct()
+                video_playback_qs = video_playback_time_qs.filter(startTime__range=(item[0], item[1]))
+                uid_qs = video_playback_qs.values('uid').order_by('uid').distinct()
                 uid_list = [item[key] for item in uid_qs for key in item]
                 rate = round(uid_qs.count() / count_all * 100, 2)
                 vod_dict = {