f2d23535 by 冯轩

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

2 parents 3b339d94 ef086ea7
......@@ -3668,6 +3668,8 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res
}
}
try:
compare_log.info('{0} [SE] [cms sleep 10] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id))
time.sleep(10)
response = cms.send(data) # interface_report ocr to cms
except Exception as e:
is_success = False
......@@ -3745,17 +3747,15 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_
'[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id,
is_ca, is_cms))
# 查看此订单号下是否有未完成的文件,如果有,等3分钟
# 查看此订单号下是否有未完成的文件,如果有,等1分钟
doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc
doc_wait_file_result = doc_wait_file_class.objects.filter(application_id=application_id, status=1).first()
compare_log.info('111111')
compare_log.info(doc_wait_file_result)
compare_log.info('doc_wait_file_result:',doc_wait_file_result)
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))
if doc_wait_file_result is not None:
compare_log.info('222222')
compare_log.info('{0} [comparison unfinished file wait 180s start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, '111'))
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))
time.sleep(60)
compare_log.info('333333')
compare_log.info('{0} [comparison unfinished file wait 180s end] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, '111'))
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))
# 根据application_id查找最新的比对信息,如果没有,结束
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!