1
This commit is contained in:
@@ -1,28 +1,41 @@
|
||||
from fastapi import APIRouter,Depends,HTTPException
|
||||
from dao.student_dao import delete_student_dao,add_student_dao,update_student_dao,get_student_dao
|
||||
from schema.student_schema import StudentRequest,StudentResponse,StugetResponse
|
||||
from dao.student_dao import *
|
||||
from schema.student_schema import *
|
||||
from util.database import get_db
|
||||
|
||||
|
||||
StudentAPI = APIRouter()
|
||||
|
||||
@StudentAPI.get('/',description='查询学生信息')
|
||||
@StudentAPI.get('/',response_model=list[StudentPageResponse],description='查询学生信息')
|
||||
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='学生不存在')
|
||||
r, total = get_student_dao(stu_id=stu_id
|
||||
,stu_name=stu_name
|
||||
,class_id=class_id
|
||||
,page=page
|
||||
,page_size=page_size
|
||||
,db=db)
|
||||
|
||||
if not r:
|
||||
raise HTTPException(status_code=404,detail='学生不存在')
|
||||
return {'code': 200
|
||||
, 'detail': 'ok'
|
||||
, 'page': page
|
||||
, 'page_size': page_size
|
||||
, 'total': total
|
||||
, 'data': r}
|
||||
|
||||
@StudentAPI.put('/{stu_id}')
|
||||
def update_students(s:StudentRequest
|
||||
,stu_id:int
|
||||
,db=Depends(get_db)):
|
||||
d = s.model_dump(exclude_unset=True)
|
||||
if not d:
|
||||
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='没有更新!')
|
||||
@@ -36,23 +49,13 @@ def del_students(stu_id:int
|
||||
raise HTTPException(status_code=500,detail='没有删除')
|
||||
return {'code':200,'totals':rows,'detail':'删除成功'}
|
||||
|
||||
@StudentAPI.post('/',response_model=list[StugetResponse])
|
||||
@StudentAPI.post('/',response_model=StugetResponse,description='新增学生')
|
||||
def add_students(s:StudentRequest
|
||||
,db=Depends(get_db)):
|
||||
d=s.model_dump(exclude_unset=True)
|
||||
r=add_student_dao(o=d,db=db)
|
||||
if not r:
|
||||
d=s.model_dump(exclude_unset=False)
|
||||
stu_new=add_student_dao(o=d,db=db)
|
||||
if not stu_new:
|
||||
raise HTTPException(status_code=500,detail='添加失败')
|
||||
return stu_new
|
||||
|
||||
|
||||
@StudentAPI.put('/')
|
||||
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='学生不存在!')
|
||||
|
||||
@@ -3,7 +3,7 @@ from util.database import get_db
|
||||
from model.all_model import Student_Model
|
||||
from typing import List, Optional, Dict, Any
|
||||
|
||||
def add_student_dao(o,db=Depends(get_db)):
|
||||
def add_student_dao(o,db):
|
||||
try:
|
||||
o1 = Student_Model( **o)
|
||||
db.add(o1)
|
||||
@@ -14,7 +14,7 @@ def add_student_dao(o,db=Depends(get_db)):
|
||||
db.commit()
|
||||
return True
|
||||
|
||||
def delete_student_dao(stu_id,db=Depends(get_db)):
|
||||
def delete_student_dao(stu_id,db):
|
||||
try:
|
||||
rows = db.query(Student_Model).filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0)\
|
||||
.update({'delete_status':1})
|
||||
@@ -25,7 +25,7 @@ def delete_student_dao(stu_id,db=Depends(get_db)):
|
||||
finally:
|
||||
return rows
|
||||
|
||||
def update_student_dao(stu_id,update_data,db=Depends(get_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 )
|
||||
except:
|
||||
@@ -40,16 +40,19 @@ def get_student_dao(stu_id:Optional[int]
|
||||
,class_id:Optional[int]
|
||||
,page: int
|
||||
,page_size: int
|
||||
,db=Depends(get_db)
|
||||
,db
|
||||
) -> tuple[List[Dict[str, Any]], int]:
|
||||
q = db.query(Student_Model)
|
||||
if stu_id:
|
||||
q = q.filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0)
|
||||
if stu_name:
|
||||
q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"),Student_Model.delete_status == 0)
|
||||
if class_id:
|
||||
q= q.filter(Student_Model.class_id == class_id,Student_Model.delete_status == 0)
|
||||
total = q.count()
|
||||
r = q.offset((page - 1) * page_size).limit(page_size).all()
|
||||
|
||||
return r
|
||||
try:
|
||||
q = db.query(Student_Model)
|
||||
if stu_id:
|
||||
q = q.filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0)
|
||||
if stu_name and stu_name.strip() != "":
|
||||
q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"),Student_Model.delete_status == 0)
|
||||
if class_id:
|
||||
q= q.filter(Student_Model.class_id == class_id,Student_Model.delete_status == 0)
|
||||
total = q.count()
|
||||
r = q.offset((page - 1) * page_size).limit(page_size).all()
|
||||
return total,r
|
||||
except:
|
||||
db.rollback()
|
||||
return [],0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from datetime import date
|
||||
from typing import Self
|
||||
from typing import Self,List
|
||||
from pydantic import BaseModel, field_serializer, field_validator,model_validator
|
||||
|
||||
|
||||
@@ -10,12 +10,12 @@ class StudentRequest(BaseModel):
|
||||
age:int |None = None
|
||||
gender:str |None = None
|
||||
native_place:str |None = None
|
||||
birthday:date
|
||||
birthday:date |None = None
|
||||
school:str |None = None
|
||||
major:str |None = None
|
||||
degree:str |None = None
|
||||
admission_date:date
|
||||
graduation_date:date
|
||||
admission_date:date |None = None
|
||||
graduation_date:date |None = None
|
||||
@field_validator('age')
|
||||
@classmethod
|
||||
def check_age(cls, v):
|
||||
@@ -51,16 +51,32 @@ class StudentResponse(BaseModel):
|
||||
class StugetResponse(BaseModel):
|
||||
code:int = 200
|
||||
detail:str = 'ok'
|
||||
class_id: int | None = None
|
||||
stu_name: str | None = None
|
||||
age: int | None = None
|
||||
gender: str | None = None
|
||||
native_place: str | None = None
|
||||
birthday: date | 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(cls, progress: int):
|
||||
d1 = {
|
||||
0: '学习中',
|
||||
1: '求职中',
|
||||
2: '已就业'
|
||||
}
|
||||
return d1.get(progress, '暂不明确')
|
||||
|
||||
class StudentPageResponse(BaseModel):
|
||||
code: int = 200
|
||||
detail: str = "ok"
|
||||
page: int
|
||||
page_size: int
|
||||
class_id: int
|
||||
stu_name: str
|
||||
age: int
|
||||
gender: str
|
||||
native_place: str
|
||||
birthday: date
|
||||
school: str
|
||||
major: str
|
||||
degree: str
|
||||
admission_date: date
|
||||
graduation_date: date
|
||||
total: int
|
||||
data: List[StugetResponse]
|
||||
Reference in New Issue
Block a user