From 44ccca9262e9c3c913ee271bfa4072780f6a04da Mon Sep 17 00:00:00 2001 From: lhx Date: Wed, 15 Oct 2025 16:12:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=AD=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=9B=B4?= =?UTF-8?q?=E5=B2=A9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/section_data.py | 1 + app/schemas/comprehensive_data.py | 2 ++ app/services/section_data.py | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/section_data.py b/app/models/section_data.py index e2f1ffc..3f5c3d5 100644 --- a/app/models/section_data.py +++ b/app/models/section_data.py @@ -16,4 +16,5 @@ class SectionData(Base): compression_layer_thickness = Column(String(100), comment="压实层厚度") treatment_depth = Column(String(100), comment="处理深度") foundation_treatment_method = Column(String(100), comment="地基处理方法") + rock_mass_classification = Column(String(100), comment="围岩级别") section_id = Column(String(100), nullable=False, comment="断面id", index=True) \ No newline at end of file diff --git a/app/schemas/comprehensive_data.py b/app/schemas/comprehensive_data.py index b4ad2bd..e06d058 100644 --- a/app/schemas/comprehensive_data.py +++ b/app/schemas/comprehensive_data.py @@ -66,6 +66,7 @@ class SectionDataImportRequest(BaseModel): compression_layer_thickness: Optional[str] = None treatment_depth: Optional[str] = None foundation_treatment_method: Optional[str] = None + rock_mass_classification: Optional[str] = None # 原始数据查询请求 class OriginalDataQueryRequest(BaseModel): @@ -119,6 +120,7 @@ class SectionDataQueryRequest(BaseModel): compression_layer_thickness: Optional[str] = None treatment_depth: Optional[str] = None foundation_treatment_method: Optional[str] = None + rock_mass_classification: Optional[str] = None # 水准数据查询请求 class LevelDataQueryRequest(BaseModel): diff --git a/app/services/section_data.py b/app/services/section_data.py index a3f5bdd..8ba19be 100644 --- a/app/services/section_data.py +++ b/app/services/section_data.py @@ -80,6 +80,7 @@ class SectionDataService(BaseService[SectionData]): "compression_layer_thickness": section.compression_layer_thickness, "treatment_depth": section.treatment_depth, "foundation_treatment_method": section.foundation_treatment_method, + "rock_mass_classification": section.rock_mass_classification, "checkpoints": [ { "id": cp.id, @@ -241,6 +242,7 @@ class SectionDataService(BaseService[SectionData]): section.compression_layer_thickness = item_data.get('compression_layer_thickness') section.treatment_depth = item_data.get('treatment_depth') section.foundation_treatment_method = item_data.get('foundation_treatment_method') + section.rock_mass_classification = item_data.get('rock_mass_classification') logger.info(f"Updated section: {item_data.get('section_id')}") else: # 新增操作 @@ -257,7 +259,8 @@ class SectionDataService(BaseService[SectionData]): design_fill_height=item_data.get('design_fill_height'), compression_layer_thickness=item_data.get('compression_layer_thickness'), treatment_depth=item_data.get('treatment_depth'), - foundation_treatment_method=item_data.get('foundation_treatment_method') + foundation_treatment_method=item_data.get('foundation_treatment_method'), + rock_mass_classification=item_data.get('rock_mass_classification') ) db.add(section) logger.info(f"Created section: {item_data.get('section_id')}")