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

PythonProject/api/cla_api.py

@@ -5,27 +5,27 @@ from dao.cla_dao import add_class_dao,get_class_dao,update_class_dao,delete_clas
 
 claAPI = APIRouter(prefix="/class", tags=["班级管理"])
 
-@claAPI.post("/class", summary="新增班级")
+@claAPI.post("/", summary="新增班级")
 def add_class(data: claRequest, Session = Depends(get_db)):
     return add_class_dao(data, Session)
 
-@claAPI.get("/class/list", summary="查询班级")
+@claAPI.get("/list", summary="查询班级")
 def list_class(Session = Depends(get_db)):
     return get_class_dao(Session)
 
-@claAPI.put("/class/{class_id}", summary="更新班级信息")
+@claAPI.put("/{class_id}", summary="更新班级信息")
 def update_class(class_id: int, data: claRequest, Session = Depends(get_db)):
     return update_class_dao(class_id, data, Session)
 
-@claAPI.get("/class/{class_id}", summary="逻辑删除班级信息")
+@claAPI.delete("/{class_id}", summary="逻辑删除班级信息")
 def delete_class(class_id: int, Session = Depends(get_db)):
     return delete_class_dao(class_id, Session)
 
-@claAPI.get("/class/delete/check/{class_id}", summary="硬删除前查询")
+@claAPI.get("/delete/check/{class_id}", summary="硬删除前查询")
 def check_delete(class_id: int, Session = Depends(get_db)):
     return get_class_for_delete(class_id, Session)
 
-@claAPI.delete("/class/delete/confirm/{class_id}", summary="删除班级信息")
+@claAPI.delete("/delete/confirm/{class_id}", summary="删除班级信息")
 def confirm_delete(class_id: int, Session = Depends(get_db)):
     return hard_delete_class(class_id, Session)
 

PythonProject/api/employment_api.py

@@ -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(tags=['学生就业管理系统'])
-emp_api = APIRouter()
+@emp_api.get('/employment/students/{stu_id}',response_model=EmploymentResponse,summary='获取学生就业信息')
-@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()
+        return employment_dao.get_employment_dao(stu_id=stu_id,db=db)
-    except:
     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()
+        return employment_dao.get_employment_dao(class_id=class_id,db=db)
-    except:
     raise HTTPException(status_code=404, detail='该班级就业信息不存在')
 
-# @emp_api.post('employment/students/{stu_id}')
+# @emp_api.post('/employment/students/{stu_id}')
-# def create_emp_info(stu_id: int,db=Depends(get_db)):
+# def create_emp_info(stu_id: int,db=Depends(get_db),response_model=EmploymentResponse):
-#     try:
+#     if stu_id:
-#     pass
+#
+#         return employment_dao.

PythonProject/dao/employment_dao.py

@@ -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).\
@@ -32,15 +32,14 @@ def get_employment_dao(stu_id,class_id,db=Depends(get_db())):
     except:
         raise HTTPException(status_code=404,detail='信息不存在！')
 
-# def add_employment_dao(e:EmlpoymentRequest,db=Depends(get_db()),stu_id):
+def add_employment_dao(e:EmploymentRequest,db):
-#     try:
+    try:
-#         r = db.query(Employment_info).filter(Employment_info.stu_id == stu_id).all()
+        d = e.model_dump()
-#         if r:
+        e1 = Employment_info(**d)
-#         e1 = Employment_info(**e)
+        db.add(e1)
-#         db.add(e1)
+    except:
-#     except:
+        db.rollback()
-#         db.rollback()
+        raise HTTPException(status_code=404, detail='信息不存在！')
-#         return False
+    else:
-#     else:
+        db.commit()
-#         db.commit()
+        return e1
-#         return True

PythonProject/schema/employment_schema.py

@@ -1,10 +1,10 @@
-from fastapi import Query,HTTPException
+from fastapi import HTTPException
-from pydantic import BaseModel, field_validator
+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):
+    @classmethod
-        i = cls.model_dump()
+    def check_stu_id(cls,v):
-        if i['stu_id'] == n:
+        if v <= 0:
-            return n
+            raise ValueError('输入有误，学生ID必须大于0')
-        raise HTTPException(status_code=404,detail='未找到该学生的就业信息！')
+        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