数据接口完善

app/services/level_data.py

@@ -2,6 +2,7 @@ from sqlalchemy.orm import Session
 from typing import List, Optional, Dict, Any
 from ..models.level_data import LevelData
 from .base import BaseService
+from ..models.settlement_data import SettlementData
 
 class LevelDataService(BaseService[LevelData]):
     def __init__(self):
@@ -30,13 +31,18 @@ class LevelDataService(BaseService[LevelData]):
 
         return self.search_by_conditions(db, conditions)
 
-    def get_by_nyid_and_linecode(self, db: Session, nyid: str, linecode: str) -> Optional[LevelData]:
+    def get_by_nyid_and_linecode(self, db: Session, nyid: str, linecode: str = None) -> Optional[LevelData]:
         """根据期数ID和线路编码获取水准数据"""
         return db.query(LevelData).filter(
-            LevelData.NYID == nyid,
-            LevelData.linecode == linecode
+            LevelData.NYID == nyid if nyid else True,
+            LevelData.linecode == linecode if linecode else True
         ).first()
 
+    def _check_settlement_exists(self, db: Session, nyid: str) -> bool:
+        """检查期数id沉降数据是否存在"""
+        settlement = db.query(SettlementData).filter(SettlementData.NYID == nyid).first()
+        return settlement is not None
+
     def batch_import_level_data(self, db: Session, data: List) -> Dict[str, Any]:
         """
         批量导入水准数据，根据期数ID和线路编码判断是否重复，重复数据改为更新操作
@@ -59,10 +65,17 @@ class LevelDataService(BaseService[LevelData]):
 
                 for item_data in data:
                     try:
+
+                        # 判断期数id沉降数据是否存在
+                        settlement = self._check_settlement_exists(db, item_data.get('NYID'))
+                        if not settlement:
+                            logger.error(f"Settlement {item_data.get('NYID')} not found")
+                            raise Exception(f"Settlement {item_data.get('NYID')} not found")
+
                         level_data = self.get_by_nyid_and_linecode(
                             db,
-                            item_data.get('NYID'),
-                            item_data.get('linecode')
+                            # item_data.get('linecode'),
+                            nyid=item_data.get('NYID')
                         )
                         if level_data:
                             # 更新操作