根据通道号查询推送消息

Controller/DetectControllerV2.py

@@ -389,6 +389,7 @@ class DetectControllerViewV2(View):
         event_type = request_dict.get('eventType', None)
         region = int(request_dict.get('region', None))
         uids = request_dict.get('uids', None)
+        channel = request_dict.get('channel', None)
 
         try:
             uid_list = []
@@ -400,7 +401,7 @@ class DetectControllerViewV2(View):
                 end_time = int(time.time())
                 start_time = LocalDateTimeUtil.get_before_days_timestamp(end_time, 7)
             equipment_info_qs, count = EquipmentInfoService. \
-                union_equipment_info(userID, uid_list, event_type, start_time, end_time, page, line)
+                union_equipment_info(userID, uid_list, event_type, start_time, end_time, page, line, channel=channel)
 
             # 查询设备类型,昵称
             if uid_list:

Service/EquipmentInfoService.py

@@ -240,7 +240,7 @@ class EquipmentInfoService:
             return ',' + str(event_type) + ','
 
     @classmethod
-    def union_equipment_info(cls, user_id, uid_list, event_type, start_time, end_time, page, line, event_time=None):
+    def union_equipment_info(cls, user_id, uid_list, event_type, start_time, end_time, page, line, event_time=None, channel=None):
         """
         联表查询推送数据
         @param user_id:
@@ -282,6 +282,9 @@ class EquipmentInfoService:
                 event_type_kwargs['event_time'] = event_time
                 del kwargs['event_tag__regex']
                 del event_type_kwargs['event_tag']
+            if channel:
+                kwargs['channel'] = channel
+                event_type_kwargs['channel'] = channel
             if not event_type_list:
                 # 新增tab_val字段记录表的标识:表编号+10
                 equipment_info_1 = EquipmentInfo1.objects.filter(**kwargs).annotate(