From 1cbea1bb2a193a40abb5a0c03992996bcbd5eaca Mon Sep 17 00:00:00 2001 From: lhx Date: Thu, 6 Nov 2025 11:00:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=86=E9=A1=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/comprehensive_data.py | 25 ++++++++++-------- app/schemas/comprehensive_data.py | 3 +++ app/services/base.py | 19 +++++++++++-- app/services/section_data.py | 44 ++++++++++++++++++++++++++----- app/services/settlement_data.py | 34 ++++++++++++++++++++---- 5 files changed, 100 insertions(+), 25 deletions(-) diff --git a/app/api/comprehensive_data.py b/app/api/comprehensive_data.py index 986b3f9..6917bae 100644 --- a/app/api/comprehensive_data.py +++ b/app/api/comprehensive_data.py @@ -197,10 +197,10 @@ def batch_import_original_data(request: BatchOriginalDataImportRequest, db: Sess # 查询断面数据对应观察点数据 @router.post("/get_section", response_model=DataResponse) def get_section(request: SectionDataQueryRequest, db: Session = Depends(get_db)): - """获取断面数据 + 观测点""" + """获取断面数据 + 观测点（支持分页）""" try: logger.info(f"Querying section data with params: {request.dict()}") - result_data = section_service.search_sections_with_checkpoints( + result = section_service.search_sections_with_checkpoints( db, id=request.id, section_id=request.section_id, @@ -208,15 +208,17 @@ def get_section(request: SectionDataQueryRequest, db: Session = Depends(get_db)) work_site=request.work_site, number=request.number, status=request.status, - account_id=request.account_id + account_id=request.account_id, + skip=request.skip, + limit=request.limit ) - logger.info(f"Found {len(result_data)} sections with checkpoints") + logger.info(f"Found {result['total']} sections with checkpoints, returning {len(result['data'])} records") return DataResponse( code=ResponseCode.SUCCESS, message="查询成功", - total=len(result_data), - data=result_data + total=result['total'], + data=result['data'] ) except Exception as e: logger.error(f"Query section data failed: {str(e)}") @@ -230,25 +232,26 @@ def get_section(request: SectionDataQueryRequest, db: Session = Depends(get_db)) # 根据观测点id查询沉降数据 @router.post("/get_settlement", response_model=DataResponse) def get_settlement(request: SettlementDataQueryRequest, db: Session = Depends(get_db)): - """获取沉降数据，按上传时间倒序排序，支持limit参数限制返回数量""" + """获取沉降数据，按上传时间倒序排序，支持分页参数（skip、limit）""" try: logger.info(f"Querying settlement data with params: {request.dict()}") - result_data = settlement_service.search_settlement_data_formatted( + result = settlement_service.search_settlement_data_formatted( db, id=request.id, point_id=request.point_id, nyid=request.NYID, sjName=request.sjName, workinfoname=request.workinfoname, + skip=request.skip, limit=request.limit ) - logger.info(f"Found {len(result_data)} settlement records") + logger.info(f"Found {result['total']} settlement records, returning {len(result['data'])} records") return DataResponse( code=ResponseCode.SUCCESS, message="查询成功", - total=len(result_data), - data=result_data + total=result['total'], + data=result['data'] ) except Exception as e: logger.error(f"Query settlement data failed: {str(e)}") diff --git a/app/schemas/comprehensive_data.py b/app/schemas/comprehensive_data.py index 297a193..4b6c668 100644 --- a/app/schemas/comprehensive_data.py +++ b/app/schemas/comprehensive_data.py @@ -109,6 +109,7 @@ class SettlementDataQueryRequest(BaseModel): isgzjdxz: Optional[str] = None upd_remark: Optional[str] = None limit: Optional[int] = None # 限制返回数量，None表示返回全部 + skip: Optional[int] = 0 # 跳过数量，用于分页，默认0 # 沉降数据查询请求——水准线路编码 class SettlementDataCheckpointQueryRequest(BaseModel): @@ -152,6 +153,8 @@ class SectionDataQueryRequest(BaseModel): foundation_treatment_method: Optional[str] = None rock_mass_classification: Optional[str] = None account_id: Optional[str] = None + limit: Optional[int] = None # 限制返回数量，None表示返回全部 + skip: Optional[int] = 0 # 跳过数量，用于分页，默认0 # 断面数据导入请求 class SectionByAccountRequest(BaseModel): account_id: Optional[str] = None diff --git a/app/services/base.py b/app/services/base.py index e2ddebc..45b4db6 100644 --- a/app/services/base.py +++ b/app/services/base.py @@ -52,7 +52,7 @@ class BaseService(Generic[ModelType]): return db.query(self.model).filter(field == field_value).all() return [] - def search_by_conditions(self, db: Session, conditions: Dict[str, Any]) -> List[ModelType]: + def search_by_conditions(self, db: Session, conditions: Dict[str, Any], skip: int = 0, limit: Optional[int] = None) -> List[ModelType]: """根据多个条件搜索记录""" query = db.query(self.model) for field_name, field_value in conditions.items(): @@ -62,4 +62,19 @@ class BaseService(Generic[ModelType]): query = query.filter(field.like(f"{field_value}")) else: query = query.filter(field == field_value) - return query.all() \ No newline at end of file + query = query.offset(skip) + if limit is not None: + query = query.limit(limit) + return query.all() + + def search_by_conditions_count(self, db: Session, conditions: Dict[str, Any]) -> int: + """根据多个条件搜索记录总数""" + query = db.query(self.model) + for field_name, field_value in conditions.items(): + if hasattr(self.model, field_name) and field_value is not None: + field = getattr(self.model, field_name) + if isinstance(field_value, str): + query = query.filter(field.like(f"{field_value}")) + else: + query = query.filter(field == field_value) + return query.count() \ No newline at end of file diff --git a/app/services/section_data.py b/app/services/section_data.py index e9122c4..ac3a0ea 100644 --- a/app/services/section_data.py +++ b/app/services/section_data.py @@ -22,7 +22,7 @@ class SectionDataService(BaseService[SectionData]): return sections[0] if sections else None def get_by_account_id(self, db: Session, account_id: str) -> Optional[SectionData]: """根据账号ID获取断面数据""" - accounts = self.get_by_field(db, "account_id", account_id) + accounts = self.get_by_field(db, "account_id", account_id) return accounts if accounts else None def get_by_number(self, db: Session, number: str) -> List[SectionData]: """根据桥梁墩(台)编号获取断面数据""" @@ -36,7 +36,9 @@ class SectionDataService(BaseService[SectionData]): number: Optional[str] = None, status: Optional[str] = None, basic_types: Optional[str] = None, - account_id: Optional[str] = None) -> List[SectionData]: + account_id: Optional[str] = None, + skip: int = 0, + limit: Optional[int] = None) -> List[SectionData]: """根据多个条件搜索断面数据""" conditions = {} if section_id is not None: @@ -56,7 +58,7 @@ class SectionDataService(BaseService[SectionData]): if account_id is not None: conditions['account_id'] = account_id - return self.search_by_conditions(db, conditions) + return self.search_by_conditions(db, conditions, skip, limit) def search_sections_with_checkpoints(self, db: Session, id: Optional[int] = None, @@ -65,9 +67,32 @@ class SectionDataService(BaseService[SectionData]): work_site: Optional[str] = None, number: Optional[str] = None, status: Optional[str] = None, - account_id: Optional[str] = None) -> List[Dict[str, Any]]: - """查询断面数据并返回带观测点的结果""" - sections = self.search_section_data(db, id, section_id, mileage, work_site, number, status, account_id=account_id) + account_id: Optional[str] = None, + skip: int = 0, + limit: Optional[int] = None) -> Dict[str, Any]: + """查询断面数据并返回带观测点的结果（支持分页）""" + # 构建查询条件 + conditions = {} + if section_id is not None: + conditions["section_id"] = section_id + if work_site is not None: + conditions["work_site"] = work_site + if number is not None: + conditions["number"] = number + if status is not None: + conditions["status"] = status + if id is not None: + conditions['id'] = id + if mileage is not None: + conditions['mileage'] = mileage + if account_id is not None: + conditions['account_id'] = account_id + + # 获取总数 + total_count = self.search_by_conditions_count(db, conditions) + + # 获取分页数据 + sections = self.search_by_conditions(db, conditions, skip, limit) result = [] for section in sections: @@ -101,7 +126,12 @@ class SectionDataService(BaseService[SectionData]): } result.append(section_dict) - return result + return { + "data": result, + "total": total_count, + "skip": skip, + "limit": limit + } def get_section_with_checkpoints(self, db: Session, section_id: str) -> Dict[str, Any]: """获取断面数据及其关联的观测点""" diff --git a/app/services/settlement_data.py b/app/services/settlement_data.py index fce813a..716beaa 100644 --- a/app/services/settlement_data.py +++ b/app/services/settlement_data.py @@ -37,6 +37,7 @@ class SettlementDataService(BaseService[SettlementData]): nyid: Optional[str] = None, sjName: Optional[str] = None, workinfoname: Optional[str] = None, + skip: int = 0, limit: Optional[int] = None) -> List[SettlementData]: """根据多个条件搜索沉降数据，按上传时间倒序排序""" query = db.query(SettlementData) @@ -55,7 +56,9 @@ class SettlementDataService(BaseService[SettlementData]): # 按上传时间倒序排序 query = query.order_by(SettlementData.createdate.desc()) - # 如果指定了limit，则限制返回数量 + # 添加分页支持 + if skip > 0: + query = query.offset(skip) if limit is not None and limit > 0: query = query.limit(limit) @@ -67,9 +70,25 @@ class SettlementDataService(BaseService[SettlementData]): nyid: Optional[str] = None, sjName: Optional[str] = None, workinfoname: Optional[str] = None, - limit: Optional[int] = None) -> List[Dict[str, Any]]: - """查询沉降数据并返回格式化结果，按上传时间倒序排序""" - settlement_data = self.search_settlement_data(db, id, point_id, nyid, sjName, workinfoname, limit) + skip: int = 0, + limit: Optional[int] = None) -> Dict[str, Any]: + """查询沉降数据并返回格式化结果，按上传时间倒序排序（支持分页）""" + # 先获取总数（不计分页） + count_query = db.query(SettlementData) + if id is not None: + count_query = count_query.filter(SettlementData.id == id) + if point_id is not None: + count_query = count_query.filter(SettlementData.point_id == point_id) + if nyid is not None: + count_query = count_query.filter(SettlementData.NYID == nyid) + if sjName is not None: + count_query = count_query.filter(SettlementData.sjName == sjName) + if workinfoname is not None: + count_query = count_query.filter(SettlementData.workinfoname == workinfoname) + total_count = count_query.count() + + # 获取分页数据 + settlement_data = self.search_settlement_data(db, id, point_id, nyid, sjName, workinfoname, skip, limit) result = [] for settlement in settlement_data: @@ -97,7 +116,12 @@ class SettlementDataService(BaseService[SettlementData]): } result.append(settlement_dict) - return result + return { + "data": result, + "total": total_count, + "skip": skip, + "limit": limit + } def search_settlement_checkpoint_data_formatted(self, db: Session, id: Optional[int] = None,