|
@@ -76,14 +76,14 @@ class DetectControllerView(View):
|
|
|
nowTime = int(time.time())
|
|
|
if not page or not line:
|
|
|
return response.json(444, 'page,line')
|
|
|
- qs = Equipment_Info.objects.filter(userID_id=userID)
|
|
|
+ qs = Equipment_Info.objects.filter(userID_id=userID,eventTime__gte=nowTime-3600*24*27)
|
|
|
uid = request_dict.get('uid', None)
|
|
|
if uid:
|
|
|
qs = qs.filter(devUid=uid)
|
|
|
dvqs = Device_Info.objects.filter(UID=uid).values('Type')
|
|
|
uid_type_dict = {uid: dvqs[0]['Type']}
|
|
|
else:
|
|
|
- dvqs = Device_Info.objects.filter(userID_id=userID,eventTime__gte=nowTime-3600*24*27).values('UID', 'Type')
|
|
|
+ dvqs = Device_Info.objects.filter(userID_id=userID).values('UID', 'Type')
|
|
|
uid_type_dict = {}
|
|
|
for dv in dvqs:
|
|
|
uid_type_dict[dv['UID']] = dv['Type']
|