Merge branch 'hotfix/2025-02' into feature/uat-tmp

@@ -3776,6 +3776,7 @@ def fsm_compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=
     compare_log.info('[fsm thread]')
     compare_log.info('[fsm thread]')
     #pool = ThreadPoolExecutor(max_workers=6, thread_name_prefix="fsm_thread_")
     #pool = ThreadPoolExecutor(max_workers=6, thread_name_prefix="fsm_thread_")
     try:
     try:
+        # 这个try不生效
         pool.submit(fsm_compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms)
         pool.submit(fsm_compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms)
     except Exception as e:
     except Exception as e:
         compare_log.info('[fsm thread fail] [error={0}]'.format(traceback.format_exc()))
         compare_log.info('[fsm thread fail] [error={0}]'.format(traceback.format_exc()))
@@ -3783,6 +3784,7 @@ def fsm_compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=
     
     
 
 
 def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
 def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
+    try:
         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))
@@ -3814,6 +3816,8 @@ def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id,
             except Exception as e:
             except Exception as e:
                 compare_log.info('[sleep error] [error={0}]'.format(traceback.format_exc()))
                 compare_log.info('[sleep error] [error={0}]'.format(traceback.format_exc()))
             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))
             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))
+    except Exception as e:
+        compare_log.info('[fsm_compare_thread error] [error={0}]'.format(traceback.format_exc()))
 
 
 
 
     # 调用java fsm 比对流程接口（http）
     # 调用java fsm 比对流程接口（http）
@@ -3861,6 +3865,7 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True
     compare_log.info('[non fsm thread]')
     compare_log.info('[non fsm thread]')
     #pool = ThreadPoolExecutor(max_workers=6, thread_name_prefix="non_fsm_thread_")
     #pool = ThreadPoolExecutor(max_workers=6, thread_name_prefix="non_fsm_thread_")
     try:
     try:
+        # 这个try不生效
         pool.submit(compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms)
         pool.submit(compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms)
     except Exception as e:
     except Exception as e:
         compare_log.info('[non fsm thread fail] [error={0}]'.format(traceback.format_exc()))
         compare_log.info('[non fsm thread fail] [error={0}]'.format(traceback.format_exc()))
@@ -3869,7 +3874,7 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True
 def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
 def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
     # POS: application_id, application_entity, uniq_seq, None
     # POS: application_id, application_entity, uniq_seq, None
     # OCR: application_id, business_type(application_entity), None, ocr_res_id
     # OCR: application_id, business_type(application_entity), None, ocr_res_id
-
+    try:
         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))
@@ -3985,4 +3990,5 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_
                     compare_log.error('{0} [Auto SE] [result save error] [entity={1}] [id={2}] [ocr_res_id={3}] '
                     compare_log.error('{0} [Auto SE] [result save error] [entity={1}] [id={2}] [ocr_res_id={3}] '
                                       '[error={4}]'.format(log_base, application_entity, application_id, ocr_res_id,
                                       '[error={4}]'.format(log_base, application_entity, application_id, ocr_res_id,
                                                            traceback.format_exc()))
                                                            traceback.format_exc()))
-
+    except Exception as e:
+        compare_log.info('[compare_thread error] [error={0}]'.format(traceback.format_exc()))