7b12cfc3 by 冯轩

Merge branch 'feature/CHINARPA-5155' into feature/uat-tmp

2 parents ceb96068 3c45854a
...@@ -3668,8 +3668,16 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res ...@@ -3668,8 +3668,16 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res
3668 } 3668 }
3669 } 3669 }
3670 try: 3670 try:
3671 compare_log.info('{0} [SE] [cms sleep 10] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id)) 3671 compare_log.info('{0} [SE] [cms sleep start] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id))
3672 time.sleep(10) 3672 # 实时查询延迟时间
3673 cms_delay_time_config = Configs.objects.filter(id=5).first()
3674 if cms_delay_time_config is None or cms_delay_time is None or not cms_delay_time.isdigit():
3675 cms_delay_time = 0
3676 else:
3677 cms_delay_time = cms_delay_time_config.value
3678 compare_log.info('cms_delay_time:{0}'.format(cms_delay_time))
3679 time.sleep(int(cms_delay_time))
3680 compare_log.info('{0} [SE] [cms sleep end] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id))
3673 response = cms.send(data) # interface_report ocr to cms 3681 response = cms.send(data) # interface_report ocr to cms
3674 except Exception as e: 3682 except Exception as e:
3675 is_success = False 3683 is_success = False
...@@ -3712,9 +3720,10 @@ def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, ...@@ -3712,9 +3720,10 @@ def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id,
3712 3720
3713 # 实时查询延迟时间 3721 # 实时查询延迟时间
3714 delay_time_config = Configs.objects.filter(id=4).first() 3722 delay_time_config = Configs.objects.filter(id=4).first()
3715 delay_time = delay_time_config.value
3716 if delay_time_config is None or delay_time is None or not delay_time.isdigit(): 3723 if delay_time_config is None or delay_time is None or not delay_time.isdigit():
3717 delay_time = 0 3724 delay_time = 0
3725 else:
3726 delay_time = delay_time_config.value
3718 compare_log.info('delay_time:{0}'.format(delay_time)) 3727 compare_log.info('delay_time:{0}'.format(delay_time))
3719 3728
3720 # 查看此订单号下是否有未完成的文件,如果有,等1分钟 3729 # 查看此订单号下是否有未完成的文件,如果有,等1分钟
...@@ -3772,9 +3781,10 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ ...@@ -3772,9 +3781,10 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_
3772 is_ca, is_cms)) 3781 is_ca, is_cms))
3773 # 实时查询延迟时间 3782 # 实时查询延迟时间
3774 delay_time_config = Configs.objects.filter(id=4).first() 3783 delay_time_config = Configs.objects.filter(id=4).first()
3775 delay_time = delay_time_config.value
3776 if delay_time_config is None or delay_time is None or not delay_time.isdigit(): 3784 if delay_time_config is None or delay_time is None or not delay_time.isdigit():
3777 delay_time = 0 3785 delay_time = 0
3786 else:
3787 delay_time = delay_time_config.value
3778 compare_log.info('delay_time:{0}'.format(delay_time)) 3788 compare_log.info('delay_time:{0}'.format(delay_time))
3779 3789
3780 # 查看此订单号下是否有未完成的文件,如果有,等1分钟 3790 # 查看此订单号下是否有未完成的文件,如果有,等1分钟
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!