增加沉降数据查询接口

app/api/comprehensive_data.py

@@ -13,6 +13,7 @@ from ..schemas.comprehensive_data import (
     SectionDataQueryRequest,
     SettlementDataQueryRequest,
     OriginalDataQueryRequest,
+    SettlementDataCheckpointQueryRequest,
     LevelDataQueryRequest
 )
 from ..services.section_data import SectionDataService
@@ -207,6 +208,40 @@ def get_settlement(request: SettlementDataQueryRequest, db: Session = Depends(ge
             detail=f"查询沉降数据失败: {str(e)}"
         )
 
+# 查询沉降数据+观测点数据
+@router.post("/get_settlement_checkpoint", response_model=DataResponse)
+def get_settlement_checkpoint(request: SettlementDataCheckpointQueryRequest, db: Session = Depends(get_db)):
+    """获取沉降数据+观测点数据，按上传时间倒序排序，支持limit参数限制返回数量"""
+    try:
+        logger.info(f"Querying settlement data with params: {request.dict()}")
+
+        # 调用服务层的业务方法
+        result_data = settlement_service.search_settlement_checkpoint_data_formatted(
+            db,
+            id=request.id,
+            point_id=request.point_id,
+            nyid=request.NYID,
+            sjName=request.sjName,
+            workinfoname=request.workinfoname,
+            linecode=request.linecode,
+            limit=request.limit
+        )
+
+        logger.info(f"Found {len(result_data)} settlement records")
+        return DataResponse(
+            success=True,
+            message="查询成功",
+            count=len(result_data),
+            data=result_data
+        )
+
+    except Exception as e:
+        logger.error(f"Query settlement data failed: {str(e)}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"查询沉降数据失败: {str(e)}"
+        )
+
 
 # 根据期数id获取原始数据
 @router.post("/get_original", response_model=DataResponse)