优化分表查询推送消息

Service/EquipmentInfoService.py

@@ -162,7 +162,6 @@ class EquipmentInfoService:
         # 获取七天前时间戳
         seven_days_before_time = LocalDateTimeUtil.get_before_days_timestamp(now_time, 7)
         # 默认查询当前表event_time大于七天前时间
-        qs = qs.filter(event_time__gt=seven_days_before_time)
         if user_id:
             qs = qs.filter(device_user_id=user_id)
         if event_type:
@@ -173,7 +172,9 @@ class EquipmentInfoService:
             else:
                 qs = qs.filter(event_type=event_type)
         if start_time and end_time:
-            qs = qs.filter(event_time__range=(start_time, end_time))
+            qs = qs.filter(event_time__range=(int(start_time), int(end_time)))
+        else:
+            qs = qs.filter(event_time__range=(seven_days_before_time, now_time))
         if uid_list:
             uid_list = uid_list.split(',')
             qs = qs.filter(device_uid__in=uid_list)
@@ -268,9 +269,9 @@ class EquipmentInfoService:
         comb_ai_event_type = []
         for i in range(1, len(type) + 1):  # 计算所有组合，如[1, 2, 3, 4], 4取1，4取2，4取3，4取4
             for s in itertools.combinations(type, i):
-                    s_list = list(s)
-                    s_list = [str(v) for v in s_list]
-                    comb_ai_event_type.append(s_list)
+                s_list = list(s)
+                s_list = [str(v) for v in s_list]
+                comb_ai_event_type.append(s_list)
         regroup_list = []
         for val in comb_ai_event_type:  # 组合ai类型组合，如[[2,3],[1,3]] -> [23, 13]
             val = ''.join(val)