admin/railway_cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据查询，账号字段增加

Browse Source
This commit is contained in:
lhx
2025-09-29 15:24:33 +08:00
parent 0c17772520
commit 8fe42e6fdd
7 changed files with 235 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/services/settlement_data.py
View File

@@ -24,13 +24,15 @@ class SettlementDataService(BaseService[SettlementData]):
).first()
def search_settlement_data(self, db: Session,
id: Optional[str] = None,
id: Optional[int] = None,
point_id: Optional[str] = None,
nyid: Optional[str] = None,
sjName: Optional[str] = None,
workinfoname: Optional[str] = None) -> List[SettlementData]:
"""根据多个条件搜索沉降数据"""
conditions = {}
if id is not None:
conditions["id"] = id
if point_id is not None:
conditions["point_id"] = point_id
if nyid is not None:
@@ -42,6 +44,43 @@ class SettlementDataService(BaseService[SettlementData]):
return self.search_by_conditions(db, conditions)
def search_settlement_data_formatted(self, db: Session,
id: Optional[int] = None,
point_id: Optional[str] = None,
nyid: Optional[str] = None,
sjName: Optional[str] = None,
workinfoname: Optional[str] = None) -> List[Dict[str, Any]]:
"""查询沉降数据并返回格式化结果"""
settlement_data = self.search_settlement_data(db, id, point_id, nyid, sjName, workinfoname)
result = []
for settlement in settlement_data:
settlement_dict = {
"id": settlement.id,
"point_id": settlement.point_id,
"CVALUE": settlement.CVALUE,
"MAVALUE": settlement.MAVALUE,
"MTIME_W": settlement.MTIME_W,
"NYID": settlement.NYID,
"PRELOADH": settlement.PRELOADH,
"PSTATE": settlement.PSTATE,
"REMARK": settlement.REMARK,
"WORKINFO": settlement.WORKINFO,
"createdate": settlement.createdate,
"day": settlement.day,
"day_jg": settlement.day_jg,
"isgzjdxz": settlement.isgzjdxz,
"mavalue_bc": settlement.mavalue_bc,
"mavalue_lj": settlement.mavalue_lj,
"sjName": settlement.sjName,
"useflag": settlement.useflag,
"workinfoname": settlement.workinfoname,
"upd_remark": settlement.upd_remark
}
result.append(settlement_dict)
return result
def _check_checkpoint_exists(self, db: Session, point_id: str) -> bool:
"""检查观测点数据是否存在"""
checkpoint = db.query(Checkpoint).filter(Checkpoint.point_id == point_id).first()