异步推送消息和保存数据

Controller/DetectControllerV2.py

@@ -126,29 +126,24 @@ class NotificationV2View(View):
                       'app_push_config': uid_set_push_list[0]['uid_set__msg_notify'],
                       'uid_set_push_list': uid_set_push_list}
 
-            # 推送消息,生成推送数据列表
-            result = DevicePushService.save_msg_push(**params)
-            # 保存推送数据
-            DevicePushService.save_sys_msg(
-                is_sys_msg,
-                result['local_date_time'],
-                result['sys_msg_list'],
-                result['new_device_info_list'])
-
-            # # 异步推送消息和保存数据
-            TIME_LOGGER.info('uid_set_push_list:{}'.format(uid_set_push_list))
-            TIME_LOGGER.info('is_sys_msg:{}'.format(is_sys_msg))
-            TIME_LOGGER.info('params:{}'.format(params))
-
+            # 异步推送消息和保存数据
             push_thread = threading.Thread(
                 target=push_and_save_data,
                 kwargs=params)
             push_thread.start()
 
             params['aws_s3_client'] = aws_s3_client
-            params['uid_set_push_list'] = uid_set_push_list
 
-            result_dict = DevicePushService.get_push_url(**params)  # 获取S3对象上传链接
+            kwargs = {
+                'is_st': is_st,
+                'uid': uid,
+                'channel': channel,
+                'n_time': n_time,
+                'region': region,
+                'aws_s3_client': aws_s3_client
+            }
+            result_dict = DevicePushService.get_push_url(**kwargs)  # 获取S3对象上传链接
+
             TIME_LOGGER.info('推送响应,uid:{},n_time:{},事件类型:{},响应:{}'.format(
                 uid, n_time, event_type, json.dumps(result_dict)))
             return JsonResponse(status=200, data=result_dict)
@@ -162,7 +157,6 @@ class NotificationV2View(View):
 
 
 def push_and_save_data(**params):
-    TIME_LOGGER.info('触发异步推送函数:{}'.format(params))
     TIME_LOGGER.info('{}开始异步推送'.format(params['uid']))
     # 推送消息,生成推送数据列表
     result = DevicePushService.save_msg_push(**params)

Service/DevicePushService.py

@@ -641,36 +641,36 @@ class DevicePushService:
             LOGGING.info('图片推送异常,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     @staticmethod
-    def get_push_url(**params):
+    def get_push_url(**kwargs):
         """
         获取推送URL，设备根本当前返回结果进行数据上传
         @return: re_data
         """
         re_data = {'code': 0, 'msg': 'success'}
-        if params['is_st'] == 0 or params['is_st'] == 2:
+        if kwargs['is_st'] == 0 or kwargs['is_st'] == 2:
             re_data['msg'] = 'success 0 or 2'
-            re_data['re_list'] = params['uid_set_push_list']
-        elif params['is_st'] == 1:
+        elif kwargs['is_st'] == 1:
             key_name = '{uid}/{channel}/{filename}.jpeg' \
-                .format(uid=params['uid'], channel=params['channel'], filename=params['n_time'])
+                .format(uid=kwargs['uid'], channel=kwargs['channel'], filename=kwargs['n_time'])
             re_args = {'Key': key_name}
-            if params['region'] == 2:  # 2:国内
+            if kwargs['region'] == 2:  # 2:国内
                 re_args['Bucket'] = 'push'
             else:  # 1：国外
                 re_args['Bucket'] = 'foreignpush'
-            response_url = DevicePushService.generate_s3_url(params['aws_s3_client'], re_args)
+            response_url = DevicePushService.generate_s3_url(kwargs['aws_s3_client'], re_args)
             re_data['img_push'] = response_url
-        elif params['is_st'] == 3:
+            re_data['msg'] = 'success 1'
+        elif kwargs['is_st'] == 3:
             img_url_list = []
-            if params['region'] == 2:  # 2:国内
+            if kwargs['region'] == 2:  # 2:国内
                 re_args = {'Bucket': 'push'}
             else:  # 1：国外
                 re_args = {'Bucket': 'foreignpush'}
-            for i in range(params['is_st']):
+            for i in range(kwargs['is_st']):
                 key_name = '{uid}/{channel}/{filename}_{st}.jpeg'. \
-                    format(uid=params['uid'], channel=params['channel'], filename=params['n_time'], st=i)
+                    format(uid=kwargs['uid'], channel=kwargs['channel'], filename=kwargs['n_time'], st=i)
                 re_args['Key'] = key_name
-                response_url = DevicePushService.generate_s3_url(params['aws_s3_client'], re_args)
+                response_url = DevicePushService.generate_s3_url(kwargs['aws_s3_client'], re_args)
                 img_url_list.append(response_url)
             re_data['img_url_list'] = img_url_list
             re_data['msg'] = 'success 3'