From a4136ea6485ddc9d5e1ae0ddf383b9739e94fbe6 Mon Sep 17 00:00:00 2001 From: 00MSJ1122 <1253313142@qq.com> Date: Tue, 22 Sep 2026 14:34:22 +0800 Subject: [PATCH 1/8] 1 --- PythonProject/api/student_api.py | 20 +++++++++------- PythonProject/dao/student_dao.py | 33 ++++++++++++++++---------- PythonProject/model/all_model.py | 2 ++ PythonProject/schema/student_schema.py | 6 ++++- 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/PythonProject/api/student_api.py b/PythonProject/api/student_api.py index 981de80..6cbed4a 100644 --- a/PythonProject/api/student_api.py +++ b/PythonProject/api/student_api.py @@ -1,4 +1,4 @@ -from fastapi import APIRouter,Depends,HTTPException +from fastapi import APIRouter,HTTPException from dao.student_dao import * from schema.student_schema import * from util.database import get_db @@ -33,10 +33,10 @@ def update_students(s:StudentRequest ,db=Depends(get_db)): d = s.model_dump(exclude_unset=True) if not d: - raise HTTPException(status_code=400, detail='更新内容不能为空！') + raise HTTPException(status_code=400, detail='更新内容不能为空') r = update_student_dao( stu_id=stu_id,update_data=d,db=db ) if not r: - raise HTTPException(status_code=500, detail='没有更新！') + raise HTTPException(status_code=500, detail='没有更新') return {'code':200,'totals':r,'detail':'更新成功'} @StudentAPI.delete('/{stu_id}',tags=['学⽣基本信息管理模块'],summary='学生信息删除接口',description='删除学生信息') @@ -50,8 +50,12 @@ def del_students(stu_id:int @StudentAPI.post('/students',tags=['学⽣基本信息管理模块'],response_model=StugetResponse,summary='学生信息新增接口',description='新增学生信息') def add_students(s:StudentRequest ,db=Depends(get_db)): - d=s.model_dump(exclude_unset=True) - stu_new=add_student_dao(o=d,db=db) - if not stu_new: - raise HTTPException(status_code=404,detail='添加失败') - return stu_new + d = s.model_dump(exclude_unset=True) + if not d: + raise HTTPException(status_code=400, detail='添加内容不能为空') + r = add_student_dao( o=d, db=db) + if r == 'conflict': + raise HTTPException(status_code=409, detail='身份证号已存在，请勿重复添加') + if r == 'error': + raise HTTPException(status_code=500, detail='更添加失败，请稍后重试') + return r diff --git a/PythonProject/dao/student_dao.py b/PythonProject/dao/student_dao.py index 9f755ac..0822d9d 100644 --- a/PythonProject/dao/student_dao.py +++ b/PythonProject/dao/student_dao.py @@ -1,19 +1,28 @@ -from fastapi import Depends -from util.database import get_db from model.all_model import Student_Model from typing import List, Optional, Dict, Any from datetime import datetime +from sqlalchemy.exc import IntegrityError def add_student_dao(o,db): + if o.get('id_card'): + conflict = (db.query(Student_Model) + .filter(Student_Model.id_card == o['id_card'], + Student_Model.delete_status == 0) + .first()) + if conflict: + return 'conflict' try: - o1 = Student_Model( **o) - db.add(o1) + o2 = Student_Model(**o) + db.add(o2) db.commit() - stu_id=o1.stu_id - return db.query(Student_Model).filter(Student_Model.stu_id == stu_id).first() - except: + db.refresh(o2) # 回填自增的 stu_id + return o2 + except IntegrityError: db.rollback() - return None + return 'conflict' + except Exception: + db.rollback() + return 'error' def delete_student_dao(stu_id,db): try: @@ -28,14 +37,14 @@ def delete_student_dao(stu_id,db): def update_student_dao(stu_id,update_data,db): try: - rows = (db.query( Student_Model ) - .filter( Student_Model.stu_id == stu_id,Student_Model.delete_status == 0) - .update( update_data )) - db.commit() + rows=(db.query(Student_Model) + .fiter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0) + .update(update_data)) except: db.rollback() return False else: + db.commit() return rows def get_student_dao(stu_id:Optional[int] diff --git a/PythonProject/model/all_model.py b/PythonProject/model/all_model.py index fb48980..3fe8237 100644 --- a/PythonProject/model/all_model.py +++ b/PythonProject/model/all_model.py @@ -23,6 +23,8 @@ class Student_Model(Base): native_place=Column(String(200),comment='籍贯') + id_card=Column(String(18),unique=True,comment='身份证号') + birthday=Column(DATE,comment='生日') school=Column(String(100),comment='毕业学校') diff --git a/PythonProject/schema/student_schema.py b/PythonProject/schema/student_schema.py index 58894ec..f699b21 100644 --- a/PythonProject/schema/student_schema.py +++ b/PythonProject/schema/student_schema.py @@ -9,6 +9,7 @@ class StudentRequest(BaseModel): stu_name:str age:int |None = None gender:str |None = None + id_card:str native_place:str |None = None birthday:date |None = None school:str |None = None @@ -57,6 +58,7 @@ class StugetResponse(BaseModel): stu_name: str | None = None age: int | None = None gender: str | None = None + id_card: str native_place: str | None = None birthday: date | None = None school: str | None = None @@ -81,4 +83,6 @@ class StudentPageResponse(BaseModel): page: int page_size: int totals: int - data: List[StugetResponse] \ No newline at end of file + data: List[StugetResponse] + + From bf44ac9450da9976c44e71853b9d94bacef5165b Mon Sep 17 00:00:00 2001 From: maruizhi <3088243241@qq.com> Date: Tue, 22 Sep 2026 14:36:43 +0800 Subject: [PATCH 2/8] mrz --- PythonProject/api/employment_api.py | 23 +++++++++---------- PythonProject/api/student_api.py | 2 +- PythonProject/dao/employment_dao.py | 27 ++++++----------------- PythonProject/schema/employment_schema.py | 15 +++++++++++++ 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/PythonProject/api/employment_api.py b/PythonProject/api/employment_api.py index a3aa6d7..fd6f2aa 100644 --- a/PythonProject/api/employment_api.py +++ b/PythonProject/api/employment_api.py @@ -1,7 +1,7 @@ from fastapi import APIRouter, Query, Depends, HTTPException, Path,Form from dao import employment_dao from dao.employment_dao import add_emp_dao, update_emp_dao, delete_emp_dao -from schema.employment_schema import EmploymentRequest,EmploymentResponse +from schema.employment_schema import EmploymentRequest,UpdateEmpRequest,EmploymentResponse from util.database import get_db from typing import Optional emp_api = APIRouter(tags=['学生就业管理模块']) @@ -22,8 +22,8 @@ def get_emp_info2(class_id: Optional[int]=Path(description='班级编号') return e2 raise HTTPException(status_code=404, detail='该班级就业信息不存在') -@emp_api.get('/employment',response_model=EmploymentResponse,summary='按照学⽣编号，公司名字，⼯资范围查询学⽣就业信息') -def get_emp_info3(stu_id:int|None = Query(None, description='学生编号') +@emp_api.get('/employment/class/{stu_id}',response_model=list[EmploymentResponse],summary='按照学⽣编号，公司名字，⼯资范围查询学⽣就业信息') +def get_emp_info3(stu_id:int = Path(description='学生编号') ,company_name: str|None = Query(None,description='公司名称') ,min_salary: float|None = Query(None,ge=0,description='最低工资') ,max_salary: float|None = Query(None,ge=0,description='最高工资') @@ -31,11 +31,11 @@ def get_emp_info3(stu_id:int|None = Query(None, description='学生编号') if min_salary and max_salary: if min_salary > max_salary: raise HTTPException(status_code=404, detail='最低工资不能大于最高工资') - return [employment_dao.get_emp_dao(stu_id=stu_id - ,company_name=company_name - ,min_salary=min_salary - ,max_salary=max_salary - ,db=db)] + l1 = employment_dao.get_emp_dao(db, stu_id=stu_id + , company_name=company_name + , min_salary=min_salary + , max_salary=max_salary) + return l1 @emp_api.post('/employment/students/{stu_id}',response_model=EmploymentResponse,summary='新增学生就业信息') def create_emp_info(emp:EmploymentRequest=Form(),db=Depends(get_db)): @@ -45,10 +45,9 @@ def create_emp_info(emp:EmploymentRequest=Form(),db=Depends(get_db)): raise HTTPException(status_code=500,detail='服务器繁忙，请稍后添加！') return r -@emp_api.put('/employment/students/{emp_id}',response_model=EmploymentResponse,summary='更新学生就业信息') -def update_emp_info(emp_id:int,emp:EmploymentRequest,db=Depends(get_db)): - d = emp.model_dump(exclude_unset=True) - r = update_emp_dao(emp_id=emp_id,db=db) +@emp_api.put('/employment/students/{emp_id}',summary='更新学生就业信息') +def update_emp_info(emp_id:int,emp:UpdateEmpRequest,db=Depends(get_db)): + r = update_emp_dao(emp_id,emp.model_dump(exclude_unset=True),db) if not r: raise HTTPException(status_code=500,detail='没有更新！') return {'code':200,'totals':r,'detail':'更新成功！'} diff --git a/PythonProject/api/student_api.py b/PythonProject/api/student_api.py index b48fdc1..3b1bb2b 100644 --- a/PythonProject/api/student_api.py +++ b/PythonProject/api/student_api.py @@ -1,4 +1,4 @@ -from fastapi import APIRouter,HTTPException +from fastapi import APIRouter,HTTPException,Depends from dao.student_dao import * from schema.student_schema import * from util.database import get_db diff --git a/PythonProject/dao/employment_dao.py b/PythonProject/dao/employment_dao.py index 6168d87..2a7e1fc 100644 --- a/PythonProject/dao/employment_dao.py +++ b/PythonProject/dao/employment_dao.py @@ -2,7 +2,7 @@ from fastapi import HTTPException from model.all_model import Employment_info, ClassManagement, Student_Model from datetime import datetime -def get_emp_dao(stu_id=None,class_id=None,company_name=None,min_salary=None,max_salary=None,db=None): +def get_emp_dao(db,stu_id=None,class_id=None,company_name=None,min_salary=None,max_salary=None): q = db.query(Employment_info.emp_id ,Employment_info.stu_id ,Student_Model.stu_name @@ -33,24 +33,11 @@ def get_emp_dao(stu_id=None,class_id=None,company_name=None,min_salary=None,max_ r = q.all() if not r: raise HTTPException(status_code=500,detail='查询异常，没有结果！') - return [ - {'emp_id':i.emp_id - ,'stu_id': i.stu_id - ,'stu_name':i.stu_name - ,'class_id':i.class_id - ,'email':i.email - ,'employment_opening_date':i.employment_opening_date - ,'offer_issuance_date':i.offer_issuance_date - ,'company_name':i.company_name - ,'company_address':i.company_address - ,'salary':i.salary - } - for i in r - ] + return r -def add_emp_dao(o:dict,db): +def add_emp_dao(o,db): try: stu = db.query(Student_Model).filter(Student_Model.stu_id == o['stu_id'] , Student_Model.delete_status == 0).first() @@ -70,11 +57,11 @@ def add_emp_dao(o:dict,db): db.rollback() raise HTTPException(status_code=500, detail=f'新增就业信息失败: {e}') -def update_emp_dao(emp_id:int,db): +def update_emp_dao(emp_id,emp,db): try: - rows = db.query(Employment_info).filter(Employment_info.emp_id == emp_id - ,Employment_info.delete_status == 0).first() - + rows = db.query(Employment_info)\ + .filter(Employment_info.emp_id == emp_id,Employment_info.delete_status == 0)\ + .update(emp) db.commit() return rows except: diff --git a/PythonProject/schema/employment_schema.py b/PythonProject/schema/employment_schema.py index 4c5dd52..1505868 100644 --- a/PythonProject/schema/employment_schema.py +++ b/PythonProject/schema/employment_schema.py @@ -18,6 +18,21 @@ class EmploymentRequest(BaseModel): raise ValueError('offer下发日期不能早于就业开放日期') return self +class UpdateEmpRequest(BaseModel): + email: Optional[str] = Field(None, description='邮箱') + employment_opening_date:Optional[date] = Field(None, description='就业开放日期') + offer_issuance_date:Optional[date] = Field(None, description='offer下发日期') + company_name:Optional[str] = Field(None, description='公司名称') + company_address:Optional[str] = Field(None, description='公司地址') + salary:Optional[float] = Field(None, description='薪资') + + @model_validator(mode='after') + def check_date(self): + if self.employment_opening_date and self.offer_issuance_date: + if self.employment_opening_date > self.offer_issuance_date: + raise ValueError('offer下发日期不能早于就业开放日期') + return self + class EmploymentResponse(BaseModel): code:int = 200 detail:str = 'OK' From 7d8971fc83f8a662c659f567a9510d8dce29fe1a Mon Sep 17 00:00:00 2001 From: maruizhi <3088243241@qq.com> Date: Tue, 22 Sep 2026 14:40:54 +0800 Subject: [PATCH 3/8] mrz --- PythonProject/api/employment_api.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/PythonProject/api/employment_api.py b/PythonProject/api/employment_api.py index fd6f2aa..8a53b57 100644 --- a/PythonProject/api/employment_api.py +++ b/PythonProject/api/employment_api.py @@ -6,14 +6,6 @@ from util.database import get_db from typing import Optional emp_api = APIRouter(tags=['学生就业管理模块']) -@emp_api.get('/employment/class/{stu_id}',response_model=EmploymentResponse,summary='获取学生就业信息') -def get_emp_info1(stu_id: Optional[int]=Path(description='学生编号') - ,db=Depends(get_db)): - e1 = employment_dao.get_emp_dao(stu_id=stu_id, db=db) - if e1: - return e1[0] - raise HTTPException(status_code=404, detail='该学生就业信息不存在') - @emp_api.get('/employment/class/{class_id}',response_model=EmploymentResponse,summary='获取班级学生就业信息') def get_emp_info2(class_id: Optional[int]=Path(description='班级编号') ,db=Depends(get_db)): From e9086e842b198049fffdb2521f02ff8e1316f807 Mon Sep 17 00:00:00 2001 From: test1 Date: Tue, 22 Sep 2026 14:50:43 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=A9=AC=E7=9D=BF=E6=99=BA=E7=89=9B?= =?UTF-8?q?=E9=80=BC=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PythonProject/api/statistics_api.py | 8 +++++++- PythonProject/dao/statistics_dao.py | 23 ++++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/PythonProject/api/statistics_api.py b/PythonProject/api/statistics_api.py index c1804ef..e327bf3 100644 --- a/PythonProject/api/statistics_api.py +++ b/PythonProject/api/statistics_api.py @@ -40,4 +40,10 @@ def get_days(db=Depends(get_db)): @StatisticsAPI.get('/emp',response_model=AllEmpResponse,tags=['统计分析模块'],summary='统计每个学生的就业时长') def get_emp(db=Depends(get_db)): l= select_days2(db) - return l \ No newline at end of file + return l + +# 薪资区间分布：统计薪资在5k以下、5k-10k、10k-15k、15k以上的人数分布，反映学生的整体就业质量。 +@StatisticsAPI.get('/salaries',tags=['统计分析模块'],summary='统计薪资分布') +def get_salaries(db=Depends(get_db)): + s=classify_salary(db) + return s \ No newline at end of file diff --git a/PythonProject/dao/statistics_dao.py b/PythonProject/dao/statistics_dao.py index 68780c6..5f79595 100644 --- a/PythonProject/dao/statistics_dao.py +++ b/PythonProject/dao/statistics_dao.py @@ -107,4 +107,25 @@ def select_days2(db): ).all() return l2 except Exception: - raise HTTPException(status_code=500, detail="查询异常") \ No newline at end of file + raise HTTPException(status_code=500, detail="查询异常") + + +# 薪资区间分布：统计薪资在5k以下、5k-10k、10k-15k、15k以上的人数分布，反映学生的整体就业质量。 +def classify_salary(db): + try: + a=b=c=d=0 + l=db.query(Employment_info).filter(Employment_info.delete_status==0).all() + for i in l: + if i.salary is None: + continue + elif i.salary<5000: + a+=1 + elif 5000<=i.salary<10000: + b+=1 + elif 10000<=i.salary<15000: + c+=1 + else: + d+=1 + return {'5k以下': a, '5k-10k': b, '10k-15k': c, '15k': d} + except: + raise HTTPException(status_code=500,detail='查询异常！') From f7911c89115090ff800c03744ebdb32a1cb1740e Mon Sep 17 00:00:00 2001 From: Windows <2209639385@qq.com> Date: Tue, 22 Sep 2026 14:52:15 +0800 Subject: [PATCH 5/8] nb --- PythonProject/api/grade_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PythonProject/api/grade_api.py b/PythonProject/api/grade_api.py index c0b266c..fb3d5cf 100644 --- a/PythonProject/api/grade_api.py +++ b/PythonProject/api/grade_api.py @@ -19,7 +19,7 @@ def get_grade(stu_id: int,db=Depends(get_db)): except Exception as e: raise HTTPException(status_code=500,detail=f'数据库查询异常:{str(e)}') -@gradeAPI.post('/grade',response_model=GradeResponse,summary='添加学生成绩') +@gradeAPI.post('/grade',summary='添加学生成绩') def post_grade(o:GradeRequest,db=Depends(get_db)): d=o.model_dump() r=add_grade_dao(g=d,db=db) From 43c558d5bc38d49e2eeff709200a3240bcca6331 Mon Sep 17 00:00:00 2001 From: test1 Date: Tue, 22 Sep 2026 14:54:25 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=A9=AC=E7=9D=BF=E6=99=BA=E7=89=9B?= =?UTF-8?q?=E9=80=BC=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PythonProject/api/statistics_api.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PythonProject/api/statistics_api.py b/PythonProject/api/statistics_api.py index 401efd1..c5f0032 100644 --- a/PythonProject/api/statistics_api.py +++ b/PythonProject/api/statistics_api.py @@ -40,3 +40,8 @@ def get_days(db=Depends(get_db)): def get_emp(db=Depends(get_db)): l= select_days(db) return l + +@StatisticsAPI.get('/salaries',summary='统计薪资分布') +def get_salaries(db=Depends(get_db)): + s=classify_salary(db) + return s \ No newline at end of file From acb4036589f977b0a23e9c17984fb20d9afaf2b4 Mon Sep 17 00:00:00 2001 From: test1 Date: Tue, 22 Sep 2026 14:55:31 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E9=A9=AC=E7=9D=BF=E6=99=BA=E7=89=9B?= =?UTF-8?q?=E9=80=BC=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PythonProject/dao/statistics_dao.py | 1 + 1 file changed, 1 insertion(+) diff --git a/PythonProject/dao/statistics_dao.py b/PythonProject/dao/statistics_dao.py index 81e140b..edcc645 100644 --- a/PythonProject/dao/statistics_dao.py +++ b/PythonProject/dao/statistics_dao.py @@ -153,3 +153,4 @@ def classify_salary(db): return {'5k以下': a, '5k-10k': b, '10k-15k': c, '15k': d} except: raise HTTPException(status_code=500,detail='查询异常！') + From 957e826e0f1187795265b54d57cc03a194563f11 Mon Sep 17 00:00:00 2001 From: 00MSJ1122 <1253313142@qq.com> Date: Tue, 22 Sep 2026 14:58:51 +0800 Subject: [PATCH 8/8] 1 --- PythonProject/api/student_api.py | 7 ++++++- PythonProject/dao/student_dao.py | 29 +++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/PythonProject/api/student_api.py b/PythonProject/api/student_api.py index 3b1bb2b..2cf2f1d 100644 --- a/PythonProject/api/student_api.py +++ b/PythonProject/api/student_api.py @@ -32,11 +32,16 @@ def update_students(s:StudentRequest ,stu_id:int ,db=Depends(get_db)): d = s.model_dump(exclude_unset=True) + d.pop('stu_id', None) if not d: raise HTTPException(status_code=400, detail='更新内容不能为空') r = update_student_dao( stu_id=stu_id,update_data=d,db=db ) + if r == 'conflict': + raise HTTPException(status_code=409, detail = '身份证号已被其他学生占用') + if r == 'error': + raise HTTPException(status_code=500, detail='更新失败，请稍后重试') if not r: - raise HTTPException(status_code=500, detail='没有更新') + raise HTTPException(status_code=404, detail='没有更新') return {'code':200,'totals':r,'detail':'更新成功'} @StudentAPI.delete('/{stu_id}',summary='学生信息删除接口',description='删除学生信息') diff --git a/PythonProject/dao/student_dao.py b/PythonProject/dao/student_dao.py index 0822d9d..d947d0d 100644 --- a/PythonProject/dao/student_dao.py +++ b/PythonProject/dao/student_dao.py @@ -36,16 +36,29 @@ def delete_student_dao(stu_id,db): return rows def update_student_dao(stu_id,update_data,db): + if update_data.get('id_card'): + conflict = (db.query(Student_Model) + .filter(Student_Model.id_card == update_data['id_card'], + Student_Model.stu_id != stu_id, + Student_Model.delete_status == 0) + .first()) + if conflict: + return 'conflict' + try: - rows=(db.query(Student_Model) - .fiter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0) - .update(update_data)) - except: - db.rollback() - return False - else: + rows = (db.query(Student_Model) + .filter(Student_Model.stu_id == stu_id, + Student_Model.delete_status == 0) + .update(update_data)) db.commit() - return rows + except IntegrityError: + db.rollback() + return 'conflict' + except Exception: + db.rollback() + return 'error' + + return rows def get_student_dao(stu_id:Optional[int] ,stu_name:Optional[str]