admin/railway_cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

事务回滚判断优化

Browse Source
This commit is contained in:
lhx
2025-11-17 16:37:14 +08:00
parent 54ac4037d5
commit d00ae38e16
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/checkpoint.py
View File

@@ -163,12 +163,14 @@ class CheckpointService(BaseService[Checkpoint]):
logger.error(f"Failed to insert batch: {str(e)}") logger.error(f"Failed to insert batch: {str(e)}")
raise e raise e
# 如果有失败记录，不提交事务 # 如果有插入失败记录（不是跳过记录），不提交事务
if failed_items: # 跳过记录不应该影响事务，只插入失败的记录才需要回滚
insert_failed_items = [item for item in failed_items if '插入失败' in item.get('error', '')]
if insert_failed_items:
db.rollback() db.rollback()
return { return {
'success': False, 'success': False,
'message': f'批量导入失败: {len(failed_items)}条记录处理失败', 'message': f'批量导入失败: {len(insert_failed_items)}条记录插入失败',
'total_count': total_count, 'total_count': total_count,
'success_count': success_count, 'success_count': success_count,
'failed_count': failed_count, 'failed_count': failed_count,

8
app/services/level_data.py
View File

@@ -191,12 +191,14 @@ class LevelDataService(BaseService[LevelData]):
logger.error(f"Failed to insert batch: {str(e)}") logger.error(f"Failed to insert batch: {str(e)}")
raise e raise e
# 如果有失败记录，不提交事务 # 如果有插入失败记录（不是跳过记录），不提交事务
if failed_items: # 跳过记录不应该影响事务，只插入失败的记录才需要回滚
insert_failed_items = [item for item in failed_items if '插入失败' in item.get('error', '')]
if insert_failed_items:
db.rollback() db.rollback()
return { return {
'success': False, 'success': False,
'message': f'批量导入失败: {len(failed_items)}条记录处理失败', 'message': f'批量导入失败: {len(insert_failed_items)}条记录插入失败',
'total_count': total_count, 'total_count': total_count,
'success_count': success_count, 'success_count': success_count,
'failed_count': failed_count, 'failed_count': failed_count,

8
app/services/section_data.py
View File

@@ -354,12 +354,14 @@ class SectionDataService(BaseService[SectionData]):
logger.error(f"Failed to insert batch: {str(e)}") logger.error(f"Failed to insert batch: {str(e)}")
raise e raise e
# 如果有失败记录，不提交事务 # 如果有插入失败记录（不是跳过记录），不提交事务
if failed_items: # 跳过记录不应该影响事务，只插入失败的记录才需要回滚
insert_failed_items = [item for item in failed_items if '插入失败' in item.get('error', '')]
if insert_failed_items:
db.rollback() db.rollback()
return { return {
'success': False, 'success': False,
'message': f'批量导入失败: {len(failed_items)}条记录处理失败', 'message': f'批量导入失败: {len(insert_failed_items)}条记录插入失败',
'total_count': total_count, 'total_count': total_count,
'success_count': success_count, 'success_count': success_count,
'failed_count': failed_count, 'failed_count': failed_count,

8
app/services/settlement_data.py
View File

@@ -487,12 +487,14 @@ class SettlementDataService(BaseService[SettlementData]):
logger.error(f"Failed to insert batch: {str(e)}") logger.error(f"Failed to insert batch: {str(e)}")
raise e raise e
# 如果有失败记录，不提交事务 # 如果有插入失败记录（不是跳过记录），不提交事务
if failed_items: # 跳过记录不应该影响事务，只插入失败的记录才需要回滚
insert_failed_items = [item for item in failed_items if '插入失败' in item.get('error', '')]
if insert_failed_items:
db.rollback() db.rollback()
return { return {
'success': False, 'success': False,
'message': f'批量导入失败: {len(failed_items)}条记录处理失败', 'message': f'批量导入失败: {len(insert_failed_items)}条记录插入失败',
'total_count': total_count, 'total_count': total_count,
'success_count': success_count, 'success_count': success_count,
'failed_count': failed_count, 'failed_count': failed_count,