Skip to content

周伟奇 / bmw-ocr

Go to a project
Toggle navigation
Toggle navigation pinning
d6fc968c by 冯轩
Options

Merge branch 'hotfix/2025-02'

2 parents 8eb3eae2 a0de225f
Expand all
Inline Side-by-side
Showing 3 changed files with 25 additions and 5 deletions
src/apps/doc/management/commands/ocr_process.py
...@@ -2130,10 +2130,20 @@ class Command(BaseCommand, LoggerMixin): ...@@ -2130,10 +2130,20 @@ class Command(BaseCommand, LoggerMixin):
2130 # 更新OCR累计识别结果表 2130 # 更新OCR累计识别结果表
2131 if business_type == consts.HIL_PREFIX: 2131 if business_type == consts.HIL_PREFIX:
2132 result_class = HILOCRResult if is_ca else HILSEOCRResult 2132 result_class = HILOCRResult if is_ca else HILSEOCRResult
2133 res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict) 2133 try:
2134 res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
2135 except Exception as e:
2136 # 遇到报错重试一次，希望解决两个文件首次入库都插入的问题
2137 self.online_log.error('{0} [process error (ocr result save) retry] [task={1}] [error={2}]'.format(self.log_base, task_str, traceback.format_exc()))
2138 res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
2134 else: 2139 else:
2135 result_class = AFCOCRResult if is_ca else AFCSEOCRResult 2140 result_class = AFCOCRResult if is_ca else AFCSEOCRResult
2136 res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict) 2141 try:
2142 res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
2143 except Exception as e:
2144 # 遇到报错重试一次，希望解决两个文件首次入库都插入的问题
2145 self.online_log.error('{0} [process error (ocr result save) retry] [task={1}] [error={2}]'.format(self.log_base, task_str, traceback.format_exc()))
2146 res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
2137 2147
2138 except Exception as e: 2148 except Exception as e:
2139 self.online_log.error( 2149 self.online_log.error(
...@@ -2172,10 +2182,20 @@ class Command(BaseCommand, LoggerMixin): ...@@ -2172,10 +2182,20 @@ class Command(BaseCommand, LoggerMixin):
2172 # 更新OCR累计识别结果表 2182 # 更新OCR累计识别结果表
2173 if business_type == consts.HIL_PREFIX: 2183 if business_type == consts.HIL_PREFIX:
2174 result_class = HILOCRResult if is_ca else HILSEOCRResult 2184 result_class = HILOCRResult if is_ca else HILSEOCRResult
2175 res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict) 2185 try:
2186 res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
2187 except Exception as e:
2188 # 遇到报错重试一次，希望解决两个文件首次入库都插入的问题
2189 self.online_log.error('{0} [process error (ocr result save) retry] [task={1}] [error={2}]'.format(self.log_base, task_str, traceback.format_exc()))
2190 res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
2176 else: 2191 else:
2177 result_class = AFCOCRResult if is_ca else AFCSEOCRResult 2192 result_class = AFCOCRResult if is_ca else AFCSEOCRResult
2178 res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict) 2193 try:
2194 res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
2195 except Exception as e:
2196 # 遇到报错重试一次，希望解决两个文件首次入库都插入的问题
2197 self.online_log.error('{0} [process error (ocr result save) retry] [task={1}] [error={2}]'.format(self.log_base, task_str, traceback.format_exc()))
2198 res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str, financial_statement_dict, financial_explanation_dict)
2179 except Exception as e: 2199 except Exception as e:
2180 self.online_log.error( 2200 self.online_log.error(
2181 '{0} [process error (ocr result save)] [task={1}] [error={2}]'.format( 2201 '{0} [process error (ocr result save)] [task={1}] [error={2}]'.format(
......
src/settings/__init__.py
...@@ -102,7 +102,7 @@ for db_setting in DATABASES.values(): ...@@ -102,7 +102,7 @@ for db_setting in DATABASES.values():
102 'driver': 'ODBC Driver 17 for SQL Server', 102 'driver': 'ODBC Driver 17 for SQL Server',
103 'extra_params': "odbc_cursortype=2" 103 'extra_params': "odbc_cursortype=2"
104 } 104 }
105 105 db_setting['CONN_MAX_AGE'] = 60
106 # set this to False if you want to turn off pyodbc's connection pooling 106 # set this to False if you want to turn off pyodbc's connection pooling
107 DATABASE_CONNECTION_POOLING = True 107 DATABASE_CONNECTION_POOLING = True
108 108
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!