From f6883dc4bbb34bb0d471484cf0496c6ce7bab936 Mon Sep 17 00:00:00 2001 From: fengxuan <fengxuan@situdata.com> Date: Fri, 10 Jan 2025 11:49:30 +0800 Subject: [PATCH] FIX --- src/celery_compare/tasks.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/celery_compare/tasks.py b/src/celery_compare/tasks.py index 51c1665..3e3effe 100644 --- a/src/celery_compare/tasks.py +++ b/src/celery_compare/tasks.py @@ -3669,10 +3669,10 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res 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() - if cms_delay_time_config is None or cms_delay_time is None or not cms_delay_time.isdigit(): - cms_delay_time = 0 - else: + 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 = cms_delay_time_config.value + else: + cms_delay_time = 0 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,14 +3718,10 @@ def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, # 实时查询延迟时间 delay_time_config = Configs.objects.filter(id=4).first() - if delay_time_config is not None and delay_time_config.value - if delay_time_config is None: - delay_time = 0 - else: + 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 - if delay_time is None or not delay_time.isdigit(): - delay_time = 0 - else: + else: + delay_time = 0 compare_log.info('delay_time:{0}'.format(delay_time)) # 查看此订单号下是否有未完成的文件,如果有,等1分钟 @@ -3783,10 +3779,10 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ is_ca, is_cms)) # 实时查询延迟时间 delay_time_config = Configs.objects.filter(id=4).first() - if delay_time_config is None or delay_time is None or not delay_time.isdigit(): - delay_time = 0 - else: + 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分钟 -- libgit2 0.24.0