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

PythonProject/api/employment_api.py

@@ -2,28 +2,24 @@ from fastapi import APIRouter,Depends,HTTPException
 
 from dao import employment_dao
 from dao.employment_dao import get_employment_dao
-from schema.employment_schema import EmploymentRequest,EmploymentResponse
+from schema.employment_schema import EmploymentResponse
 from model.all_model import ClassManagement,Employment_info
 from util.database import get_db
-
-emp_api = APIRouter()
-@emp_api.get('employment/students/{stu_id}',response_model=EmploymentResponse,summary='获取学生就业信息')
+emp_api = APIRouter(tags=['学生就业管理系统'])
+@emp_api.get('/employment/students/{stu_id}',response_model=EmploymentResponse,summary='获取学生就业信息')
 def get_emp_info1(stu_id: int,db=Depends(get_db)):
-    try:
-        if stu_id:
-            return employment_dao.get_employment_info()
-    except:
-        raise HTTPException(status_code=404, detail='该学生就业信息不存在')
+    if stu_id:
+        return employment_dao.get_employment_dao(stu_id=stu_id,db=db)
+    raise HTTPException(status_code=404, detail='该学生就业信息不存在')
 
-@emp_api.get('employment/class/{class_id}',summary='获取班级学生就业信息')
+@emp_api.get('/employment/class/{class_id}',response_model=EmploymentResponse,summary='获取班级学生就业信息')
 def get_emp_info2(class_id: int,db=Depends(get_db)):
-    try:
-        if class_id:
-            return employment_dao.get_employment_info()
-    except:
-        raise HTTPException(status_code=404, detail='该班级就业信息不存在')
+    if class_id:
+        return employment_dao.get_employment_dao(class_id=class_id,db=db)
+    raise HTTPException(status_code=404, detail='该班级就业信息不存在')
 
-# @emp_api.post('employment/students/{stu_id}')
-# def create_emp_info(stu_id: int,db=Depends(get_db)):
-#     try:
-#     pass
+# @emp_api.post('/employment/students/{stu_id}')
+# def create_emp_info(stu_id: int,db=Depends(get_db),response_model=EmploymentResponse):
+#     if stu_id:
+#
+#         return employment_dao.

PythonProject/api/student_api.py

@@ -6,7 +6,7 @@ from util.database import get_db
 
 StudentAPI = APIRouter()
 
-@StudentAPI.get('/students',response_model=list[StudentPageResponse],tags=['学⽣基本信息管理模块'],description='查询学生信息')
+@StudentAPI.get('/students',response_model=list[StudentPageResponse],tags=['学⽣基本信息管理模块'],summary='学生信息查询接口',description='查询学生信息')
 def get_students(stu_id:int|None=None
                 ,stu_name:str|None=None
                 ,class_id:int|None=None
@@ -29,7 +29,7 @@ def get_students(stu_id:int|None=None
         , 'total': total
         , 'data': r}
 
-@StudentAPI.put('/{stu_id}',tags=['学⽣基本信息管理模块'])
+@StudentAPI.put('/{stu_id}',tags=['学⽣基本信息管理模块'],summary='学生信息更新接口',description='更新学生信息')
 def update_students(s:StudentRequest
                     ,stu_id:int
                     ,db=Depends(get_db)):
@@ -41,7 +41,7 @@ def update_students(s:StudentRequest
         raise HTTPException(status_code=500, detail='没有更新！')
     return {'code':200,'totals':r,'detail':'更新成功'}
 
-@StudentAPI.delete('/{stu_id}',tags=['学⽣基本信息管理模块'])
+@StudentAPI.delete('/{stu_id}',tags=['学⽣基本信息管理模块'],summary='学生信息删除接口',description='删除学生信息')
 def del_students(stu_id:int
                  ,db=Depends(get_db)):
     rows=delete_student_dao( stu_id=stu_id,db=db )
@@ -49,7 +49,7 @@ def del_students(stu_id:int
         raise HTTPException(status_code=500,detail='没有删除')
     return {'code':200,'totals':rows,'detail':'删除成功'}
 
-@StudentAPI.post('/students',tags=['学⽣基本信息管理模块'],response_model=StugetResponse)
+@StudentAPI.post('/students',tags=['学⽣基本信息管理模块'],response_model=StugetResponse,summary='学生信息新增接口',description='新增学生信息')
 def add_students(s:StudentRequest
                  ,db=Depends(get_db)):
     d=s.model_dump(exclude_unset=False)
@@ -57,16 +57,3 @@ def add_students(s:StudentRequest
     if not stu_new:
         raise HTTPException(status_code=500,detail='添加失败')
     return stu_new
-
-
-@StudentAPI.put('/students',tags=['学⽣基本信息管理模块'])
-def get_students(stu_id:int|None = None
-                 ,stu_name:str|None = None
-                 ,class_id:int|None=None
-                 ,db=Depends(get_db)
-                 ,page:int=1
-                 ,page_size:int=10):
-    r = get_student_dao(stu_id,stu_name,class_id,db,page,page_size )
-    if r:
-        return r
-    raise HTTPException(status_code=404,detail='学生不存在！')