|
@@ -261,7 +261,11 @@ class DetectControllerViewV2(View):
|
|
if not region:
|
|
if not region:
|
|
return response.json(444, 'region')
|
|
return response.json(444, 'region')
|
|
region = int(region)
|
|
region = int(region)
|
|
|
|
+ now_time = int(time.time())
|
|
|
|
+
|
|
qs = Equipment_Info.objects.filter(userID_id=userID).order_by('-eventTime')
|
|
qs = Equipment_Info.objects.filter(userID_id=userID).order_by('-eventTime')
|
|
|
|
+ qs = qs.filter(endTime__gt=now_time - 3600 * 168)
|
|
|
|
+
|
|
if startTime and endTime:
|
|
if startTime and endTime:
|
|
qs = qs.filter(eventTime__range=(startTime, endTime))
|
|
qs = qs.filter(eventTime__range=(startTime, endTime))
|
|
if eventType:
|
|
if eventType:
|