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

@@ -3701,9 +3701,32 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res
 
 
 @app.task
 @app.task
 def fsm_compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
 def fsm_compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
+    producer_thread_fsm = threading.Thread(target=fsm_compare_thread, args=(application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms))
+    producer_thread_fsm.start()
+    
+
+def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
     compare_log.info('{0} [receive fsm task] [entity={1}] [id={2}] [uniq_seq={3}] [ocr_res_id={4}] [is_ca={5}] '
     compare_log.info('{0} [receive fsm task] [entity={1}] [id={2}] [uniq_seq={3}] [ocr_res_id={4}] [is_ca={5}] '
                      '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id,
                      '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id,
                                            is_ca, is_cms))
                                            is_ca, is_cms))
+
+    # 实时查询延迟时间
+    delay_time = Configs.objects.filter(id=4).first()
+    if delay_time is None or not delay_time.isdigit():
+        delay_time = 0
+    compare_log.info('delay_time:',delay_time)
+
+    # 查看此订单号下是否有未完成的文件，如果有，等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('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('{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))
+        time.sleep(delay_time)
+        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))
+
+
     # 调用java fsm 比对流程接口（http）
     # 调用java fsm 比对流程接口（http）
     # 调用Java fsm 比对流程接口, fsm 是se流程, ca可以暂时忽略
     # 调用Java fsm 比对流程接口, fsm 是se流程, ca可以暂时忽略
     auto_class = HILAutoSettlement if application_entity == consts.HIL_PREFIX else AFCAutoSettlement
     auto_class = HILAutoSettlement if application_entity == consts.HIL_PREFIX else AFCAutoSettlement
@@ -3746,16 +3769,20 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_
     compare_log.info('{0} [receive task] [entity={1}] [id={2}] [uniq_seq={3}] [ocr_res_id={4}] [is_ca={5}] '
     compare_log.info('{0} [receive task] [entity={1}] [id={2}] [uniq_seq={3}] [ocr_res_id={4}] [is_ca={5}] '
                      '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id,
                      '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id,
                                            is_ca, is_cms))
                                            is_ca, is_cms))
-
+    # 实时查询延迟时间
+    delay_time = Configs.objects.filter(id=4).first()
+    if delay_time is None or not delay_time.isdigit():
+        delay_time = 0
+    compare_log.info('delay_time:',delay_time)
     # 查看此订单号下是否有未完成的文件，如果有，等1分钟
     # 查看此订单号下是否有未完成的文件，如果有，等1分钟
     doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc
     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()
     doc_wait_file_result = doc_wait_file_class.objects.filter(application_id=application_id, status=1).first()
     compare_log.info('doc_wait_file_result:',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))
     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:
     if doc_wait_file_result is not None:
-        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(180)
-        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))
+        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))
+        time.sleep(delay_time)
+        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))
 
 
 
 
     # 根据application_id查找最新的比对信息，如果没有，结束
     # 根据application_id查找最新的比对信息，如果没有，结束