定制化推送多个国家

Service/CustomizedPushService.py

@@ -28,9 +28,10 @@ class CustomizedPushObject:
         # 设备型号和国家
         device_name_list = device_name.split(',')
         device_type_list = DeviceTypeModel.objects.filter(name__in=device_name_list).values_list('type', flat=True)
-        country_qs = CountryModel.objects.filter(country_name=country).values('id')
-        country_id = country_qs[0]['id']
-        device_info_qs = Device_Info.objects.filter(Type__in=device_type_list, userID__region_country=country_id)
+        country_name_list = country.split(',')
+        country_id_list = CountryModel.objects.filter(country_name__in=country_name_list).values_list('id', flat=True)
+        device_info_qs = Device_Info.objects.filter(Type__in=device_type_list,
+                                                    userID__region_country__in=country_id_list)
         # 获取时间范围
         now_time = int(time.time())
 
@@ -73,6 +74,7 @@ class CustomizedPushObject:
         @param kwargs: 参数
         @return:
         """
+        customized_push_id = kwargs['id']
         user_id_list = kwargs['user_id_list']
         title = kwargs['title']
         msg = kwargs['msg']
@@ -119,7 +121,7 @@ class CustomizedPushObject:
                     target=cls.thr_pool_push,
                     kwargs=pre_push_kwargs)
                 pre_push_thread.start()
-                CUSTOMIZED_PUSH_LOGGER.info('customized_push_id:{}推送完成'.format(kwargs['id']))
+                CUSTOMIZED_PUSH_LOGGER.info('customized_push_id:{}推送完成'.format(customized_push_id))
         except Exception as e:
             CUSTOMIZED_PUSH_LOGGER.info('定制化推送或保存数据异常,'
                                         'error_line:{},error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))