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

PythonProject/api/cla_api.py

@@ -0,0 +1,32 @@
+from fastapi import APIRouter, Depends
+from util.database import get_db
+from schema.cla_schema import claRequest
+from dao.cla_dao import add_class_dao,get_class_dao,update_class_dao,delete_class_dao,get_class_for_delete,hard_delete_class
+
+claAPI = APIRouter(prefix="/class", tags=["班级管理"])
+
+@claAPI.post("/class", summary="新增班级")
+def add_class(data: claRequest, Session = Depends(get_db)):
+    return add_class_dao(data, Session)
+
+@claAPI.get("/class/list", summary="查询班级")
+def list_class(Session = Depends(get_db)):
+    return get_class_dao(Session)
+
+@claAPI.put("/class/{class_id}", summary="更新班级信息")
+def update_class(class_id: int, data: claRequest, Session = Depends(get_db)):
+    return update_class_dao(class_id, data, Session)
+
+@claAPI.get("/class/{class_id}", summary="逻辑删除班级信息")
+def delete_class(class_id: int, Session = Depends(get_db)):
+    return delete_class_dao(class_id, Session)
+
+@claAPI.get("/class/delete/check/{class_id}", summary="硬删除前查询")
+def check_delete(class_id: int, Session = Depends(get_db)):
+    return get_class_for_delete(class_id, Session)
+
+@claAPI.delete("/class/delete/confirm/{class_id}", summary="删除班级信息")
+def confirm_delete(class_id: int, Session = Depends(get_db)):
+    return hard_delete_class(class_id, Session)
+
+

PythonProject/api/statistics_api.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter,Depends
 from dao.statistics_dao import select_all,select_age,select_score,select_avg_score,select_salary,select_days
 from schema.student_schema import StudentResponse
-from schema.statistics_schema import AllStuResponse,AvgDayResponse
+from schema.statistics_schema import AllStuResponse,AvgDayResponse,AcgScoreResponse
 from util.database import get_db
 
 StatisticsAPI = APIRouter()
@@ -21,10 +21,10 @@ def get_students(min_score:int|None=None,max_score:int|None=None,db=Depends(get_
     l = select_score(min_score,max_score,db)
     return [i for i in l]
 
-@StatisticsAPI.get("/avg_score",response_model=StudentResponse,tags=['统计分析模块'],summary='统计每次考试每个班级的平均分并排序')
+@StatisticsAPI.get("/avg_score",response_model=list[AcgScoreResponse],tags=['统计分析模块'],summary='统计每次考试每个班级的平均分并排序')
 def get_scores(db=Depends(get_db)):
     l = select_avg_score(db)
-    return [i for i in l]
+    return l
 
 @StatisticsAPI.get("/salary",response_model=list[StudentResponse],tags=['统计分析模块'],summary='统计薪资最高的前五名的学员信息')
 def get_scores(db=Depends(get_db)):
@@ -35,4 +35,3 @@ def get_scores(db=Depends(get_db)):
 def get_days(db=Depends(get_db)):
     l = select_days(db)
     return l
-

PythonProject/api/teacher_api.py

@@ -1,26 +1,30 @@
-from fastapi import APIRouter,HTTPException
+from fastapi import APIRouter,HTTPException,Depends
 from schema.teacher_schema import Teacher_ResponseModel, Teacher_RequestModel
-from dao.teacher_dao import *
+from dao.teacher_dao import add_teacher
+from util.database import get_db
 
 teacher_api=APIRouter()
 
-@teacher_api.post("/",response_model=Teacher_ResponseModel,tags=['教师基本信息管理模块'],summary='新增教师接口')
-def add_teacher(teacher:Teacher_RequestModel,session=Depends(get_db)):
-    d=teacher.model_dump()
-    r=add_teacher(req=d,session=session)
-    if not r:
+@teacher_api.post("/teachers",response_model=Teacher_ResponseModel,tags=['教师基本信息管理模块'],summary='新增教师接口')
+def get_teacher(x1:Teacher_RequestModel,session=Depends(get_db)):
+    y=add_teacher(x1.model_dump(),session)
+    if not y:
         raise HTTPException(status_code=500,detail='添加异常！')
-    return Teacher_ResponseModel(totals=1,data=d)
+    return x1
+
+@teacher_api.get("/teachers",tags=['教师基本信息管理模块'],summary='查询教师接口')
+def get_teacher(teacid:int, session=Depends(get_db)):
+    # r = get_teacher(id=id,session=session)
+    # if not r:
+    #     raise HTTPException(status_code=500, detail='查询异常！')
+    try:
+        l=get_teacher(teacid,session)
+        return {'code': 200,'msg':'查询成功','data':l}
+    except:
+        raise HTTPException(status_code=500,detail='数据库查询异常!')
 
 
-@teacher_api.get("/",response_model=Teacher_ResponseModel,tags=['教师基本信息管理模块'],summary='查询教师接口')
-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,tags=['教师基本信息管理模块'],summary='更新教师接口')
+@teacher_api.put("/teachers",response_model=Teacher_ResponseModel,tags=['教师基本信息管理模块'],summary='更新教师接口')
 def update_teacher(id:int,teacher:Teacher_RequestModel,session=Depends(get_db)):
     d=teacher.model_dump()
     r=update_teacher(id=id,req=d,session=session)
@@ -29,7 +33,7 @@ def update_teacher(id:int,teacher:Teacher_RequestModel,session=Depends(get_db)):
     return {'code': 200, 'totals': r, 'detail': '更新成功'}
 
 
-@teacher_api.delete("/",response_model=Teacher_ResponseModel,tags=['教师基本信息管理模块'],summary='删除教师接口')
+@teacher_api.delete("/teachers",response_model=Teacher_ResponseModel,tags=['教师基本信息管理模块'],summary='删除教师接口')
 def delete_teacher(id:int,session=Depends(get_db)):
     r=delete_teacher(id=id,session=session)
     if not r: