Merge remote-tracking branch 'origin/conding' into conding

PythonProject/api/teacher_api.py

@@ -9,7 +9,7 @@ from dao.teacher_dao import *
 teacher_api=APIRouter()
 
 @teacher_api.post("",response_model=Teacher_ResponseModel)
-def add_teacher1(teacher:Teacher_RequestModel,session=Depends(get_db())):
+def add_teacher1(teacher:Teacher_RequestModel,session=Depends(get_db)):
     d=teacher.model_dump()
     r=add_teacher(req=d,session=session)
     if not r:
@@ -18,16 +18,15 @@ def add_teacher1(teacher:Teacher_RequestModel,session=Depends(get_db())):
 
 
 @teacher_api.get("",response_model=Teacher_ResponseModel)
-def get_teacher(id:int,session=Depends(get_db)):
-    r = session.query(Teacher_Model).filter( Teacher_Model.teac_id == id ).all()
-    if r:
-        return [{'teac_name':i.teac_name,'teac_gender':i.teac_gender,'teac_age':i.teac_age,'teac_position':i.teac_position} for i in r]
-    raise HTTPException(status_code=404,detail='老师不存在！')
+def get_teacher(id: int, session=Depends(get_db)):
+    r = get_teacher(id=id, session=session)
+    if not r:
+        raise HTTPException(status_code=500, detail='查询异常！')
 
 
 @teacher_api.put("",response_model=Teacher_ResponseModel)
 def update_teacher1(id:int,teacher:Teacher_RequestModel,session=Depends(get_db)):
-    d=teacher.model_dump
+    d=teacher.model_dump()
     r=update_teacher(id=id,req=d,session=session)
     if not r:
         raise HTTPException(status_code=500, detail='更新异常！')

PythonProject/dao/teacher_dao.py

@@ -3,7 +3,7 @@ from model.all_model import Teacher_Model
 from util.database import *
 from schema.teacher_schema import Teacher_RequestModel
 
-def add_teacher(req:Teacher_RequestModel,session=Depends(get_db)):
+def add_teacher(req:Teacher_RequestModel,session):
     try:
         data=req.model_dump()
         session.add(Teacher_Model(**data))
@@ -12,14 +12,14 @@ def add_teacher(req:Teacher_RequestModel,session=Depends(get_db)):
         raise HTTPException(status_code=500,detail="添加异常！")
     return req.model_dump()
 
-def select_teacher(session=Depends(get_db)):
+def select_teacher(session):
     try:
         teacher_list=session.query(Teacher_Model).filter(Teacher_Model.delete_status==0).all()
         return teacher_list
     except:
         raise HTTPException(status_code=500,detail="查询异常！")
 
-def update_teacher(id:int,req:Teacher_RequestModel,session=Depends(get_db)):
+def update_teacher(id:int,req:Teacher_RequestModel,session):
     try:
         session.query(Teacher_Model).filter(Teacher_Model.teac_id==id)\
         .filter(Teacher_Model.delete_status==0).update(req.model_dump(exclude_unset=True))
@@ -27,7 +27,7 @@ def update_teacher(id:int,req:Teacher_RequestModel,session=Depends(get_db)):
     except:
         raise HTTPException(status_code=500,detail="更新异常！")
 
-def delete_teacher(id:int,session=Depends(get_db)):
+def delete_teacher(id:int,session):
     try:
         session.query(Teacher_Model).filter(Teacher_Model.teac_id==id,Teacher_Model.delete_status==0)\
             .update({'delete_status':1})

PythonProject/schema/teacher_schema.py

@@ -1,6 +1,6 @@
 from datetime import date
-
-from pydantic.v1 import BaseModel
+from pydantic import BaseModel
+# from pydantic.v1 import BaseModel
 from datetime import datetime
 
 class Teacher_RequestModel(BaseModel):