Merge branch 'hotfix/2025-02'

@@ -2130,10 +2130,20 @@ class Command(BaseCommand, LoggerMixin):
                                         # 更新OCR累计识别结果表
                                         if business_type == consts.HIL_PREFIX:
                                             result_class = HILOCRResult if is_ca else HILSEOCRResult
-                                            res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
+                                            try:
+                                                res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
+                                            except Exception as e:
+                                            # 遇到报错重试一次，希望解决两个文件首次入库都插入的问题
+                                                self.online_log.error('{0} [process error (ocr result save) retry] [task={1}] [error={2}]'.format(self.log_base, task_str, traceback.format_exc()))
+                                                res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
                                         else:
                                             result_class = AFCOCRResult if is_ca else AFCSEOCRResult
-                                            res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
+                                            try:
+                                                res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
+                                            except Exception as e:
+                                            # 遇到报错重试一次，希望解决两个文件首次入库都插入的问题
+                                                self.online_log.error('{0} [process error (ocr result save) retry] [task={1}] [error={2}]'.format(self.log_base, task_str, traceback.format_exc()))
+                                                res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
                                         
                                     except Exception as e:
                                         self.online_log.error(
@@ -2172,10 +2182,20 @@ class Command(BaseCommand, LoggerMixin):
                                     # 更新OCR累计识别结果表
                                     if business_type == consts.HIL_PREFIX:
                                         result_class = HILOCRResult if is_ca else HILSEOCRResult
-                                        res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
+                                        try:
+                                            res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
+                                        except Exception as e:
+                                            # 遇到报错重试一次，希望解决两个文件首次入库都插入的问题
+                                            self.online_log.error('{0} [process error (ocr result save) retry] [task={1}] [error={2}]'.format(self.log_base, task_str, traceback.format_exc()))
+                                            res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
                                     else:
                                         result_class = AFCOCRResult if is_ca else AFCSEOCRResult
-                                        res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
+                                        try:
+                                            res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
+                                        except Exception as e:
+                                            # 遇到报错重试一次，希望解决两个文件首次入库都插入的问题
+                                            self.online_log.error('{0} [process error (ocr result save) retry] [task={1}] [error={2}]'.format(self.log_base, task_str, traceback.format_exc()))
+                                            res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
                                 except Exception as e:
                                     self.online_log.error(
                                         '{0} [process error (ocr result save)] [task={1}] [error={2}]'.format(

@@ -102,7 +102,7 @@ for db_setting in DATABASES.values():
         'driver': 'ODBC Driver 17 for SQL Server',
         'extra_params': "odbc_cursortype=2"
     }
-
+    db_setting['CONN_MAX_AGE'] = 60
 # set this to False if you want to turn off pyodbc's connection pooling
 DATABASE_CONNECTION_POOLING = True