Ver código fonte

250309-2代码。

baoyubo 2 meses atrás
pai
commit
f6fc6d1014
1 arquivos alterados com 19 adições e 19 exclusões
  1. 19 19
      routers/api/resourceProvison/emergency_resources.py

+ 19 - 19
routers/api/resourceProvison/emergency_resources.py

@@ -50,7 +50,7 @@ class WaterResourceProjectListSchema(BaseModel):
         orm_mode = True
 #插入数据
 @router.post("/projects/")
-def create_projects(project_list_data: WaterResourceProjectListSchema, db: Session = Depends(get_db)):
+def create_projects(project_list_data: WaterResourceProjectListSchema, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     projects = project_list_data.projects
     if not projects:  # 确保列表不为空
         raise HTTPException(status_code=400, detail="项目列表不能为空")
@@ -331,7 +331,7 @@ def delete_rescue_personnel(personnel_id: int,
 # 查询列表
 @router.get("/rescue_personnel/")
 def get_rescue_personnel(page: int = Query(default=1, gt=0),
-                 pageSize: int = Query(default=10, gt=0), db: Session = Depends(get_db)):
+                 pageSize: int = Query(default=10, gt=0), db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     # 应用过滤条件,仅查询未被删除的人员
     data_query = db.query(RescuePersonnel).filter(RescuePersonnel.is_delete == 0)
 
@@ -372,7 +372,7 @@ def get_rescue_personnel(page: int = Query(default=1, gt=0),
 
 #查询详情
 @router.get("/rescue_personnel/{personnel_id}/")
-def get_rescue_personnel_by_id(personnel_id: int, db: Session = Depends(get_db)):
+def get_rescue_personnel_by_id(personnel_id: int, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     # unit = db.query(Unit).filter_by(id=unit_id, is_delete=0).first()
     personnel = db.query(RescuePersonnel).filter_by(id = personnel_id, is_delete = 0).first()
 
@@ -406,7 +406,7 @@ def get_rescue_personnel_by_id(personnel_id: int, db: Session = Depends(get_db))
 
 #修改
 @router.put("/rescue_personnel/{personnel_id}/")
-def update_rescue_personnel(personnel_id: int, update_data: RescuePersonnelSchema, db: Session = Depends(get_db)):
+def update_rescue_personnel(personnel_id: int, update_data: RescuePersonnelSchema, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     personnel = db.query(RescuePersonnel).filter_by(id=personnel_id, is_delete=0).first()
     if not personnel:
         raise HTTPException(status_code=404, detail="救灾人员不存在或已被标记为删除")
@@ -464,7 +464,7 @@ class RescueStationListSchema(BaseModel):
 
 #救助站管理
 @router.post("/rescue_stations/")
-def create_rescue_stations(rescue_station_list_data: RescueStationListSchema, db: Session = Depends(get_db)):
+def create_rescue_stations(rescue_station_list_data: RescueStationListSchema, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     stations = rescue_station_list_data.stations
     if not stations:  # 确保列表不为空
         raise HTTPException(status_code=400, detail="救助站列表不能为空")
@@ -485,7 +485,7 @@ def create_rescue_stations(rescue_station_list_data: RescueStationListSchema, db
 
 
 @router.delete("/rescue_stations/{station_id}/")
-def delete_rescue_station(station_id: int, db: Session = Depends(get_db)):
+def delete_rescue_station(station_id: int, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     station = db.query(RescueStation).filter_by(id=station_id, is_delete=0).first()
     if not station:
         raise HTTPException(status_code=404, detail="救助站不存在")
@@ -504,7 +504,7 @@ def delete_rescue_station(station_id: int, db: Session = Depends(get_db)):
 
 @router.get("/rescue_stations/")
 def get_rescue_stations(page: int = Query(default=1, gt=0),
-                 pageSize: int = Query(default=10, gt=0), db: Session = Depends(get_db)):
+                 pageSize: int = Query(default=10, gt=0), db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     # 应用过滤条件,仅查询未被删除的救助站
     data_query = db.query(RescueStation).filter(RescueStation.is_delete == 0)
 
@@ -531,7 +531,7 @@ def get_rescue_stations(page: int = Query(default=1, gt=0),
     return result
 
 @router.get("/rescue_stations/{station_id}/")
-def get_rescue_station_by_id(station_id: int, db: Session = Depends(get_db)):
+def get_rescue_station_by_id(station_id: int, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     station = db.query(RescueStation).filter_by(id=station_id, is_delete=0).first()
 
     if not station:
@@ -539,7 +539,7 @@ def get_rescue_station_by_id(station_id: int, db: Session = Depends(get_db)):
     return {"code": 200, "msg": "查询成功", "station": station.to_dict()}
 
 @router.put("/rescue_stations/{station_id}/")
-def update_rescue_station(station_id: int, update_data: RescueStationSchema, db: Session = Depends(get_db)):
+def update_rescue_station(station_id: int, update_data: RescueStationSchema, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     station = db.query(RescueStation).filter_by(id=station_id, is_delete=0).first()
     if not station:
         raise HTTPException(status_code=404, detail="救助站不存在或已被标记为删除")
@@ -607,7 +607,7 @@ class DefenseProjectListSchema(BaseModel):
 
 # 创建
 @router.post("/defense_projects/")
-def create_defense_projects(defense_project_list_data: DefenseProjectListSchema, db: Session = Depends(get_db)):
+def create_defense_projects(defense_project_list_data: DefenseProjectListSchema, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     projects = defense_project_list_data.projects
     if not projects:  # 确保列表不为空
         raise HTTPException(status_code=400, detail="项目列表不能为空")
@@ -626,7 +626,7 @@ def create_defense_projects(defense_project_list_data: DefenseProjectListSchema,
 
 # 删除
 @router.delete("/defense_projects/{project_id}/")
-def delete_defense_project(project_id: int, db: Session = Depends(get_db)):
+def delete_defense_project(project_id: int, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     # project = db.query(DefenseProject).get(project_id)
     project = db.query(DefenseProject).filter_by(id=project_id, is_delete=0).first()
 
@@ -650,7 +650,7 @@ class DefenseProjectListQueryParams(BaseModel):
     # page_size: int = Query(10, gt=0, description='pageSize'),
 @router.get("/defense_projects/")
 def get_defense_projects(page: int = Query(default=1, gt=0),
-                 pageSize: int = Query(default=10, gt=0), db: Session = Depends(get_db)):
+                 pageSize: int = Query(default=10, gt=0), db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     # 应用过滤条件,仅查询未被删除的项目
     data_query = db.query(DefenseProject).filter(DefenseProject.is_delete == False)
 
@@ -678,7 +678,7 @@ def get_defense_projects(page: int = Query(default=1, gt=0),
 
 # 查询详情
 @router.get("/defense_projects/{project_id}/")
-def get_defense_project_by_id(project_id: int, db: Session = Depends(get_db)):
+def get_defense_project_by_id(project_id: int, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     # project = db.query(DefenseProject).filter_by(id=project_id, is_delete=0).first()
     project = db.query(DefenseProject).filter_by(id=project_id, is_delete=0).first()
 
@@ -688,7 +688,7 @@ def get_defense_project_by_id(project_id: int, db: Session = Depends(get_db)):
 
 # 修改
 @router.put("/defense_projects/{project_id}/")
-def update_defense_project(project_id: int, update_data: DefenseProjectSchema, db: Session = Depends(get_db)):
+def update_defense_project(project_id: int, update_data: DefenseProjectSchema, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     project = db.query(DefenseProject).filter_by(id=project_id, is_delete=False).first()
     if not project:
         raise HTTPException(status_code=404, detail="项目不存在或已被标记为删除")
@@ -736,7 +736,7 @@ class ShelterListSchema(BaseModel):
 
 # 创建
 @router.post("/shelters/")
-def create_shelters(shelter_list_data: ShelterListSchema, db: Session = Depends(get_db)):
+def create_shelters(shelter_list_data: ShelterListSchema, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     shelters = shelter_list_data.shelters
     if not shelters:
         raise HTTPException(status_code=400, detail="避难场所列表不能为空")
@@ -755,7 +755,7 @@ def create_shelters(shelter_list_data: ShelterListSchema, db: Session = Depends(
 
 # 删除
 @router.delete("/shelters/{shelter_id}/")
-def delete_shelter(shelter_id: int, db: Session = Depends(get_db)):
+def delete_shelter(shelter_id: int, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     shelter = db.query(Shelter).filter_by(id=shelter_id, is_delete=0).first()
     if not shelter:
         raise HTTPException(status_code=404, detail="避难场所不存在")
@@ -772,7 +772,7 @@ def delete_shelter(shelter_id: int, db: Session = Depends(get_db)):
 
 @router.get("/shelters/")
 def get_shelters(page: int = Query(default=1, gt=0),
-                 pageSize: int = Query(default=10, gt=0), db: Session = Depends(get_db)):
+                 pageSize: int = Query(default=10, gt=0), db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     data_query = db.query(Shelter).filter(Shelter.is_delete == False)
     total_count = data_query.count()
     offset = (page - 1) * pageSize
@@ -791,7 +791,7 @@ def get_shelters(page: int = Query(default=1, gt=0),
 
 # 查询详情
 @router.get("/shelters/{shelter_id}/")
-def get_shelter_by_id(shelter_id: int, db: Session = Depends(get_db)):
+def get_shelter_by_id(shelter_id: int, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     shelter = db.query(Shelter).filter_by(id=shelter_id, is_delete=0).first()
     if not shelter:
         raise HTTPException(status_code=404, detail="避难场所不存在或已被标记为删除")
@@ -799,7 +799,7 @@ def get_shelter_by_id(shelter_id: int, db: Session = Depends(get_db)):
 
 # 修改
 @router.put("/shelters/{shelter_id}/")
-def update_shelter(shelter_id: int, update_data: ShelterSchema, db: Session = Depends(get_db)):
+def update_shelter(shelter_id: int, update_data: ShelterSchema, db: Session = Depends(get_db), user_id=Depends(valid_access_token)):
     shelter = db.query(Shelter).filter_by(id=shelter_id, is_delete=False).first()
     if not shelter:
         raise HTTPException(status_code=404, detail="避难场所不存在或已被标记为删除")