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

工况接口返回数据新增测点名称

Browse Source
This commit is contained in:
whm
2025-10-30 15:07:33 +08:00
parent 7033dae613
commit 04746300eb
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/services/settlement_data.py
View File

@@ -383,10 +383,11 @@ class SettlementDataService(BaseService[SettlementData]):
target_nyids = [item.NYID for item in top_nyids]
# 2. 关联查询：沉降数据 → 观测点表 → 断面表（使用模型类名，而非表名）
# 2. 关联查询：沉降数据 → 观测点表 → 断面表（新增查询Checkpoint.aname）
settlement_records = db.query(
SettlementData,
Checkpoint.section_id, # 从Checkpoint模型获取section_id
Checkpoint.aname, # 新增：从Checkpoint模型获取测点名称aname
SectionData.work_site # 从SectionData模型获取work_site
)\
.join(
@@ -406,11 +407,11 @@ class SettlementDataService(BaseService[SettlementData]):
)\
.all()
# 3. 转换数据并新增work_type字段
# 3. 转换数据并新增字段
settlement_data = []
for record in settlement_records:
# 解析查询结果（元组：(沉降数据实例, section_id, work_site)）
settlement, section_id, work_site = record
# 解析查询结果（元组：(沉降数据实例, section_id, aname, work_site)）
settlement, section_id, aname, work_site = record
# 根据work_site判断work_type（默认0表示未匹配或无数据）
work_type = 0
@@ -423,13 +424,14 @@ class SettlementDataService(BaseService[SettlementData]):
elif "桥" in work_site_str:
work_type = 3
# 组装返回字典（包含新增字段）
# 组装返回字典（新增aname字段）
record_dict = {
"id": settlement.id,
"point_id": settlement.point_id,
"section_id": section_id, # 新增：观测点关联的断面ID
"work_site": work_site, # 新增：断面的工点信息
"work_type": work_type, # 新增：工点类型编码（1-隧道，2-区间路基，3-桥）
"aname": aname, # 新增：测点名称（从Checkpoint表获取）
"section_id": section_id, # 新增：观测点关联的断面ID
"work_site": work_site, # 新增：断面的工点信息
"work_type": work_type, # 新增：工点类型编码（1-隧道，2-区间路基，3-桥）
"CVALUE": settlement.CVALUE,
"MAVALUE": settlement.MAVALUE,
"MTIME_W": settlement.MTIME_W.strftime("%Y-%m-%d %H:%M:%S") if settlement.MTIME_W else None,