修改获取响应数据函数

Controller/DetectControllerV2.py

@@ -146,11 +146,11 @@ class NotificationV2View(View):
                 'region': region,
                 'aws_s3_client': aws_s3_client
             }
-            result_dict = DevicePushService.get_push_url(**kwargs)
+            res_data = DevicePushService.get_res_data(**kwargs)
 
             TIME_LOGGER.info('推送响应,uid:{},n_time:{},事件类型:{},响应:{}'.format(
-                uid, n_time, event_type, json.dumps(result_dict)))
-            return JsonResponse(status=200, data=result_dict)
+                uid, n_time, event_type, json.dumps(res_data)))
+            return JsonResponse(status=200, data=res_data)
         except Exception as e:
             logger.info('V2推送接口异常,error_line:{},error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
             data = {

Service/DevicePushService.py

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