救灾资源

models/resource_provision_base.py

@@ -83,6 +83,10 @@ class Unit(Base):
     longitude = Column(Float, comment='经度')
     latitude = Column(Float, comment='纬度')
     is_delete = Column(Integer, comment='删除标识')
+    position = Column(String(100), comment='负责人职务')
+    team_size = Column(Integer, comment='队伍人数')
+    supervisor_unit = Column(String(100), comment='主管单位')
+
 
     def to_dict(self):
         return {
@@ -96,6 +100,9 @@ class Unit(Base):
             "contact_number": self.contact_number,
             "longitude": self.longitude,
             "latitude": self.latitude,
+            "position": self.position,  # 新增字段：负责人职务
+            "team_size": self.team_size,  # 新增字段：队伍人数
+            "supervisor_unit": self.supervisor_unit,  # 新增字段：主管单位
             # "is_delete": self.is_delete
         }
     class Config:
@@ -159,6 +166,7 @@ class RescueStation(Base):
     fid = Column(String(36), comment='主键')
     fwdzt = Column(String(1), comment='服务点状态')
     fwdaddr = Column(String(80), comment='服务点地址')
+    ssqx = Column(String(80), comment='所属区县') #新增
     is_delete = Column(Boolean, default=False, comment='删除标识')
 
     def to_dict(self):
@@ -182,6 +190,7 @@ class RescueStation(Base):
             "fid": self.fid,
             "fwdzt": self.fwdzt,
             "fwdaddr": self.fwdaddr,
+            "ssqx":self.ssqx
             # "is_delete": self.is_delete
         }
 
@@ -205,6 +214,7 @@ class DefenseProject(Base):
     jsdwdm = Column(String(100), comment='建设单位统一社会信用代码')
     kgsj = Column(DateTime, comment='开工时间')
     stdw = Column(String(100), comment='审图单位')
+    cd_batch = Column(String(100), comment='批次号') #新增
     rfsjdwdm = Column(String(100), comment='人防设计单位单位统一社会信用代码')
     rfsjdw = Column(String(100), comment='人防设计单位单位')
     ybrs = Column(Numeric, comment='掩蔽人数')
@@ -217,6 +227,10 @@ class DefenseProject(Base):
     data_area = Column(String(12), comment='数据区域')
     extend1 = Column(String(200), comment='扩展1')
     jgsj = Column(DateTime, comment='竣工时间')
+    rffhsbdw = Column(String(100), comment='人防防护设备单位')#新增
+    rffhsbdwdm = Column(String(100), comment='人防防护设备单位统一社会信用代码')#新增
+    jingdu = Column(Float, comment='经度')#新增
+    weidu = Column(Float, comment='纬度')#新增
     is_delete = Column(Boolean, default=False, comment='删除标识')
 
     def to_dict(self):
@@ -249,6 +263,11 @@ class DefenseProject(Base):
             "data_area": self.data_area,
             "extend1": self.extend1,
             "jgsj": self.jgsj.isoformat() if self.jgsj else None,
+            "cd_batch":self.cd_batch,
+            "rffhsbdw":self.rffhsbdw,
+            "rffhsbdwdm":self.rffhsbdwdm,
+            "jingdu":self.jingdu,
+            "weidu":self.weidu
             # "is_delete": self.is_delete,
         }
 

routers/api/resourceProvison/emergency_resources.py

@@ -52,6 +52,7 @@ class WaterResourceProjectListSchema(BaseModel):
 @router.post("/projects/")
 def create_projects(project_list_data: WaterResourceProjectListSchema, db: Session = Depends(get_db)):
     projects = project_list_data.projects
+    print(projects)
     if not projects:  # 确保列表不为空
         raise HTTPException(status_code=400, detail="项目列表不能为空")
     try:
@@ -160,7 +161,10 @@ class UnitSchema(BaseModel):
     responsible_person: str = None
     contact_number: str = None
     longitude: float = None
-    latitude: float = None
+    latitude: float = None,
+    position:str = None,
+    team_size:int = None,
+    supervisor_unit:str=None,
     is_delete: int = 0
 
 class UnitListSchema(BaseModel):
@@ -442,7 +446,8 @@ class RescueStationSchema(BaseModel):
     lxr: str = None
     fid: str = None
     fwdzt: str = None
-    fwdaddr: str = None
+    fwdaddr: str = None,
+    ssqx:str = None
     is_delete: int = 0
 
     class Config:
@@ -570,6 +575,7 @@ class DefenseProjectSchema(BaseModel):
     jsdwdm: Optional[str] = None
     kgsj: Optional[datetime] = None
     stdw: Optional[str] = None
+    cd_batch: Optional[str] = None
     rfsjdwdm: Optional[str] = None
     rfsjdw: Optional[str] = None
     ybrs: Optional[float] = None
@@ -582,6 +588,10 @@ class DefenseProjectSchema(BaseModel):
     data_area: Optional[str] = None
     extend1: Optional[str] = None
     jgsj: Optional[datetime] = None
+    rffhsbdw: Optional[str] = None
+    rffhsbdwdm: Optional[str] = None
+    jingdu: Optional[str] = None
+    weidu: Optional[str] = None
     is_delete: Optional[bool] = False
 
     class Config: