diff --git a/PythonProject/api/statistics_api.py b/PythonProject/api/statistics_api.py index 0135d31..82f81b7 100644 --- a/PythonProject/api/statistics_api.py +++ b/PythonProject/api/statistics_api.py @@ -1,20 +1,22 @@ -from fastapi import APIRouter +from fastapi import APIRouter,Depends from dao.statistics_dao import select_all,select_age,select_score from schema.student_schema import StudentResponse +from util.database import get_db -StudentAPI = APIRouter() +StatisticsAPI = APIRouter() -@StudentAPI.get("/age",response_model=StudentResponse,tags=['统计分析模块'],description='根据年龄查询学生信息') -def get_students(min_age:int|None=None,max_age:int|None=None): - l = select_age(min_age,max_age) +@StatisticsAPI.get("/age",response_model=list[StudentResponse],tags=['统计分析模块'],description='根据年龄查询学生信息') +def get_students(min_age:int|None=None,max_age:int|None=None,db=Depends(get_db)): + l = select_age(min_age,max_age,db) + print(l) + return l + +@StatisticsAPI.get("/all",response_model=StudentResponse,tags=['统计分析模块'],description='统计每个班级的学员总数和男女生总数') +def get_students(db=Depends(get_db)): + l = select_all(db) return [i for i in l] -@StudentAPI.get("/all",response_model=StudentResponse,tags=['统计分析模块'],description='统计每个班级的学员总数和男女生总数') -def get_students(): - l = select_all() +@StatisticsAPI.get("/score",response_model=StudentResponse,tags=['统计分析模块'],description='根据成绩查询学生信息') +def get_students(min_score:int|None=None,max_score:int|None=None,db=Depends(get_db)): + l = select_score(min_score,max_score,db) return [i for i in l] - -@StudentAPI.get("/score",response_model=StudentResponse,tags=['统计分析模块'],description='根据成绩查询学生信息') -def get_students(min_score:int|None=None,max_score:int|None=None): - l = select_score(min_score,max_score) - return [i for i in l] \ No newline at end of file diff --git a/PythonProject/dao/statistics_dao.py b/PythonProject/dao/statistics_dao.py index bb9c068..f0c3879 100644 --- a/PythonProject/dao/statistics_dao.py +++ b/PythonProject/dao/statistics_dao.py @@ -4,42 +4,42 @@ from model.all_model import Student_Model,WlScore from util.database import get_db # 实现根据年龄查询学生信息的功能 -def select_age(min_age,max_age,session=Depends(get_db)): +def select_age(min_age,max_age,db): try: if min_age is None and max_age is None: raise HTTPException(status_code=400, detail="请至少传入一个参数") - session = session.query(Student_Model) + db = db.query(Student_Model) if min_age is not None: - session = session.filter(Student_Model.age >= min_age,Student_Model.delete_status == 0) + db = db.filter(Student_Model.age >= min_age,Student_Model.delete_status == 0) if max_age is not None: - session = session.filter(Student_Model.age <= max_age,Student_Model.delete_status == 0) - return session.all() + db = db.filter(Student_Model.age <= max_age,Student_Model.delete_status == 0) + print(db.all()) + return db.all() except HTTPException: raise except Exception: raise HTTPException(status_code=500,detail="查询异常") # 实现统计每个班级的学员总数以及男女生的总数的功能 -def select_all(session=Depends(get_db)): - print('1234') +def select_all(db): try: - l1 = session.query(Student_Model.class_id,func.count(1)).group_by(Student_Model.class_id,Student_Model.gender).all() + l1 = db.query(Student_Model.class_id,func.count(1)).group_by(Student_Model.class_id,Student_Model.gender).all() return l1 except Exception: raise HTTPException(status_code=500,detail="查询异常") # 实现根据成绩查询学员信息的功能 -def select_score(min_score,max_score,session=Depends(get_db)): +def select_score(min_score,max_score,db): try: if min_score is None and max_score is None: raise HTTPException(status_code=400, detail="请至少传入一个参数") - session = session.query(Student_Model,WlScore.score,WlScore.score)\ + db = db.query(Student_Model,WlScore.score,WlScore.score)\ .join(WlScore,WlScore.stu_id == Student_Model.stu_id,WlScore.delete_status==0,WlScore.delete_status == 0) if min_score is not None: - session = session.filter(WlScore.score >= min_score) + db = db.filter(WlScore.score >= min_score) if min_score is not None: - session = session.filter(WlScore.score <= max_score) - return session.all() + db = db.filter(WlScore.score <= max_score) + return db.all() except HTTPException: raise except Exception: