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

冯轩
Showing 1 changed file with 32 additions and 20 deletions
src/celery_compare/tasks.py
--- a/src/celery_compare/tasks.py
View file @5e6dc79
+++ b/src/celery_compare/tasks.py
View file @5e6dc79
@@ -3670,11 +3670,16 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res
        try:
            compare_log.info('{0} [SE] [cms sleep start] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id))
            # 实时查询延迟时间
-            cms_delay_time_config = Configs.objects.filter(id=5).first()
+            try:
-            if cms_delay_time_config is not None and cms_delay_time_config.value is not None and cms_delay_time_config.value.isdigit():
+                cms_delay_time_config = Configs.objects.filter(id=5).first()
-                cms_delay_time = cms_delay_time_config.value
+                if cms_delay_time_config is not None and cms_delay_time_config.value is not None and cms_delay_time_config.value.isdigit():
-            else:
+                    cms_delay_time = cms_delay_time_config.value
+                else:
+                    cms_delay_time = 0
+            except Exception as e:
                cms_delay_time = 0
+                compare_log.info('[get cms_delay_time_config fail] [error={0}]'.format(traceback.format_exc()))
            compare_log.info('cms_delay_time:{0}'.format(cms_delay_time))
            time.sleep(int(cms_delay_time))
            compare_log.info('{0} [SE] [cms sleep end] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id))
@@ -3718,20 +3723,23 @@ def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id,
                     '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id,
                                           is_ca, is_cms))
-    # 实时查询延迟时间
-    delay_time_config = Configs.objects.filter(id=4).first()
-    if delay_time_config is not None and delay_time_config.value is not None and delay_time_config.value.isdigit():
-        delay_time = delay_time_config.value
-    else:
-        delay_time = 0
-    compare_log.info('delay_time:{0}'.format(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:{0}'.format(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:
+        # 实时查询延迟时间
+        try:
+            delay_time_config = Configs.objects.filter(id=4).first()
+            if delay_time_config is not None and delay_time_config.value is not None and delay_time_config.value.isdigit():
+                delay_time = delay_time_config.value
+            else:
+                delay_time = 0
+        except Exception as e:
+            delay_time = 0
+            compare_log.info('[get delay_time_config fail] [error={0}]'.format(traceback.format_exc()))
+        compare_log.info('delay_time:{0}'.format(delay_time))
        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(int(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))
@@ -3779,20 +3787,24 @@ 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}] '
                     '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id,
                                           is_ca, is_cms))
-    # 实时查询延迟时间
-    delay_time_config = Configs.objects.filter(id=4).first()
-    if delay_time_config is not None and delay_time_config.value is not None and delay_time_config.value.isdigit():
-        delay_time = delay_time_config.value
-    else:
-        delay_time = 0
-    compare_log.info('delay_time:{0}'.format(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:{0}'.format(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:
+        # 实时查询延迟时间
+        try:
+            delay_time_config = Configs.objects.filter(id=4).first()
+            if delay_time_config is not None and delay_time_config.value is not None and delay_time_config.value.isdigit():
+                delay_time = delay_time_config.value
+            else:
+                delay_time = 0
+        except Exception as e:
+            delay_time = 0
+            compare_log.info('[get delay_time_config fail] [error={0}]'.format(traceback.format_exc()))
+        compare_log.info('delay_time:{0}'.format(delay_time))
        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(int(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))