数据查询，账号字段增加

app/api/comprehensive_data.py

@@ -20,6 +20,7 @@ from ..services.checkpoint import CheckpointService
 from ..services.settlement_data import SettlementDataService
 from ..services.level_data import LevelDataService
 from ..services.original_data import OriginalDataService
+from ..services.comprehensive import ComprehensiveDataService
 import logging
 
 router = APIRouter(prefix="/comprehensive_data", tags=["综合数据管理"])
@@ -31,6 +32,7 @@ checkpoint_service = CheckpointService()
 settlement_service = SettlementDataService()
 level_service = LevelDataService()
 original_service = OriginalDataService()
+comprehensive_service = ComprehensiveDataService()
 
 @router.post("/batch_import_sections", response_model=DataImportResponse)
 def batch_import_sections(request: BatchSectionDataImportRequest, db: Session = Depends(get_db)):
@@ -138,45 +140,101 @@ def batch_import_original_data(request: BatchOriginalDataImportRequest, db: Sess
         )
 
 # 查询断面数据对应观察点数据
-@router.post("/get_section", response_model = DataResponse)
+@router.post("/get_section", response_model=DataResponse)
 def get_section(request: SectionDataQueryRequest, db: Session = Depends(get_db)):
     """获取断面数据 + 观测点"""
-    data = section_service.search_section_data(db, 
-                                        id=request.id,
-                                        section_id=request.section_id,
-                                        mileage=request.mileage,
-                                        work_site=request.work_site
-                                        )
-    
+    try:
+        logger.info(f"Querying section data with params: {request.dict()}")
+
+        # 调用服务层的业务方法
+        result_data = section_service.search_sections_with_checkpoints(
+            db,
+            id=request.id,
+            section_id=request.section_id,
+            mileage=request.mileage,
+            work_site=request.work_site,
+            number=request.number,
+            status=request.status
+        )
+
+        logger.info(f"Found {len(result_data)} sections with checkpoints")
+        return DataResponse(
+            success=True,
+            message="查询成功",
+            count=len(result_data),
+            data=result_data
+        )
+
+    except Exception as e:
+        logger.error(f"Query section data failed: {str(e)}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"查询断面数据失败: {str(e)}"
+        )
 
 
 # 根据观测点id查询沉降数据
-@router.post("/get_section", response_model = DataResponse)
-def get_settlenment(request: SettlementDataQueryRequest, db: Session = Depends(get_db)):
+@router.post("/get_settlement", response_model=DataResponse)
+def get_settlement(request: SettlementDataQueryRequest, db: Session = Depends(get_db)):
     """获取沉降数据"""
-    data = settlement_service.search_settlement_data(db,
-                                              id=request.id,
-                                              point_id=request.point_id,
-                                              nyid=request.NYID,
-                                              sjName=request.sjName,
-                                              workinfoname=request.workinfoname
-                                              )
+    try:
+        logger.info(f"Querying settlement data with params: {request.dict()}")
+
+        # 调用服务层的业务方法
+        result_data = settlement_service.search_settlement_data_formatted(
+            db,
+            id=request.id,
+            point_id=request.point_id,
+            nyid=request.NYID,
+            sjName=request.sjName,
+            workinfoname=request.workinfoname
+        )
+
+        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)}"
+        )
 
-# 查询水准数据
-# @router.post("/get_level", response_model = DataResponse)
-# def get_level(request: LevelDataQueryRequest, db: Session = Depends(get_db)):
-#     """查询水准数据"""
-#     data = level_service.search_level_data(db,
-#                                            id=request.id,
-#                                             linecode=request.linecode,
-#                                             nyid=request.NYID
-#                                            )
 
 # 根据期数id获取原始数据
+@router.post("/get_original", response_model=DataResponse)
 def get_original(request: OriginalDataQueryRequest, db: Session = Depends(get_db)):
     """获取水准数据+原始数据"""
-    data = level_service.search_level_data(db,
-                                            id=request.id,
-                                            nyid=request.NYID,
-                                            linecode=request.linecode
-                                            )
+    try:
+        logger.info(f"Querying original data with params: {request.dict()}")
+
+        # 调用综合服务的业务方法
+        result = comprehensive_service.get_level_and_original_data(
+            db,
+            id=request.id,
+            bfpcode=request.bfpcode,
+            bffb=request.bffb,
+            nyid=request.NYID,
+            linecode=request.linecode,
+            bfpl=request.bfpl
+        )
+
+        logger.info(f"Found level and original data: {result['summary']}")
+        return DataResponse(
+            success=result["success"],
+            message=result["message"],
+            count=result["count"],
+            data=[result["data"]]
+        )
+
+    except Exception as e:
+        logger.error(f"Query original data failed: {str(e)}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"查询原始数据失败: {str(e)}"
+        )