优化查询云存警报日志

AdminController/LogManagementController.py

@@ -387,20 +387,23 @@ class LogManagementView(View):
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def getAlarmLog(self, request_dict, response):
-        pageNo = request_dict.get('pageNo', None)
-        pageSize = request_dict.get('pageSize', None)
+        page_no = request_dict.get('pageNo', None)
+        page_size = request_dict.get('pageSize', None)
+        uid = request_dict.get('uid', None)
 
-        if not all([pageNo, pageSize]):
+        if not all([page_no, page_size]):
             return response.json(444)
 
-        page = int(pageNo)
-        line = int(pageSize)
+        page = int(page_no)
+        line = int(page_size)
 
         try:
             alarm_log_qs = StsFrequency.objects.all()
+            if uid:
+                alarm_log_qs = alarm_log_qs.filter(uid=uid)
             count = alarm_log_qs.count()
-            alarm_log_qs = alarm_log_qs.order_by('-updateTime').values('id', 'uid', 'frequency', 'updateTime')[
-                          (page - 1) * line:page * line]
+            alarm_log_qs = alarm_log_qs.order_by('-updateTime').values('id', 'uid', 'frequency', 'updateTime',
+                                                                       'addTime')[(page - 1) * line:page * line]
             return response.json(0, {'list': list(alarm_log_qs), 'total': count})
         except Exception as e:
             print(e)