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

@@ -52,6 +52,7 @@ from common.tools.comparison import cp
 from common.tools.aes_util import aes_decrypt_cbc
 from common.tools.aes_util import aes_decrypt_cbc
 
 
 import threading
 import threading
+import concurrent.futures
 
 
 compare_log = logging.getLogger('compare')
 compare_log = logging.getLogger('compare')
 log_base = '[Compare]'
 log_base = '[Compare]'
@@ -3717,8 +3718,14 @@ 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()
+    # try:
+    #     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()
+    # except Exception as e:
+    #     compare_log.info('[fsm thread error] [error={0}]'.format(traceback.format_exc()))
+    with concurrent.futures.ThreadPoolExecutor(max_workers=20) as executor:
+        # 使用map函数提交多个任务
+        results = list(executor.map(fsm_compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms))
     
     
 
 
 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):
@@ -3783,8 +3790,14 @@ def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id,
 
 
 @app.task
 @app.task
 def compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
 def compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
-    producer_thread = threading.Thread(target=compare_thread, args=(application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms))
-    producer_thread.start()
+    # try:
+    #     producer_thread = threading.Thread(target=compare_thread, args=(application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms))
+    #     producer_thread.start()
+    # except Exception as e:
+    #     compare_log.info('[thread error] [error={0}]'.format(traceback.format_exc()))
+    with concurrent.futures.ThreadPoolExecutor(max_workers=20) as executor:
+        # 使用map函数提交多个任务
+        results = list(executor.map(compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms))
 
 
 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