|
@@ -29,6 +29,7 @@ from Model.models import Device_Info, VodHlsModel, Equipment_Info, UidSetModel,
|
|
|
AiService
|
|
|
from Object.ETkObject import ETkObject
|
|
|
from Object.RedisObject import RedisObject
|
|
|
+from django.db.models import Q
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
from Object.UidTokenObject import UidTokenObject
|
|
@@ -295,7 +296,17 @@ class DetectControllerViewV2(View):
|
|
|
if startTime and endTime:
|
|
|
qs = qs.filter(eventTime__range=(startTime, endTime))
|
|
|
if eventType:
|
|
|
- qs = qs.filter(eventType=eventType)
|
|
|
+ if ',' in eventType: #兼容AI查询
|
|
|
+ eventTypeList = eventType.split(',')
|
|
|
+ eventTypeLen = len(eventTypeList)
|
|
|
+ if eventTypeLen == 1:
|
|
|
+ qs = qs.filter(Q(eventType=eventTypeList[0]))
|
|
|
+ elif eventTypeLen == 2:
|
|
|
+ qs = qs.filter(Q(eventType=eventTypeList[0]) | Q(eventType=eventTypeList[1]))
|
|
|
+ elif eventTypeLen == 3:
|
|
|
+ qs = qs.filter(Q(eventType=eventTypeList[0]) | Q(eventType=eventTypeList[1]) | Q(eventType=eventTypeList[2]))
|
|
|
+ else:
|
|
|
+ qs = qs.filter(eventType=eventType)
|
|
|
uids = request_dict.get('uids', None)
|
|
|
if uids:
|
|
|
uid_list = uids.split(',')
|