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

PythonProject/api/employment_api.py

@@ -31,13 +31,13 @@ def get_emp_info2(stu_id:int = Path(description='学生编号')
         raise HTTPException(status_code=404,detail='该学生就业信息不存在！')
     return l1
 
-@emp_api.post('/employment/students/{stu_id}',response_model=EmploymentResponse,summary='新增学生就业信息')
+@emp_api.post('/employment/student/{stu_id}',summary='新增学生就业信息')
 def create_emp_info(emp:EmploymentRequest=Form(),db=Depends(get_db)):
     d=emp.model_dump(exclude_unset=False)
     r=add_emp_dao(d,db)
     if not r:
         raise HTTPException(status_code=500,detail='服务器繁忙，请稍后添加！')
-    return r
+    return {'code':200,'detail':'插入成功！'}
 
 @emp_api.put('/employment/students/{stu_id}',summary='更新学生就业信息')
 def update_emp_info(stu_id:int,emp:UpdateEmpRequest,db=Depends(get_db)):

PythonProject/api/student_api.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter,HTTPException,Depends
+from fastapi import APIRouter, HTTPException, Depends, Query, Path
 from dao.student_dao import *
 from schema.student_schema import *
 from util.database import get_db
@@ -6,24 +6,6 @@ from util.database import get_db
 
 StudentAPI = APIRouter(tags=['学生基本信息管理模块'])
 
-@StudentAPI.get('/students',response_model=StuPageResponse,summary='学生信息查询接口',description='查询学生信息')
-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, total = get_student_dao(stu_id=stu_id
-                               ,stu_name=stu_name
-                               ,class_id=class_id
-                               ,page=page
-                               ,page_size=page_size
-                               ,db=db)
-    return StuPageResponse(page=page,
-                               page_size=page_size,
-                               totals=total,
-                               data=r)
-
 @StudentAPI.post('/students',response_model=StugetResponse,summary='学生信息新增接口',description='新增学生信息')
 def add_students(s:StudentRequest
                  ,db=Depends(get_db)):
@@ -37,6 +19,24 @@ def add_students(s:StudentRequest
         raise HTTPException(status_code=500, detail='添加失败，请稍后重试')
     return r
 
+@StudentAPI.get('/students',response_model=StuPageResponse,summary='学生信息查询接口',description='查询学生信息')
+def get_students(stu_id:int=Query(None,description='学生id')
+                ,stu_name:str=Query(None,description='学生姓名')
+                ,class_id:int=Query(None,description='班级编号')
+                ,db=Depends(get_db)
+                ,page:int=Query(None,description='页数')
+                ,page_size:int=Query(None,description='行数')):
+    r, total = get_student_dao(stu_id=stu_id
+                               ,stu_name=stu_name
+                               ,class_id=class_id
+                               ,page=page
+                               ,page_size=page_size
+                               ,db=db)
+    return StuPageResponse(page=page
+                           ,page_size=page_size
+                           ,totals=total
+                           ,data=r)
+
 @StudentAPI.put('/students/{stu_id}',summary='学生信息更新接口',description='更新学生信息')
 def update_students(stu_id:int
                     ,s:StuUpdateRequest
@@ -53,7 +53,7 @@ def update_students(stu_id:int
     return {'code':200,'totals':r,'detail':'更新成功'}
 
 @StudentAPI.delete('/students/{stu_id}',response_model= StudelResponse,summary='学生信息删除接口',description='删除学生信息')
-def del_students(stu_id:int
+def del_students(stu_id:int= Path(description='班级编号')
                  ,db=Depends(get_db)):
     rows=delete_student_dao( stu_id=stu_id,db=db )
     if not rows: