diff --git a/PythonProject/api/employment_api.py b/PythonProject/api/employment_api.py index 58a14d3..9db9cff 100644 --- a/PythonProject/api/employment_api.py +++ b/PythonProject/api/employment_api.py @@ -1,25 +1,53 @@ -from fastapi import APIRouter,Depends,HTTPException +from fastapi import APIRouter, Query, Depends, HTTPException, Path +from util.database import get_db from dao import employment_dao -from dao.employment_dao import get_employment_dao -from schema.employment_schema import EmploymentResponse -from model.all_model import ClassManagement,Employment_info +from dao.employment_dao import get_emp_dao, add_emp_dao, check_stu_dao, update_emp_dao, delete_emp_dao +from schema.employment_schema import EmploymentRequest,EmploymentResponse from util.database import get_db +from typing import Optional 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)): - if stu_id: - return employment_dao.get_employment_dao(stu_id=stu_id,db=db) +def get_emp_info1(stu_id: Optional[int]=Path(description='学生编号') + ,company_name: Optional[str]=Query(None,description='公司名称') + ,min_salary: Optional[float]=Query(None,description='最低工资') + ,max_salary: Optional[float]=Query(None,description='最高工资') + ,db=Depends(get_db)): + if stu_id or company_name or min_salary or max_salary: + return [employment_dao.get_emp_dao(stu_id=stu_id,db=db)] raise HTTPException(status_code=404, detail='该学生就业信息不存在') @emp_api.get('/employment/class/{class_id}',response_model=EmploymentResponse,summary='获取班级学生就业信息') -def get_emp_info2(class_id: int,db=Depends(get_db)): +def get_emp_info2(class_id: Optional[int],db=Depends(get_db)): if class_id: - return employment_dao.get_employment_dao(class_id=class_id,db=db) + return employment_dao.get_emp_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),response_model=EmploymentResponse): -# if stu_id: -# -# return employment_dao. +@emp_api.post('/employment/students/{stu_id}',response_model=EmploymentResponse,summary='新增学生就业信息') +def create_emp_info(stu_id:int,emp:EmploymentRequest,db=Depends(get_db)): + if not check_stu_dao(stu_id,db): + raise HTTPException(status_code=404, detail='该学生不存在,无法添加就业信息') + emp.stu_id = stu_id + exist = db.query(employment_dao.Employment_info).filter(employment_dao.Employment_info.stu_id == stu_id,employment_dao.Employment_info.delete_status == 0).first() + if exist: + raise HTTPException(status_code=409,detail='该学生已有就业信息，请勿重复增加！') + d=emp.model_dump(exclude_unset=False) + r=add_emp_dao(d,db) + if not r: + raise HTTPException(status_code=500,detail='服务器繁忙，请稍后添加！') + return r + +@emp_api.put('/employment/students/{stu_id}',response_model=EmploymentResponse,summary='更新学生就业信息') +def update_emp_info(stu_id:int,emp:EmploymentRequest,db=Depends(get_db)): + d = emp.model_dump(exclude_unset=True) + r = update_emp_dao(stu_id,d,db) + if not r: + raise HTTPException(status_code=500,detail='更新失败！') + return {'code':200,'totals':r,'detail':'更新成功！'} + +@emp_api.delete('/employment/{stu_id}',summary='删除学生就业信息') +def delete_emp_info(stu_id:int,db=Depends(get_db)): + rows = delete_emp_dao(stu_id, db) + if not rows: + raise HTTPException(status_code=500, detail='没有删除！') + return {'code':200,'detail':'删除成功！'} diff --git a/PythonProject/api/grade_api.py b/PythonProject/api/grade_api.py index f8ab18b..be2612f 100644 --- a/PythonProject/api/grade_api.py +++ b/PythonProject/api/grade_api.py @@ -6,11 +6,11 @@ from schema.grade_schema import * gradeAPI = APIRouter(tags=['学生考核成绩']) -@gradeAPI.get("/grade/{stu_id}",summary="根据学生id查询成绩") +@gradeAPI.get("/grade/{stu_id}",response_model=list[GradeResponse],summary="根据学生id查询成绩") def get_grade(stu_id: int,db=Depends(get_db)): try: res=get_grade_dao(stu_id,db) - return {'code': 200,'msg':'查询成功','data':res} + return res except Exception as e: raise HTTPException(status_code=500,detail=f'数据库查询异常:{str(e)}') @@ -23,14 +23,36 @@ def post_grade(o:GradeRequest=Form(),db=Depends(get_db)): return o @gradeAPI.put('/{score_id}',summary='成绩修改') -def put_grade(score_id: int,o:GradeUpdate,db=Depends(get_db)): - d = o.model_update(exclude_unset=True) - r = update_grade_dao(score_id=score_id - ,update_data=d - ,db=db) - if not r: - raise HTTPException(status_code=500,detail='没有更新') - return {'code':200,'totals':r,'detail':'更新成功'} +def put_grade( + score_id: int + ,o:GradeUpdate=Form() + ,db=Depends(get_db) +): + old_obj = get_score_by_id_dao(score_id=score_id, db=db) + if not old_obj: + raise HTTPException(status_code=404, detail="成绩记录不存在(已删除)") + + d = o.model_dump(exclude_unset=True) + if not d: + raise HTTPException(status_code=400,detail='请传入需要修改的字段') + if "exam_order" in d: + exist_obj = get_score_by_stu_exam_order_dao( + stu_id=old_obj.stu_id, + exam_order=d["exam_order"], + db=db + ) + if exist_obj and exist_obj.id != score_id: + raise HTTPException(status_code=409, detail="修改后的考核序次，该学生已有成绩！") + + try: + r = update_grade_dao(score_id=score_id, update_data=d, db=db) + except Exception: + raise HTTPException(status_code=409, detail="数据冲突，重复数据") + + if r == 0: + return {"code": 200, "totals": r, "detail": "数据未发生变化"} + + return {"code": 200, "totals": r, "detail": "更新成功"} @gradeAPI.delete('/{score_id}',summary='删除成绩') def delete_grade(score_id:int,db=Depends(get_db)): diff --git a/PythonProject/api/statistics_api.py b/PythonProject/api/statistics_api.py index f9538fd..c1804ef 100644 --- a/PythonProject/api/statistics_api.py +++ b/PythonProject/api/statistics_api.py @@ -1,4 +1,4 @@ -from fastapi import APIRouter,Depends +from fastapi import APIRouter,Depends,Query from dao.statistics_dao import * from schema.student_schema import StudentResponse from schema.statistics_schema import * @@ -7,7 +7,7 @@ from util.database import get_db StatisticsAPI = APIRouter() @StatisticsAPI.get("/age",response_model=list[StudentResponse],tags=['统计分析模块'],summary='根据年龄查询学生信息') -def get_students(min_age:int|None=None,max_age:int|None=None,db=Depends(get_db)): +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 diff --git a/PythonProject/api/teacher_api.py b/PythonProject/api/teacher_api.py index dd6e738..c35169c 100644 --- a/PythonProject/api/teacher_api.py +++ b/PythonProject/api/teacher_api.py @@ -41,4 +41,4 @@ def delete_teacher1(t_id:int,session=Depends(get_db)): r=delete_teacher(id=t_id,session=session) if not r: raise HTTPException(status_code=500,detail='删除异常！') - return {'code': 200, 'detail': 'cg'} \ No newline at end of file + return {'code': 200, 'detail':'成功！'} \ No newline at end of file diff --git a/PythonProject/dao/employment_dao.py b/PythonProject/dao/employment_dao.py index e7a27c0..5ce81a0 100644 --- a/PythonProject/dao/employment_dao.py +++ b/PythonProject/dao/employment_dao.py @@ -1,9 +1,8 @@ from fastapi import HTTPException from model.all_model import Employment_info, ClassManagement, Student_Model -from util.database import get_db -from schema.employment_schema import EmploymentRequest -def get_employment_dao(stu_id,class_id,db): + +def get_emp_dao(stu_id=None,class_id=None,company_name=None,min_salary=None,max_salary=None,db=None): try: q = db.query(Employment_info).\ join(Student_Model,Employment_info.stu_id == Student_Model.stu_id).\ @@ -11,16 +10,24 @@ def get_employment_dao(stu_id,class_id,db): filter(Employment_info.delete_status == 0).\ filter(Student_Model.delete_status == 0).\ filter(ClassManagement.delete_status == 0) - if stu_id is not None: + if stu_id: q = q.filter(Employment_info.stu_id == stu_id) - if class_id is not None: + if class_id: q = q.filter(ClassManagement.class_id == class_id) + if company_name: + q = q.filter(Employment_info.company_name == company_name) + if min_salary: + q = q.filter(Employment_info.salary >= min_salary) + if max_salary: + q = q.filter(Employment_info.salary <= max_salary) + r = q.all() + if r: return [{'emp_id':i.emp_id ,'stu_id': i.stu_id - ,'stu_name':i.stu_name - ,'class_id':i.class_id + ,'stu_name':i.Student_Model.stu_name + ,'class_id':i.Student_Model.class_id ,'email':i.email ,'employment_opening_date':i.employment_opening_date ,'offer_issuance_date':i.offer_issuance_date @@ -32,14 +39,36 @@ def get_employment_dao(stu_id,class_id,db): except: raise HTTPException(status_code=404,detail='信息不存在！') -def add_employment_dao(e:EmploymentRequest,db): +def add_emp_dao(o,db): try: - d = e.model_dump() - e1 = Employment_info(**d) + e1 = Employment_info(**o) db.add(e1) - except: - db.rollback() - raise HTTPException(status_code=404, detail='信息不存在！') - else: db.commit() return e1 + except Exception as e: + db.rollback() + raise HTTPException(status_code=500, detail=f'新增就业信息失败: {e}') + +def check_stu_dao(stu_id,db): + stu = db.query(Student_Model).filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0).first() + return stu + +def update_emp_dao(stu_id,o,db): + try: + rows = db.query(Employment_info).filter(Employment_info.stu_id == stu_id,Employment_info.delete_status == 0).first() + db.commit() + return rows + except: + db.rollback() + raise HTTPException(status_code=404,detail='该就业记录已存在') + + +def delete_emp_dao(stu_id,db): + try: + rows = db.query(Employment_info).filter(Employment_info.stu_id == stu_id,Employment_info.delete_status == 0).delete() + db.commit() + except: + db.rollback() + rows = 0 + finally: + return rows diff --git a/PythonProject/dao/grade_dao.py b/PythonProject/dao/grade_dao.py index a30c5e2..683ec95 100644 --- a/PythonProject/dao/grade_dao.py +++ b/PythonProject/dao/grade_dao.py @@ -4,11 +4,22 @@ from util.database import get_db from model.all_model import * +# 根据id查询单条有效成绩 +def get_score_by_id_dao(score_id:int, db): + return db.query(WlScore).filter( + WlScore.id == score_id + ,WlScore.delete_status==1 + ).first() + +# 根据stu_id+exam_order查重（新增、修改时校验重复） +def get_score_by_stu_exam_order_dao(stu_id:str,exam_order:int,db): + return db.query(WlScore).filter(WlScore.stu_id==stu_id,WlScore.exam_order==exam_order,WlScore.delete_status==0).first() def get_grade_dao( stu_id:int , db): r1 =db.query(WlScore).filter(WlScore.stu_id == stu_id,WlScore.delete_status == 0).all() if r1: + return r1 else: raise HTTPException(status_code=404,detail="学生不存在") @@ -21,15 +32,15 @@ def add_grade_dao(g,db): return o1 except Exception: db.rollback() - return None + raise HTTPException(status_code=500,detail="学生添加失败") def update_grade_dao(score_id:int, update_data, db): try: rows = db.query(WlScore).filter( - WlScore.stu_id == score_id, + WlScore.score_id == score_id, WlScore.delete_status == 0 ).update(update_data) - except: + except Exception: db.rollback() return False else: diff --git a/PythonProject/dao/statistics_dao.py b/PythonProject/dao/statistics_dao.py index 726c60d..68780c6 100644 --- a/PythonProject/dao/statistics_dao.py +++ b/PythonProject/dao/statistics_dao.py @@ -12,7 +12,6 @@ def select_age(min_age,max_age,db): db = db.filter(Student_Model.age >= min_age,Student_Model.delete_status == 0) if max_age is not None: db = db.filter(Student_Model.age <= max_age,Student_Model.delete_status == 0) - print('abc',db.all()) return db.all() except HTTPException: raise diff --git a/PythonProject/dao/teacher_dao.py b/PythonProject/dao/teacher_dao.py index 551b33a..cb0c8c7 100644 --- a/PythonProject/dao/teacher_dao.py +++ b/PythonProject/dao/teacher_dao.py @@ -1,10 +1,8 @@ -from fastapi import HTTPException,Depends -from schema.teacher_schema import Teacher_RequestModel -from model.all_model import * +from fastapi import HTTPException +from model.all_model import Teacher_Model def add_teacher(teacher,session): try: - print(teacher) x=Teacher_Model(**teacher) session.add(x) session.commit() diff --git a/PythonProject/schema/grade_schema.py b/PythonProject/schema/grade_schema.py index d669265..e3461ed 100644 --- a/PythonProject/schema/grade_schema.py +++ b/PythonProject/schema/grade_schema.py @@ -1,20 +1,21 @@ + from model.all_model import * from pydantic import BaseModel, Field, field_validator -from fastapi import HTTPException +from fastapi import HTTPException,Form class GradeRequest(BaseModel): - stu_id:str|None = Field(description="学生编号") - exam_order:int = Field(description='考核序次') - score:float = Field(description='成绩') - -class GradeUpdate(BaseModel):#修改请求体 - exam_order: int = Field(description='考核序次') - score: float = Field(description='成绩') + stu_id:int = Form(description="学生编号") + exam_order:int = Form(description='考核序次') + score:float = Form(description='成绩') class GradeResponse(BaseModel): code: int = 200 detail: str = 'OK' - stu_id:str + stu_id:int exam_order:int - score:float \ No newline at end of file + score:float + +class GradeUpdate(BaseModel): + exam_order: int | None = Form( description="考核序次") + score: float | None = Form( description="成绩")