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

2026-09-21 20:19:00 +08:00
parent 231d2bfdb4 fee4a29876
commit e0a5234563
4 changed files with 47 additions and 59 deletions
@@ -2,28 +2,24 @@ from fastapi import APIRouter,Depends,HTTPException

 from dao import employment_dao
 from dao.employment_dao import get_employment_dao
-from schema.employment_schema import EmploymentRequest,EmploymentResponse
+from schema.employment_schema import EmploymentResponse
 from model.all_model import ClassManagement,Employment_info
 from util.database import get_db
-
-emp_api = APIRouter()
-@emp_api.get('employment/students/{stu_id}',response_model=EmploymentResponse,summary='获取学生就业信息')
+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)):
-    try:
-        if stu_id:
-            return employment_dao.get_employment_info()
-    except:
-        raise HTTPException(status_code=404, detail='该学生就业信息不存在')
+    if stu_id:
+        return employment_dao.get_employment_dao(stu_id=stu_id,db=db)
+    raise HTTPException(status_code=404, detail='该学生就业信息不存在')

-@emp_api.get('employment/class/{class_id}',summary='获取班级学生就业信息')
+@emp_api.get('/employment/class/{class_id}',response_model=EmploymentResponse,summary='获取班级学生就业信息')
 def get_emp_info2(class_id: int,db=Depends(get_db)):
-    try:
-        if class_id:
-            return employment_dao.get_employment_info()
-    except:
-        raise HTTPException(status_code=404, detail='该班级就业信息不存在')
+    if class_id:
+        return employment_dao.get_employment_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)):
-#     try:
-#     pass
+# @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.
@@ -6,7 +6,7 @@ from util.database import get_db

 StudentAPI = APIRouter()

-@StudentAPI.get('/students',response_model=list[StudentPageResponse],tags=['学⽣基本信息管理模块'],description='查询学生信息')
+@StudentAPI.get('/students',response_model=list[StudentPageResponse],tags=['学⽣基本信息管理模块'],summary='学生信息查询接口',description='查询学生信息')
 def get_students(stu_id:int|None=None
                ,stu_name:str|None=None
                ,class_id:int|None=None
@@ -29,7 +29,7 @@ def get_students(stu_id:int|None=None
        , 'total': total
        , 'data': r}

-@StudentAPI.put('/{stu_id}',tags=['学⽣基本信息管理模块'])
+@StudentAPI.put('/{stu_id}',tags=['学⽣基本信息管理模块'],summary='学生信息更新接口',description='更新学生信息')
 def update_students(s:StudentRequest
                    ,stu_id:int
                    ,db=Depends(get_db)):
@@ -41,7 +41,7 @@ def update_students(s:StudentRequest
        raise HTTPException(status_code=500, detail='没有更新！')
    return {'code':200,'totals':r,'detail':'更新成功'}

-@StudentAPI.delete('/{stu_id}',tags=['学⽣基本信息管理模块'])
+@StudentAPI.delete('/{stu_id}',tags=['学⽣基本信息管理模块'],summary='学生信息删除接口',description='删除学生信息')
 def del_students(stu_id:int
                 ,db=Depends(get_db)):
    rows=delete_student_dao( stu_id=stu_id,db=db )
@@ -49,7 +49,7 @@ def del_students(stu_id:int
        raise HTTPException(status_code=500,detail='没有删除')
    return {'code':200,'totals':rows,'detail':'删除成功'}

-@StudentAPI.post('/students',tags=['学⽣基本信息管理模块'],response_model=StugetResponse)
+@StudentAPI.post('/students',tags=['学⽣基本信息管理模块'],response_model=StugetResponse,summary='学生信息新增接口',description='新增学生信息')
 def add_students(s:StudentRequest
                 ,db=Depends(get_db)):
    d=s.model_dump(exclude_unset=False)
@@ -57,16 +57,3 @@ def add_students(s:StudentRequest
    if not stu_new:
        raise HTTPException(status_code=500,detail='添加失败')
    return stu_new
-
-
-@StudentAPI.put('/students',tags=['学⽣基本信息管理模块'])
-def get_students(stu_id:int|None = None
-                 ,stu_name:str|None = None
-                 ,class_id:int|None=None
-                 ,db=Depends(get_db)
-                 ,page:int=1
-                 ,page_size:int=10):
-    r = get_student_dao(stu_id,stu_name,class_id,db,page,page_size )
-    if r:
-        return r
-    raise HTTPException(status_code=404,detail='学生不存在！')
@@ -1,9 +1,9 @@
-from fastapi import HTTPException,Depends
+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=Depends(get_db())):
+def get_employment_dao(stu_id,class_id,db):
    try:
        q = db.query(Employment_info).\
            join(Student_Model,Employment_info.stu_id == Student_Model.stu_id).\
@@ -27,20 +27,19 @@ def get_employment_dao(stu_id,class_id,db=Depends(get_db())):
                    ,'company_name':i.company_name
                    ,'company_address':i.company_address
                    ,'salary':i.salary
-                    }for i in r
+                     }for i in r
                    ]
    except:
        raise HTTPException(status_code=404,detail='信息不存在！')

-# def add_employment_dao(e:EmlpoymentRequest,db=Depends(get_db()),stu_id):
-#     try:
-#         r = db.query(Employment_info).filter(Employment_info.stu_id == stu_id).all()
-#         if r:
-#         e1 = Employment_info(**e)
-#         db.add(e1)
-#     except:
-#         db.rollback()
-#         return False
-#     else:
-#         db.commit()
-#         return True
+def add_employment_dao(e:EmploymentRequest,db):
+    try:
+        d = e.model_dump()
+        e1 = Employment_info(**d)
+        db.add(e1)
+    except:
+        db.rollback()
+        raise HTTPException(status_code=404, detail='信息不存在！')
+    else:
+        db.commit()
+        return e1
@@ -1,10 +1,10 @@
-from fastapi import Query,HTTPException
-from pydantic import BaseModel, field_validator
+from fastapi import HTTPException
+from pydantic import BaseModel, Field,field_validator, model_validator
 from datetime import date
 from typing import Optional

 class EmploymentRequest(BaseModel):
-    stu_id: int=Query(ge=1)
+    stu_id: int=Field(ge=1)
    email: str|None
    employment_opening_date:date
    offer_issuance_date:date
@@ -13,11 +13,17 @@ class EmploymentRequest(BaseModel):
    salary:float

    @field_validator('stu_id')
-    def check(cls,n):
-        i = cls.model_dump()
-        if i['stu_id'] == n:
-            return n
-        raise HTTPException(status_code=404,detail='未找到该学生的就业信息！')
+    @classmethod
+    def check_stu_id(cls,v):
+        if v <= 0:
+            raise ValueError('输入有误，学生ID必须大于0')
+        return v
+
+    @model_validator(mode='after')
+    def check_date(self):
+        if self.employment_opening_date > self.offer_issuance_date:
+            raise ValueError('offer下发日期不能早于就业开放日期')
+        return self

 class EmploymentResponse(BaseModel):
    code:int = 200