先存库，后推送

Controller/DetectController.py

@@ -218,34 +218,7 @@ class NotificationView(View):
             logger.info(kwag_args)
             logger.info(detect_med_type)
             push_server_status = 0
-            #推送
-            if detect_med_type == 2 or detect_med_type == 0:
 
-                try:
-                    if push_type == 0:  # ios apns
-                        print('do_apns')
-                        # self.do_apns(**kwag_args)
-                        do_apns_code = self.do_apns(**kwag_args)
-                        if isinstance(do_apns_code, int):
-                            push_server_status = do_apns_code
-                        else:
-                            push_server_status = 400
-                    elif push_type == 1:  # android gcm
-                        print('do_fcm')
-                        do_fcm_code = self.do_fcm(**kwag_args)
-                        push_server_status = 200
-                    elif push_type == 2:  # android jpush
-                        print('do_jpush')
-                        do_jpush_code = self.do_jpush(**kwag_args)
-                        push_server_status = do_jpush_code
-                        # return JsonResponse(status=200, data={'code': 0, '状态：': self.do_jpush(**kwag_args)})
-                except Exception as e:
-                    logger.info("errLine={errLine}, errMsg={errMsg}".format(errLine=e.__traceback__.tb_lineno,errMsg=repr(e)))
-                    continue
-            if detect_med_type == 1:
-                do_apns_code = '只存库不推送'
-                do_fcm_code = '只存库不推送'
-                do_jpush_code = '只存库不推送'
             # 以下是存库
             userID_id = up["userID_id"]
             int_is_st = int(is_st)
@@ -276,6 +249,37 @@ class NotificationView(View):
                         storage_location=1
                     ))
                 userID_ids.append(userID_id)
+
+            # 推送
+            if detect_med_type == 2 or detect_med_type == 0:
+
+                try:
+                    if push_type == 0:  # ios apns
+                        print('do_apns')
+                        # self.do_apns(**kwag_args)
+                        do_apns_code = self.do_apns(**kwag_args)
+                        if isinstance(do_apns_code, int):
+                            push_server_status = do_apns_code
+                        else:
+                            push_server_status = 400
+                    elif push_type == 1:  # android gcm
+                        print('do_fcm')
+                        do_fcm_code = self.do_fcm(**kwag_args)
+                        push_server_status = 200
+                    elif push_type == 2:  # android jpush
+                        print('do_jpush')
+                        do_jpush_code = self.do_jpush(**kwag_args)
+                        push_server_status = do_jpush_code
+                        # return JsonResponse(status=200, data={'code': 0, '状态：': self.do_jpush(**kwag_args)})
+                except Exception as e:
+                    logger.info("errLine={errLine}, errMsg={errMsg}".format(errLine=e.__traceback__.tb_lineno,
+                                                                            errMsg=repr(e)))
+                    continue
+
+            if detect_med_type == 1:
+                do_apns_code = '只存库不推送'
+                do_fcm_code = '只存库不推送'
+                do_jpush_code = '只存库不推送'
         if is_sys_msg:
             SysMsgModel.objects.bulk_create(sys_msg_list)
         else:

Controller/DetectControllerV2.py

@@ -181,21 +181,6 @@ class NotificationView(View):
                 kwag_args['msg_text'] = msg_text
                 logger.info('推送要的数据: {}'.format(kwag_args))
 
-                try:
-                    # 推送消息
-                    if not have_dkey:
-                        if push_type == 0:  # ios apns
-                            do_apns_code = self.do_apns(**kwag_args)
-                            logger.info('进入do_apns,uid={}'.format(uid))
-                            logger.info('do_apns_code===={}'.format(do_apns_code))
-                        elif push_type == 1:  # android gcm
-                            do_fcm_code = self.do_fcm(**kwag_args)
-                        elif push_type == 2:  # android jpush
-                            do_jpush_code = self.do_jpush(**kwag_args)
-                except Exception as e:
-                    logger.info("errLine={errLine}, errMsg={errMsg}".format(errLine=e.__traceback__.tb_lineno,errMsg=repr(e)))
-                    continue
-
                 # 以下是存库
                 userID_id = up["userID_id"]
                 if userID_id not in userID_ids:
@@ -225,6 +210,20 @@ class NotificationView(View):
                             storage_location=2
                         ))
                     userID_ids.append(userID_id)
+                try:
+                    # 推送消息
+                    if not have_dkey:
+                        if push_type == 0:  # ios apns
+                            do_apns_code = self.do_apns(**kwag_args)
+                            logger.info('进入do_apns,uid={}'.format(uid))
+                            logger.info('do_apns_code===={}'.format(do_apns_code))
+                        elif push_type == 1:  # android gcm
+                            do_fcm_code = self.do_fcm(**kwag_args)
+                        elif push_type == 2:  # android jpush
+                            do_jpush_code = self.do_jpush(**kwag_args)
+                except Exception as e:
+                    logger.info("errLine={errLine}, errMsg={errMsg}".format(errLine=e.__traceback__.tb_lineno,errMsg=repr(e)))
+                    continue
             if is_sys_msg:
                 SysMsgModel.objects.bulk_create(sys_msg_list)
             else: