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

@@ -53,6 +53,9 @@ from common.tools.aes_util import aes_decrypt_cbc
 
 
 import threading
 import threading
 import concurrent.futures
 import concurrent.futures
+from concurrent.futures import ThreadPoolExecutor
+
+pool = ThreadPoolExecutor(max_workers=20, thread_name_prefix="my_thread_")
 
 
 compare_log = logging.getLogger('compare')
 compare_log = logging.getLogger('compare')
 log_base = '[Compare]'
 log_base = '[Compare]'
@@ -3719,13 +3722,17 @@ 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):
     # try:
     # 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 = threading.Thread(target=fsm_compare_thread, args=(application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms))
     #     producer_thread_fsm.start()
     #     producer_thread_fsm.start()
     # except Exception as e:
     # except Exception as e:
     #     compare_log.info('[fsm thread error] [error={0}]'.format(traceback.format_exc()))
     #     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))
+    
+    # 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))
+    
+    compare_log.info('[fsm thread]')
+    pool.submit(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):
@@ -3795,9 +3802,13 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True
     #     producer_thread.start()
     #     producer_thread.start()
     # except Exception as e:
     # except Exception as e:
     #     compare_log.info('[thread error] [error={0}]'.format(traceback.format_exc()))
     #     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))
+    
+    # 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))
+
+    compare_log.info('[non fsm thread]')
+    pool.submit(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