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-10-24 15:31:38 +08:00
parent 34b698386a
commit 0ff15a25ac
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/services/settlement_data.py
View File

@@ -209,8 +209,9 @@ class SettlementDataService(BaseService[SettlementData]):
def batch_import_settlement_data(self, db: Session, data: List) -> Dict[str, Any]: def batch_import_settlement_data(self, db: Session, data: List) -> Dict[str, Any]:
""" """
批量导入沉降数据，根据观测点ID和期数ID判断是否重复，重复数据改为更新操作 批量导入沉降数据，
判断观测点数据是否存在，不存在则全部不导入 1.根据观测点ID和期数ID判断是否重复，修复记录，跳过插入操作
2.判断观测点数据是否存在，不存在则记录，跳过插入操作
支持事务回滚，失败时重试一次 支持事务回滚，失败时重试一次
""" """
import logging import logging
@@ -236,7 +237,13 @@ class SettlementDataService(BaseService[SettlementData]):
logger.info(f"Checkpoint {item_data.get('point_id')}: {checkpoint}") logger.info(f"Checkpoint {item_data.get('point_id')}: {checkpoint}")
if not checkpoint: if not checkpoint:
logger.error(f"Checkpoint {item_data.get('point_id')} not found") logger.error(f"Checkpoint {item_data.get('point_id')} not found")
raise Exception(f"Checkpoint {item_data.get('point_id')} not found") logger.error(f"Checkpoint {item_data} not found")
failed_count += 1
failed_items.append({
'data': item_data,
'error': '测点id不存在，跳过插入操作'
})
continue
settlement = self.get_by_point_and_nyid( settlement = self.get_by_point_and_nyid(
db, db,
@@ -271,7 +278,7 @@ class SettlementDataService(BaseService[SettlementData]):
# settlement.useflag = item_data.get('useflag') # settlement.useflag = item_data.get('useflag')
# settlement.workinfoname = item_data.get('workinfoname') # settlement.workinfoname = item_data.get('workinfoname')
# settlement.upd_remark = item_data.get('upd_remark') # settlement.upd_remark = item_data.get('upd_remark')
else: else:
# 新增操作 # 新增操作
settlement = SettlementData( settlement = SettlementData(