优化获取设备电量显示

AdminController/DeviceManagementController.py

@@ -2079,9 +2079,9 @@ class DeviceManagement(View):
         @param response: 响应对象
         @return: 分页后的设备日报数据，包含聚合信息（如果条件满足）
         """
-        device_id = request_dict.get('deviceId')
-        start_time = request_dict.get('startTime')
-        end_time = request_dict.get('endTime')
+        device_id = request_dict.get('deviceId', None)
+        start_time = request_dict.get('startTime', None)
+        end_time = request_dict.get('endTime', None)
         page = int(request_dict.get('page', 1))  # 默认第1页
         page_size = int(request_dict.get('pageSize', 10))  # 默认每页10条
 
@@ -2091,6 +2091,8 @@ class DeviceManagement(View):
         if device_id:
             device_daily_report_qs = device_daily_report_qs.filter(device_id=device_id)
 
+        device_daily_report_qs = device_daily_report_qs.filter(report_time__gt=0)
+
         if start_time and end_time:
             start_time = int(start_time)
             end_time = int(end_time)
@@ -2099,8 +2101,7 @@ class DeviceManagement(View):
                 report_time__gte=start_time,
                 report_time__lte=end_time
             )
-        else:
-            device_daily_report_qs = device_daily_report_qs.exclude(report_time=0)
+
 
         # 计算总数（用于分页）
         total_count = device_daily_report_qs.count()