MOD:fsm 延迟比对
Showing
1 changed file
with
31 additions
and
4 deletions
| ... | @@ -3699,9 +3699,32 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res | ... | @@ -3699,9 +3699,32 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res |
| 3699 | 3699 | ||
| 3700 | @app.task | 3700 | @app.task |
| 3701 | def fsm_compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False): | 3701 | def fsm_compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False): |
| 3702 | producer_thread_fsm = threading.Thread(target=fsm_compare_thread, args=(application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms)) | ||
| 3703 | producer_thread_fsm.start() | ||
| 3704 | |||
| 3705 | |||
| 3706 | def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False): | ||
| 3702 | compare_log.info('{0} [receive fsm task] [entity={1}] [id={2}] [uniq_seq={3}] [ocr_res_id={4}] [is_ca={5}] ' | 3707 | compare_log.info('{0} [receive fsm task] [entity={1}] [id={2}] [uniq_seq={3}] [ocr_res_id={4}] [is_ca={5}] ' |
| 3703 | '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id, | 3708 | '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id, |
| 3704 | is_ca, is_cms)) | 3709 | is_ca, is_cms)) |
| 3710 | |||
| 3711 | # 实时查询延迟时间 | ||
| 3712 | delay_time = Configs.objects.filter(id=4).first() | ||
| 3713 | if delay_time is None or not delay_time.isdigit(): | ||
| 3714 | delay_time = 0 | ||
| 3715 | compare_log.info('delay_time:',delay_time) | ||
| 3716 | |||
| 3717 | # 查看此订单号下是否有未完成的文件,如果有,等1分钟 | ||
| 3718 | doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc | ||
| 3719 | doc_wait_file_result = doc_wait_file_class.objects.filter(application_id=application_id, status=1).first() | ||
| 3720 | compare_log.info('doc_wait_file_result:',doc_wait_file_result) | ||
| 3721 | compare_log.info('{0} [comparison unfinished file check] [entity={1}] [id={2}] [doc_wait_file_result={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result)) | ||
| 3722 | if doc_wait_file_result is not None: | ||
| 3723 | compare_log.info('{0} [comparison unfinished file wait delay_time start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id)) | ||
| 3724 | time.sleep(delay_time) | ||
| 3725 | compare_log.info('{0} [comparison unfinished file wait delay_time end] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id)) | ||
| 3726 | |||
| 3727 | |||
| 3705 | # 调用java fsm 比对流程接口(http) | 3728 | # 调用java fsm 比对流程接口(http) |
| 3706 | # 调用Java fsm 比对流程接口, fsm 是se流程, ca可以暂时忽略 | 3729 | # 调用Java fsm 比对流程接口, fsm 是se流程, ca可以暂时忽略 |
| 3707 | auto_class = HILAutoSettlement if application_entity == consts.HIL_PREFIX else AFCAutoSettlement | 3730 | auto_class = HILAutoSettlement if application_entity == consts.HIL_PREFIX else AFCAutoSettlement |
| ... | @@ -3744,16 +3767,20 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ | ... | @@ -3744,16 +3767,20 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ |
| 3744 | compare_log.info('{0} [receive task] [entity={1}] [id={2}] [uniq_seq={3}] [ocr_res_id={4}] [is_ca={5}] ' | 3767 | compare_log.info('{0} [receive task] [entity={1}] [id={2}] [uniq_seq={3}] [ocr_res_id={4}] [is_ca={5}] ' |
| 3745 | '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id, | 3768 | '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id, |
| 3746 | is_ca, is_cms)) | 3769 | is_ca, is_cms)) |
| 3747 | 3770 | # 实时查询延迟时间 | |
| 3771 | delay_time = Configs.objects.filter(id=4).first() | ||
| 3772 | if delay_time is None or not delay_time.isdigit(): | ||
| 3773 | delay_time = 0 | ||
| 3774 | compare_log.info('delay_time:',delay_time) | ||
| 3748 | # 查看此订单号下是否有未完成的文件,如果有,等1分钟 | 3775 | # 查看此订单号下是否有未完成的文件,如果有,等1分钟 |
| 3749 | doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc | 3776 | doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc |
| 3750 | doc_wait_file_result = doc_wait_file_class.objects.filter(application_id=application_id, status=1).first() | 3777 | doc_wait_file_result = doc_wait_file_class.objects.filter(application_id=application_id, status=1).first() |
| 3751 | compare_log.info('doc_wait_file_result:',doc_wait_file_result) | 3778 | compare_log.info('doc_wait_file_result:',doc_wait_file_result) |
| 3752 | compare_log.info('{0} [comparison unfinished file check] [entity={1}] [id={2}] [doc_wait_file_result={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result)) | 3779 | compare_log.info('{0} [comparison unfinished file check] [entity={1}] [id={2}] [doc_wait_file_result={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result)) |
| 3753 | if doc_wait_file_result is not None: | 3780 | if doc_wait_file_result is not None: |
| 3754 | compare_log.info('{0} [comparison unfinished file wait 180s start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id)) | 3781 | compare_log.info('{0} [comparison unfinished file wait delay_time start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id)) |
| 3755 | time.sleep(180) | 3782 | time.sleep(delay_time) |
| 3756 | compare_log.info('{0} [comparison unfinished file wait 180s end] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id)) | 3783 | compare_log.info('{0} [comparison unfinished file wait delay_time end] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id)) |
| 3757 | 3784 | ||
| 3758 | 3785 | ||
| 3759 | # 根据application_id查找最新的比对信息,如果没有,结束 | 3786 | # 根据application_id查找最新的比对信息,如果没有,结束 | ... | ... |
-
Please register or sign in to post a comment