Browse Source

查询推送消息支持多类型查询

lang 3 years ago
parent
commit
382d831b2f
1 changed files with 2 additions and 7 deletions
  1. 2 7
      Controller/DetectControllerV2.py

+ 2 - 7
Controller/DetectControllerV2.py

@@ -298,13 +298,8 @@ class DetectControllerViewV2(View):
         if 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]))
+                eventTypeList = [int(i.strip()) for i in eventTypeList]
+                qs = qs.filter(eventType__in=eventTypeList)
             else:
                 qs = qs.filter(eventType=eventType)
         uids = request_dict.get('uids', None)