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-11-19 12:01:47 +08:00
parent cfff3e990f
commit e19ea35622
5 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/export_excel.py
View File

@@ -67,6 +67,14 @@ class ExportExcelService:
{"display_name": "工作基点名称序列", "model_class": LevelData, "field_name_in_model": "benchmarkids"},
{"display_name": "工作基点高程序列(m)", "model_class": LevelData, "field_name_in_model": "wsphigh"},
{"display_name": "水准_上传时间", "model_class": LevelData, "field_name_in_model": "createDate"},
{"display_name": "版本信息", "model_class": LevelData, "field_name_in_model": "wspversion"},
{"display_name": "气压值", "model_class": LevelData, "field_name_in_model": "barometric"},
{"display_name": "设备品牌", "model_class": LevelData, "field_name_in_model": "equipbrand"},
{"display_name": "仪器型号", "model_class": LevelData, "field_name_in_model": "instrumodel"},
{"display_name": "序列号", "model_class": LevelData, "field_name_in_model": "serialnum"},
{"display_name": "事件名称", "model_class": LevelData, "field_name_in_model": "sjname"},
{"display_name": "温度", "model_class": LevelData, "field_name_in_model": "temperature"},
{"display_name": "天气", "model_class": LevelData, "field_name_in_model": "weather"},
{"display_name": "备注", "model_class": SettlementData, "field_name_in_model": "upd_remark"}
]

20
app/services/level_data.py
View File

@@ -172,7 +172,15 @@ class LevelDataService(BaseService[LevelData]):
wsphigh=item.get('wsphigh'),
mtype=item.get('mtype'),
NYID=str(item.get('NYID')),
createDate=item.get('createDate')
createDate=item.get('createDate'),
wspversion=item.get('wspversion'),
barometric=str(item.get('barometric')) if item.get('barometric') is not None else None,
equipbrand=item.get('equipbrand'),
instrumodel=item.get('instrumodel'),
serialnum=item.get('serialnum'),
sjname=item.get('sjname'),
temperature=str(item.get('temperature')) if item.get('temperature') is not None else None,
weather=str(item.get('weather')) if item.get('weather') is not None else None
)
for item in batch
]
@@ -307,7 +315,15 @@ class LevelDataService(BaseService[LevelData]):
"wsphigh": level.wsphigh,
"NYID": level.NYID,
"mtype": level.mtype,
"createDate": level.createDate.strftime("%Y-%m-%d %H:%M:%S") if level.createDate else None
"createDate": level.createDate.strftime("%Y-%m-%d %H:%M:%S") if level.createDate else None,
"wspversion": level.wspversion,
"barometric": level.barometric,
"equipbrand": level.equipbrand,
"instrumodel": level.instrumodel,
"serialnum": level.serialnum,
"sjname": level.sjname,
"temperature": level.temperature,
"weather": level.weather
}
unique_level_data.append(level_dict)