Browse Source

完善设备活跃查询接口

guanhailong 2 years ago
parent
commit
483d5590da
1 changed files with 3 additions and 1 deletions
  1. 3 1
      AdminController/dataSystemManagement/DeviceDataController.py

+ 3 - 1
AdminController/dataSystemManagement/DeviceDataController.py

@@ -362,6 +362,7 @@ class DeviceDataView(View):
             device_info_summary_qs = DeviceInfoSummary.objects.filter(
             device_info_summary_qs = DeviceInfoSummary.objects.filter(
                 time__gte=start_time, time__lt=end_time, query_type=1).values('country', 'count')
                 time__gte=start_time, time__lt=end_time, query_type=1).values('country', 'count')
             count_all = device_info_summary_qs.aggregate(total=Sum('count'))['total']
             count_all = device_info_summary_qs.aggregate(total=Sum('count'))['total']
+            count_all = count_all if count_all else 0
             video_list = []
             video_list = []
             region_list = []
             region_list = []
             region_dict = {}
             region_dict = {}
@@ -376,9 +377,10 @@ class DeviceDataView(View):
                 deivce_type_qs = device_info_summary_qs.filter(time__gte=item[0], time__lt=item[1]).values('count')
                 deivce_type_qs = device_info_summary_qs.filter(time__gte=item[0], time__lt=item[1]).values('count')
                 count = deivce_type_qs.aggregate(total=Sum('count'))['total']
                 count = deivce_type_qs.aggregate(total=Sum('count'))['total']
                 count = count if count else 0
                 count = count if count else 0
+                rate = round(count / count_all * 100, 2) if count_all else 0
                 vod_dict = {
                 vod_dict = {
                     'count': count,
                     'count': count,
-                    'rate': round(count / count_all * 100, 2),
+                    'rate': rate,
                     'startTime': item[0],
                     'startTime': item[0],
                     'endTime': item[1]
                     'endTime': item[1]
                 }
                 }