diff --git a/PythonProject/api/statistics_api.py b/PythonProject/api/statistics_api.py index c1804ef..f82bdd3 100644 --- a/PythonProject/api/statistics_api.py +++ b/PythonProject/api/statistics_api.py @@ -1,43 +1,41 @@ from fastapi import APIRouter,Depends,Query from dao.statistics_dao import * -from schema.student_schema import StudentResponse from schema.statistics_schema import * from util.database import get_db -StatisticsAPI = APIRouter() +StatisticsAPI = APIRouter(tags=['统计分析模块']) -@StatisticsAPI.get("/age",response_model=list[StudentResponse],tags=['统计分析模块'],summary='根据年龄查询学生信息') +@StatisticsAPI.get("/age",response_model=list[StudentResponse],summary='根据年龄查询学生信息') def get_students(min_age:int|None=Query(None,ge=0,le=150),max_age:int|None=Query(None,ge=0,le=150),db=Depends(get_db)): l = select_age(min_age,max_age,db) return l -@StatisticsAPI.get("/all",response_model=list[AllStuResponse],tags=['统计分析模块'],summary='统计每个班级的学员总数和男女生总数') +@StatisticsAPI.get("/all",response_model=list[AllStuResponse],summary='统计每个班级的学员总数和男女生总数') def get_students(db=Depends(get_db)): l = select_all(db) return l -@StatisticsAPI.get("/score",response_model=StudentResponse,tags=['统计分析模块'],summary='根据成绩查询学生信息') +@StatisticsAPI.get("/score",response_model=list[GetScoreResponse],summary='根据成绩查询学生信息') 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] + return l -@StatisticsAPI.get("/avg_score",response_model=list[AcgScoreResponse],tags=['统计分析模块'],summary='统计每次考试每个班级的平均分并排序') +@StatisticsAPI.get("/avg_score",response_model=list[AcgScoreResponse],summary='统计每次考试每个班级的平均分并排序') def get_scores(db=Depends(get_db)): l = select_avg_score(db) return l -@StatisticsAPI.get("/salary",response_model=list[StudentResponse],tags=['统计分析模块'],summary='统计薪资最高的前五名的学员信息') +@StatisticsAPI.get("/salary",response_model=list[GetStuResponse],summary='统计薪资最高的前五名的学员信息') def get_scores(db=Depends(get_db)): l = select_salary(db) return l -@StatisticsAPI.get("/avg_day",response_model=list[AvgDayResponse],tags=['统计分析模块'],summary='统计每个班级的平均就业时长') +@StatisticsAPI.get("/avg_day",response_model=list[AvgDayResponse],summary='统计每个班级的平均就业时长') def get_days(db=Depends(get_db)): - l = select_days(db) + l = select_avg_days(db) return l - -@StatisticsAPI.get('/emp',response_model=AllEmpResponse,tags=['统计分析模块'],summary='统计每个学生的就业时长') +@StatisticsAPI.get('/emp',response_model=AllEmpResponse,summary='统计每个学生的就业时长') def get_emp(db=Depends(get_db)): - l= select_days2(db) - return l \ No newline at end of file + l= select_days(db) + return l diff --git a/PythonProject/api/student_api.py b/PythonProject/api/student_api.py index 981de80..3ef4333 100644 --- a/PythonProject/api/student_api.py +++ b/PythonProject/api/student_api.py @@ -4,9 +4,9 @@ from schema.student_schema import * from util.database import get_db -StudentAPI = APIRouter() +StudentAPI = APIRouter(tags=['学⽣基本信息管理模块']) -@StudentAPI.get('/students',response_model=StudentPageResponse,tags=['学⽣基本信息管理模块'],summary='学生信息查询接口',description='查询学生信息') +@StudentAPI.get('/students',response_model=StudentPageResponse,summary='学生信息查询接口',description='查询学生信息') def get_students(stu_id:int|None=None ,stu_name:str|None=None ,class_id:int|None=None @@ -27,7 +27,7 @@ def get_students(stu_id:int|None=None totals=total, data=r) -@StudentAPI.put('/{stu_id}',tags=['学⽣基本信息管理模块'],summary='学生信息更新接口',description='更新学生信息') +@StudentAPI.put('/{stu_id}',summary='学生信息更新接口',description='更新学生信息') def update_students(s:StudentRequest ,stu_id:int ,db=Depends(get_db)): @@ -39,7 +39,7 @@ def update_students(s:StudentRequest raise HTTPException(status_code=500, detail='没有更新！') return {'code':200,'totals':r,'detail':'更新成功'} -@StudentAPI.delete('/{stu_id}',tags=['学⽣基本信息管理模块'],summary='学生信息删除接口',description='删除学生信息') +@StudentAPI.delete('/{stu_id}',summary='学生信息删除接口',description='删除学生信息') def del_students(stu_id:int ,db=Depends(get_db)): rows=delete_student_dao( stu_id=stu_id,db=db ) @@ -47,7 +47,7 @@ def del_students(stu_id:int raise HTTPException(status_code=404,detail='对象已被删除') return {'code':200,'totals':rows,'detail':'删除成功'} -@StudentAPI.post('/students',tags=['学⽣基本信息管理模块'],response_model=StugetResponse,summary='学生信息新增接口',description='新增学生信息') +@StudentAPI.post('/students',response_model=StugetResponse,summary='学生信息新增接口',description='新增学生信息') def add_students(s:StudentRequest ,db=Depends(get_db)): d=s.model_dump(exclude_unset=True) diff --git a/PythonProject/api/teacher_api.py b/PythonProject/api/teacher_api.py index 95f2dad..0fab498 100644 --- a/PythonProject/api/teacher_api.py +++ b/PythonProject/api/teacher_api.py @@ -6,16 +6,16 @@ from dao.teacher_dao import update_teacher from dao.teacher_dao import delete_teacher from dao.teacher_dao import get_teacher -teacher_api=APIRouter() +teacher_api=APIRouter(tags=['教师基本信息管理模块']) -@teacher_api.post("/teachers",response_model=Teacher_ResponseModel,tags=['教师基本信息管理模块'],summary='新增教师接口') +@teacher_api.post("/teachers",response_model=Teacher_ResponseModel,summary='新增教师接口') def add_teacher1(x1:Teacher_RequestModel,session=Depends(get_db)): y=add_teacher(x1.model_dump(),session) if not y: raise HTTPException(status_code=500,detail='添加异常！') return x1 -@teacher_api.get("/teachers",tags=['教师基本信息管理模块'],summary='查询教师接口') +@teacher_api.get("/teachers",summary='查询教师接口') def get_teacher1(teacid:int, session=Depends(get_db)): # r = get_teacher(id=id,session=session) # if not r: @@ -27,7 +27,7 @@ def get_teacher1(teacid:int, session=Depends(get_db)): raise HTTPException(status_code=500,detail='数据库查询异常!') -@teacher_api.put("/teachers/{t_id}",tags=['教师基本信息管理模块'],summary='更新教师接口') +@teacher_api.put("/teachers/{t_id}",summary='更新教师接口') def update_teacher1(t_id:int,teacher:Teacher_RequestModel,session=Depends(get_db)): d=teacher.model_dump(exclude_unset=True) r=update_teacher(id=t_id,req=d,session=session) @@ -36,7 +36,7 @@ def update_teacher1(t_id:int,teacher:Teacher_RequestModel,session=Depends(get_db return {'code':200,'detail':'更新成功！','data':teacher} -@teacher_api.delete("/teachers/{t_id}",tags=['教师基本信息管理模块'],summary='删除教师接口') +@teacher_api.delete("/teachers/{t_id}",summary='删除教师接口') def delete_teacher1(t_id:int,session=Depends(get_db)): r=delete_teacher(id=t_id,session=session) if not r: diff --git a/PythonProject/dao/statistics_dao.py b/PythonProject/dao/statistics_dao.py index 68780c6..0675ebc 100644 --- a/PythonProject/dao/statistics_dao.py +++ b/PythonProject/dao/statistics_dao.py @@ -23,7 +23,17 @@ def select_all(db): try: l1 = db.query(Student_Model.class_id,Student_Model.gender,func.count(1).label('cnt'))\ .group_by(Student_Model.class_id,Student_Model.gender).all() - return l1 + all_cnt = sum(i.cnt for i in l1) + + l2 = [] + for i in l1: + l2.append({ + "all_cnt": all_cnt, + "class_id": i.class_id, + "gender": i.gender, + "cnt": i.cnt + }) + return l2 except Exception: raise HTTPException(status_code=500,detail="查询异常") @@ -32,12 +42,23 @@ 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="请至少传入一个参数") - db = db.query(Student_Model,WlScore.score,WlScore.score)\ + db = db.query(WlScore.score + ,Student_Model.stu_name + ,Student_Model.age + ,Student_Model.gender + ,Student_Model.native_place + ,Student_Model.school + ,Student_Model.major + ,Student_Model.degree + ,Student_Model.admission_date + ,Student_Model.graduation_date + ,Student_Model.progress + )\ .join(WlScore,WlScore.stu_id == Student_Model.stu_id)\ .filter(WlScore.delete_status==0,Student_Model.delete_status == 0) if min_score is not None: db = db.filter(WlScore.score >= min_score) - if min_score is not None: + if max_score is not None: db = db.filter(WlScore.score <= max_score) return db.all() except HTTPException: @@ -60,7 +81,17 @@ def select_avg_score(db): # 实现统计薪资最高的前五名的学员信息 def select_salary(db): try: - l1 = db.query(Student_Model,Employment_info.salary)\ + l1 = db.query(Employment_info.salary + ,Student_Model.stu_name + ,Student_Model.age + ,Student_Model.gender + ,Student_Model.native_place + ,Student_Model.school + ,Student_Model.major + ,Student_Model.degree + ,Student_Model.admission_date + ,Student_Model.graduation_date + ,Student_Model.progress)\ .join(Employment_info,Employment_info.stu_id==Student_Model.stu_id)\ .filter(Employment_info.delete_status==0,Student_Model.delete_status == 0)\ .order_by(Employment_info.salary.desc())\ @@ -70,7 +101,7 @@ def select_salary(db): raise HTTPException(status_code=500,detail="查询异常") # 实现统计每个班级的平均就业时长 -def select_days(db): +def select_avg_days(db): try: l1 = db.query(Student_Model.class_id, func.coalesce( @@ -84,14 +115,14 @@ def select_days(db): Employment_info.delete_status == 0, Employment_info.employment_opening_date.isnot(None), Employment_info.offer_issuance_date.isnot(None),)\ - .group_by( Student_Model.class_id)\ + .group_by(Student_Model.class_id)\ .order_by(func.avg(func.datediff(Employment_info.offer_issuance_date,Student_Model.admission_date)).desc()).all() return l1 except Exception: raise HTTPException(status_code=500, detail="查询异常") #统计每个学⽣的就业时⻓ -def select_days2(db): +def select_days(db): try: l2 =db.query( Employment_info.stu_id diff --git a/PythonProject/schema/statistics_schema.py b/PythonProject/schema/statistics_schema.py index 2b76ae4..028cd91 100644 --- a/PythonProject/schema/statistics_schema.py +++ b/PythonProject/schema/statistics_schema.py @@ -1,8 +1,10 @@ -from pydantic import BaseModel,Field +from pydantic import BaseModel,field_serializer from datetime import date -from typing import List, Optional +from typing import List +from schema.student_schema import StudentResponse class AllStuResponse(BaseModel): + all_cnt: int class_id: int gender: str | None cnt: int @@ -11,12 +13,57 @@ class AcgScoreResponse(BaseModel): class_id: int avg_score: float +class GetScoreResponse(BaseModel): + code:int = 200 + detail:str = 'ok' + score:float + stu_name: str | None = None + age: int | None = None + gender: str | None = None + native_place: str | None = None + school: str | None = None + major: str | None = None + degree: str | None = None + admission_date: date | None = None + graduation_date: date | None = None + progress: int = 0 + + @field_serializer('progress') + def int_to_string(self, progress: int): + d1 = { + 0: '学习中', + 1: '求职中', + 2: '已就业' + } + return d1.get(progress, '暂不明确') + +class GetStuResponse(BaseModel): + code:int = 200 + detail:str = 'ok' + salary:float + stu_name: str | None = None + age: int | None = None + gender: str | None = None + native_place: str | None = None + school: str | None = None + major: str | None = None + degree: str | None = None + admission_date: date | None = None + graduation_date: date | None = None + progress: int = 0 + + @field_serializer('progress') + def int_to_string(self, progress: int): + d1 = { + 0: '学习中', + 1: '求职中', + 2: '已就业' + } + return d1.get(progress, '暂不明确') + class AvgDayResponse(BaseModel): class_id: int - avg_days: str | None - -class EmpRequest(BaseModel): - stu_id: int + avg_days: float | None class EmpItem(BaseModel): stu_id: int diff --git a/PythonProject/schema/student_schema.py b/PythonProject/schema/student_schema.py index 58894ec..1b510dc 100644 --- a/PythonProject/schema/student_schema.py +++ b/PythonProject/schema/student_schema.py @@ -67,7 +67,7 @@ class StugetResponse(BaseModel): progress: int = 0 @field_serializer('progress') - def int_to_string(cls, progress: int): + def int_to_string(self, progress: int): d1 = { 0: '学习中', 1: '求职中',