equ

Controller/DetectController.py

@@ -80,9 +80,12 @@ class DetectControllerView(View):
             return response.json(444, 'page,line')
         startTime = request_dict.get('startTime', None)
         endTime = request_dict.get('endTime', None)
+        eventType = request_dict.get('eventType', None)
         qs = Equipment_Info.objects.filter(userID_id=userID)
         if startTime and endTime:
             qs = qs.filter(addTime__range=(startTime, endTime))
+        if eventType:
+            qs = qs.filter(eventType=eventType)
         uids = request_dict.get('uids', None)
         if uids:
             uid_list = uids.split(',')
@@ -101,6 +104,7 @@ class DetectControllerView(View):
             return response.json(0, {'datas': [], 'count': 0})
         qs = qs.values('id', 'devUid', 'devNickName', 'Channel', 'eventType', 'status', 'alarm', 'eventTime',
                        'receiveTime', 'is_st', 'addTime')
+
         count = qs.count()
         qr = qs[(page - 1) * line:page * line]
         res = []