查询数据1
This commit is contained in:
@@ -9,8 +9,11 @@ from ..schemas.comprehensive_data import (
|
||||
BatchLevelDataImportRequest,
|
||||
BatchOriginalDataImportRequest,
|
||||
DataImportResponse,
|
||||
ComprehensiveDataImportRequest,
|
||||
ComprehensiveDataImportResponse
|
||||
DataResponse,
|
||||
SectionDataQueryRequest,
|
||||
SettlementDataQueryRequest,
|
||||
OriginalDataQueryRequest,
|
||||
LevelDataQueryRequest
|
||||
)
|
||||
from ..services.section_data import SectionDataService
|
||||
from ..services.checkpoint import CheckpointService
|
||||
@@ -134,20 +137,30 @@ def batch_import_original_data(request: BatchOriginalDataImportRequest, db: Sess
|
||||
detail=f"批量导入原始数据失败: {str(e)}"
|
||||
)
|
||||
|
||||
# 保留原有接口以保持兼容性
|
||||
@router.post("/data_settlement_import", response_model=ComprehensiveDataImportResponse)
|
||||
def data_import(request: ComprehensiveDataImportRequest, db: Session = Depends(get_db)):
|
||||
"""导入综合数据 (兼容旧接口)"""
|
||||
try:
|
||||
logger.info("Using legacy data import interface")
|
||||
# 这里可以根据需要实现旧接口的兼容逻辑
|
||||
return ComprehensiveDataImportResponse(
|
||||
success=True,
|
||||
message="请使用新的批量导入接口"
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"Legacy data import failed: {str(e)}")
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||
detail=f"数据导入失败: {str(e)}"
|
||||
)
|
||||
# 查询断面数据对应观察点数据
|
||||
@router.post("/get_section", response_model = DataResponse)
|
||||
def get_section(request: SectionDataQueryRequest, db: Session = Depends(get_db)):
|
||||
"""获取断面数据 + 观测点"""
|
||||
section_service.search_section_data(db,
|
||||
id=request.id,
|
||||
section_id=request.section_id,
|
||||
mileage=request.mileage,
|
||||
work_site=request.work_site
|
||||
)
|
||||
|
||||
|
||||
|
||||
# 根据观测点id查询沉降数据
|
||||
@router.post("/get_section", response_model = DataResponse)
|
||||
def get_settlenment(request: SettlementDataQueryRequest, db: Session = Depends(get_db)):
|
||||
"""获取沉降数据"""
|
||||
|
||||
|
||||
# 查询水准数据
|
||||
@router.post("/get_level", response_model = DataResponse)
|
||||
def get_level(request: LevelDataQueryRequest, db: Session = Depends(get_db)):
|
||||
"""查询水准数据"""
|
||||
|
||||
# 根据期数id获取原始数据
|
||||
def get_original(request: OriginalDataQueryRequest, db: Session = Depends(get_db)):
|
||||
"""获取原始数据 + 水准数据"""
|
||||
|
||||
Reference in New Issue
Block a user