Merge remote-tracking branch 'origin/conding' into conding
This commit is contained in:
@@ -1,9 +1,14 @@
|
||||
from fastapi import APIRouter,Depends,HTTPException,Path
|
||||
from util.database import get_db
|
||||
from model.student_model import Student_Model
|
||||
from model.all_model import Student_Model
|
||||
from dao.grade_dao import *
|
||||
|
||||
gradeAPI = APIRouter()
|
||||
gradeAPI = APIRouter(tags=['学生考核成绩'])
|
||||
|
||||
@gradeAPI.get(f"/grade/{id}",summary="根据ID查询单条成绩")
|
||||
def get_grade(id:int,db=Depends(get_db)):
|
||||
r =db.
|
||||
@gradeAPI.get("/grade/{stu_id}",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}
|
||||
except Exception as e:
|
||||
raise HTTPException(status_code=500,detail=f'数据库查询异常:{str(e)}')
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from fastapi import APIRouter,Depends,HTTPException
|
||||
from schema.student_schema import StudentResponse
|
||||
from dao.student_dao import delete_student_dao,add_student_dao,update_student_dao,get_student_dao,select_age
|
||||
from schema.student_schema import StudentRequest,StudentResponse
|
||||
from schema.student_schema import StudentRequest,StudentResponse,StugetResponse
|
||||
from model.student_model import Student_Model
|
||||
from util.database import get_db
|
||||
|
||||
@@ -9,24 +9,27 @@ from util.database import get_db
|
||||
StudentAPI = APIRouter()
|
||||
|
||||
@StudentAPI.get("/age",response_model=StudentResponse,tags=['统计分析模块'],description='根据年龄查询学生信息')
|
||||
def get_students(min_age:int|None=None,max_age:int|None=None):
|
||||
def get_students(min_age:int|None=None
|
||||
,max_age:int|None=None):
|
||||
l = select_age(min_age,max_age)
|
||||
return [i for i in l]
|
||||
|
||||
@StudentAPI.get('',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):
|
||||
,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='学生不存在')
|
||||
|
||||
@StudentAPI.put('/{stu_id}')
|
||||
def update_orders(s:StudentRequest,stu_id:int,db=Depends(get_db)):
|
||||
def update_students(s:StudentRequest
|
||||
,stu_id:int
|
||||
,db=Depends(get_db)):
|
||||
d = s.model_dump(exclude_unset=True)
|
||||
r = update_student_dao( stu_id=stu_id,update_data=d,db=db )
|
||||
if not r:
|
||||
@@ -34,11 +37,30 @@ def update_orders(s:StudentRequest,stu_id:int,db=Depends(get_db)):
|
||||
return {'code':200,'totals':r,'detail':'更新成功'}
|
||||
|
||||
@StudentAPI.delete('/{stu_id}')
|
||||
def del_student(stu_id:int,db=Depends(get_db)):
|
||||
def del_students(stu_id:int
|
||||
,db=Depends(get_db)):
|
||||
rows=delete_student_dao( stu_id=stu_id,db=db )
|
||||
if not rows:
|
||||
raise HTTPException(status_code=500,detail='没有删除')
|
||||
return {'code':200,'totals':rows,'detail':'删除成功'}
|
||||
|
||||
@StudentAPI.post('',response_model=list[StugetResponse])
|
||||
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:
|
||||
raise HTTPException(status_code=500,detail='添加失败')
|
||||
|
||||
|
||||
@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='学生不存在!')
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
from fastapi import HTTPException,Depends
|
||||
from util.database import get_db
|
||||
from model.student_model import Student_Model
|
||||
from model.all_model import Student_Model
|
||||
from typing import List, Optional, Dict, Any
|
||||
from sqlalchemy import func
|
||||
|
||||
# 实现根据年龄查询学生信息的功能
|
||||
def select_age(min_age,max_age,session=Depends(get_db)):
|
||||
try:
|
||||
if min_age is None and max_age is None:
|
||||
@@ -18,6 +20,16 @@ def select_age(min_age,max_age,session=Depends(get_db)):
|
||||
except Exception:
|
||||
raise HTTPException(status_code=500,detail="查询异常")
|
||||
|
||||
# 实现统计每个班级的学员总数以及男女生的总数的功能
|
||||
def select_all(session=Depends(get_db)):
|
||||
print('1234')
|
||||
try:
|
||||
l1 = session.query(Student_Model.class_id,func.count(1)).group_by(Student_Model.class_id,Student_Model.gender).all()
|
||||
print(l1)
|
||||
return l1
|
||||
except Exception:
|
||||
raise HTTPException(status_code=500,detail="查询异常")
|
||||
|
||||
def add_student_dao(o,db=Depends(get_db)):
|
||||
try:
|
||||
o1 = Student_Model( **o)
|
||||
@@ -66,14 +78,7 @@ def get_student_dao(stu_id:Optional[int]
|
||||
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()
|
||||
data = []
|
||||
for i in r:
|
||||
data.append({'stu_id': i.stu_id
|
||||
,'stu_name': i.stu_name
|
||||
,'class_id': i.class_id
|
||||
,'create_date': i.create_date
|
||||
,'update_date': i.update_date
|
||||
})
|
||||
return data, total
|
||||
|
||||
return r
|
||||
|
||||
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
from fastapi import HTTPException,Depends
|
||||
|
||||
from PythonProject.model.teacher_model import Teacher_Model
|
||||
from model.all_model import Teacher_Model
|
||||
from util.database import *
|
||||
from schema.teacher_schema import Teacher_RequestModel
|
||||
|
||||
|
||||
def add_teacher(req:Teacher_RequestModel,session=Depends(get_db)):
|
||||
try:
|
||||
data=req.model_dump()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from fastapi import FastAPI
|
||||
from api.student_api import *
|
||||
from api.student_api import StudentAPI
|
||||
app = FastAPI()
|
||||
|
||||
app.include_router(studentapi)
|
||||
app.include_router(StudentAPI)
|
||||
|
||||
@@ -0,0 +1,188 @@
|
||||
from sqlalchemy import DATETIME,Column,Integer,String,DATE,ForeignKey,Numeric
|
||||
from datetime import datetime
|
||||
from util.database import Base,engine
|
||||
|
||||
class Student_Model(Base):
|
||||
__tablename__ = 'wl_student'
|
||||
|
||||
stu_id = Column(Integer
|
||||
, primary_key=True
|
||||
, autoincrement=True
|
||||
,comment='学生编号')
|
||||
|
||||
class_id=Column(Integer
|
||||
,ForeignKey('wl_class.class_id')
|
||||
,nullable=False
|
||||
,comment='班级编号')
|
||||
|
||||
stu_name=Column(String(100),comment='学生姓名')
|
||||
|
||||
age=Column(Integer,comment='年龄')
|
||||
|
||||
gender=Column(String(50),comment='性别')
|
||||
|
||||
native_place=Column(String(200),comment='籍贯')
|
||||
|
||||
birthday=Column(DATE,comment='生日')
|
||||
|
||||
school=Column(String(100),comment='毕业学校')
|
||||
|
||||
major=Column(String(50),comment='专业')
|
||||
|
||||
degree=Column(String(50),comment='学历')
|
||||
|
||||
admission_date=Column(DATE,comment='入学日期')
|
||||
|
||||
graduation_date=Column(DATE,comment='毕业日期')
|
||||
|
||||
progress=Column(Integer,default=0,comment='课程进度:学习中=0,求职中=1,已就业=2')
|
||||
|
||||
create_date=Column(DATETIME
|
||||
,default=datetime.now)
|
||||
|
||||
update_date=Column(DATETIME
|
||||
,default=datetime.now
|
||||
,onupdate=datetime.now)
|
||||
|
||||
delete_status = Column(
|
||||
Integer,default=0,comment='删除状态:0未删除,1已删除')
|
||||
|
||||
delete_time = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='删除时间')
|
||||
|
||||
class ClassManagement(Base):
|
||||
__tablename__ = "wl_class"
|
||||
|
||||
class_id= Column(Integer, primary_key=True, autoincrement=True,comment='班级编号')
|
||||
|
||||
class_name = Column(String(100), comment='班级姓名')
|
||||
|
||||
start_class_date = Column(DATE,comment='开课时间')
|
||||
|
||||
head_teacher_id= Column(Integer,ForeignKey('wl_teacher.teac_id'),comment='班主任')
|
||||
|
||||
class_teacher_id = Column(Integer,ForeignKey('wl_teacher.teac_id'),comment='授课教师')
|
||||
|
||||
Entry_date= Column(DATETIME,default=datetime.now,comment='录入时间')
|
||||
|
||||
update_date = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='更新时间')
|
||||
|
||||
delete_status = Column(Integer,default=0,comment='删除状态:0未删除,1已删除')
|
||||
|
||||
delete_time = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='删除时间')
|
||||
|
||||
class Teacher_Model(Base):
|
||||
__tablename__ = 'wl_teacher'
|
||||
|
||||
teac_id=Column(Integer,primary_key=True,autoincrement=True,comment='老师编号')
|
||||
|
||||
teac_name=Column(String(20),comment='老师姓名')
|
||||
|
||||
teac_gender=Column(String(5),comment='老师性别')
|
||||
|
||||
teac_age=Column(Integer,comment='老师年龄')
|
||||
|
||||
teac_position =Column(String(20),comment='老师职位')
|
||||
|
||||
create_date=Column(DATETIME,default=datetime.now)
|
||||
|
||||
update_date=Column(DATETIME,default=datetime.now,onupdate=datetime.now)
|
||||
|
||||
delete_status = Column(
|
||||
Integer,default=0,comment='删除状态:0未删除,1已删除')
|
||||
|
||||
delete_time = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='删除时间')
|
||||
|
||||
class Employment_info(Base):
|
||||
__tablename__ = 'wl_employment'
|
||||
|
||||
emp_id = Column(Integer
|
||||
,primary_key=True
|
||||
,autoincrement=True
|
||||
,comment='序号'
|
||||
)
|
||||
|
||||
stu_id = Column(Integer
|
||||
,ForeignKey('wl_student.stu_id')
|
||||
,nullable=False
|
||||
,comment='学生编号'
|
||||
)
|
||||
|
||||
email = Column(String(50)
|
||||
,unique=True
|
||||
,comment='邮箱'
|
||||
)
|
||||
|
||||
employment_opening_date = Column(DATE
|
||||
,comment='就业开放日期'
|
||||
)
|
||||
|
||||
offer_issuance_date = Column(DATE
|
||||
,comment='offer下发日期'
|
||||
)
|
||||
|
||||
company_name = Column(String(50)
|
||||
,comment='就业公司名称'
|
||||
)
|
||||
|
||||
company_address = Column(String(100)
|
||||
,comment='就业公司地址'
|
||||
)
|
||||
|
||||
salary = Column(Integer
|
||||
,comment='薪资'
|
||||
)
|
||||
|
||||
create_time = Column(DATETIME
|
||||
,default=datetime.now
|
||||
,comment='创建时间'
|
||||
)
|
||||
|
||||
update_time = Column(DATETIME
|
||||
,default=datetime.now
|
||||
,onupdate=datetime.now
|
||||
,comment='更新时间'
|
||||
)
|
||||
|
||||
delete_status = Column(
|
||||
Integer,default=0,comment='删除状态:0未删除,1已删除')
|
||||
|
||||
delete_time = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='删除时间')
|
||||
|
||||
class WlScore(Base):
|
||||
__tablename__ = 'wl_score'
|
||||
|
||||
score_id = Column(Integer
|
||||
,primary_key=True
|
||||
,autoincrement=True
|
||||
,comment='序号'
|
||||
)
|
||||
|
||||
stu_id = Column( Integer
|
||||
,ForeignKey('wl_student.stu_id')
|
||||
,autoincrement=True
|
||||
,comment='学生编号')
|
||||
|
||||
exam_order = Column(Integer
|
||||
, nullable=False
|
||||
, comment="考核序次")
|
||||
|
||||
score=Column(Numeric(5, 2)
|
||||
, comment="成绩")
|
||||
|
||||
create_time = Column(DATETIME
|
||||
, nullable=False
|
||||
, default=datetime.now
|
||||
, comment="作成时间")
|
||||
|
||||
update_time = Column(DATETIME
|
||||
, nullable=False
|
||||
, default=datetime.now
|
||||
, onupdate=datetime.now
|
||||
, comment="更新时间")
|
||||
|
||||
delete_status = Column(
|
||||
Integer,default=0,comment='删除状态:0未删除,1已删除')
|
||||
|
||||
delete_time = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='删除时间')
|
||||
|
||||
Base.metadata.create_all(engine)
|
||||
@@ -1,33 +0,0 @@
|
||||
from sqlalchemy import DATETIME,Date,Column,Integer,ForeignKey,String
|
||||
from util.database import Base,engine
|
||||
from datetime import datetime
|
||||
|
||||
class ClassManagement(Base):
|
||||
__tablename__ = "wl_class"
|
||||
|
||||
class_id= Column(Integer, primary_key=True, autoincrement=True,comment='班级编号')
|
||||
|
||||
class_name = Column(String(100), comment='班级姓名')
|
||||
|
||||
start_class_date = Column(Date,comment='开课时间')
|
||||
|
||||
head_teacher_id= Column(Integer,ForeignKey('wl_teacher.id'),comment='班主任')
|
||||
|
||||
class_teacher_id = Column(Integer,ForeignKey('wl_teacher.id'),comment='授课教师')
|
||||
|
||||
Entry_date= Column(DATETIME,default=datetime.now,comment='录入时间')
|
||||
|
||||
update_date = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='更新时间')
|
||||
|
||||
delete_status = Column(Integer,default=0,comment='删除状态:0未删除,1已删除')
|
||||
|
||||
delete_time = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='删除时间')
|
||||
|
||||
Base.metadata.create_all(engine)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
from util.database import Base,engine
|
||||
from sqlalchemy import Column,Integer,String,DATE,DATETIME,ForeignKey,Numeric
|
||||
from datetime import datetime
|
||||
|
||||
class Employment_info(Base):
|
||||
__tablename__ = 'wl_employment'
|
||||
|
||||
emp_id = Column(Integer
|
||||
,primary_key=True
|
||||
,autoincrement=True
|
||||
,comment='序号'
|
||||
)
|
||||
|
||||
stu_id = Column(Integer
|
||||
,ForeignKey('wl_student.stu_id')
|
||||
,nullable=False
|
||||
,comment='学生编号'
|
||||
)
|
||||
|
||||
email = Column(String(50)
|
||||
,unique=True
|
||||
,comment='邮箱'
|
||||
)
|
||||
|
||||
employment_opening_date = Column(DATE
|
||||
,comment='就业开放日期'
|
||||
)
|
||||
|
||||
offer_issuance_date = Column(DATE
|
||||
,comment='offer下发日期'
|
||||
)
|
||||
|
||||
company_name = Column(String(50)
|
||||
,comment='就业公司名称'
|
||||
)
|
||||
|
||||
company_address = Column(String(100)
|
||||
,comment='就业公司地址'
|
||||
)
|
||||
|
||||
salary = Column(Numeric(10,2)
|
||||
,nullable=False
|
||||
,comment='薪资'
|
||||
)
|
||||
|
||||
create_time = Column(DATETIME
|
||||
,default=datetime.now
|
||||
,comment='创建时间'
|
||||
)
|
||||
|
||||
update_time = Column(DATETIME
|
||||
,default=datetime.now
|
||||
,onupdate=datetime.now
|
||||
,comment='更新时间'
|
||||
)
|
||||
|
||||
delete_status = Column(
|
||||
Integer,default=0,comment='删除状态:0未删除,1已删除')
|
||||
|
||||
delete_time = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='删除时间')
|
||||
|
||||
Base.metadata.create_all(engine)
|
||||
@@ -1,43 +0,0 @@
|
||||
from sqlalchemy import Column, Integer, Numeric, DATETIME,ForeignKey
|
||||
from datetime import datetime
|
||||
from util.database import Base,engine
|
||||
|
||||
# 成绩、删除状态(0:已删除,1:初始值)、作成时间、更新时间
|
||||
class WlScore(Base):
|
||||
__tablename__ = 'wl_score'
|
||||
|
||||
score_id = Column(Integer
|
||||
,primary_key=True
|
||||
,autoincrement=True
|
||||
,comment='序号'
|
||||
)
|
||||
|
||||
stu_id = Column( Integer
|
||||
,ForeignKey('wl_student.stu_id')
|
||||
,autoincrement=True
|
||||
,comment='学生编号')
|
||||
|
||||
exam_order = Column(Integer
|
||||
, nullable=False
|
||||
, comment="考核序次")
|
||||
|
||||
score=Column(Numeric(5, 2)
|
||||
, comment="成绩")
|
||||
|
||||
create_time = Column(DATETIME
|
||||
, nullable=False
|
||||
, default=datetime.now
|
||||
, comment="作成时间")
|
||||
|
||||
update_time = Column(DATETIME
|
||||
, nullable=False
|
||||
, default=datetime.now
|
||||
, onupdate=datetime.now
|
||||
, comment="更新时间")
|
||||
|
||||
delete_status = Column(
|
||||
Integer,default=0,comment='删除状态:0未删除,1已删除')
|
||||
|
||||
delete_time = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='删除时间')
|
||||
|
||||
Base.metadata.create_all(engine)
|
||||
@@ -1,52 +0,0 @@
|
||||
from sqlalchemy import DATETIME,Column, Integer, String, Date,ForeignKey
|
||||
from datetime import datetime
|
||||
from util.database import Base,engine
|
||||
|
||||
class Student_Model(Base):
|
||||
__tablename__ = 'wl_student'
|
||||
|
||||
stu_id = Column(Integer
|
||||
, primary_key=True
|
||||
, autoincrement=True
|
||||
,comment='学生编号')
|
||||
|
||||
class_id=Column(Integer
|
||||
,ForeignKey('wl_class.class_id')
|
||||
,nullable=False
|
||||
,comment='班级编号')
|
||||
|
||||
stu_name=Column(String(100),comment='学生姓名')
|
||||
|
||||
age=Column(Integer,comment='年龄')
|
||||
|
||||
gender=Column(String(50),comment='性别')
|
||||
|
||||
native_place=Column(String(200),comment='籍贯')
|
||||
|
||||
birthday=Column(Date,comment='生日')
|
||||
|
||||
school=Column(String(100),comment='毕业学校')
|
||||
|
||||
major=Column(String(50),comment='专业')
|
||||
|
||||
degree=Column(String(50),comment='学历')
|
||||
|
||||
admission_date=Column(Date,comment='入学日期')
|
||||
|
||||
graduation_date=Column(Date,comment='毕业日期')
|
||||
|
||||
progress=Column(Integer,default=0,comment='课程进度:学习中=0,求职中=1,已就业=2')
|
||||
|
||||
create_date=Column(DATETIME
|
||||
,default=datetime.now)
|
||||
|
||||
update_date=Column(DATETIME
|
||||
,default=datetime.now
|
||||
,onupdate=datetime.now)
|
||||
|
||||
delete_status = Column(
|
||||
Integer,default=0,comment='删除状态:0未删除,1已删除')
|
||||
|
||||
delete_time = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='删除时间')
|
||||
|
||||
Base.metadata.create_all(engine)
|
||||
@@ -1,28 +0,0 @@
|
||||
from sqlalchemy import DATETIME,Column, Integer, String, Date,ForeignKey
|
||||
from datetime import datetime
|
||||
from util.database import Base,engine
|
||||
|
||||
class Teacher_Model(Base):
|
||||
__tablename__ = 'wl_teacher'
|
||||
|
||||
teac_id=Column(Integer,primary_key=True,autoincrement=True,comment='老师编号')
|
||||
|
||||
teac_name=Column(String(20),comment='老师姓名')
|
||||
|
||||
teac_gender=Column(String(5),comment='老师性别')
|
||||
|
||||
teac_age=Column(Integer,comment='老师年龄')
|
||||
|
||||
teac_position =Column(String(20),comment='老师职位')
|
||||
|
||||
create_date=Column(DATETIME,default=datetime.now)
|
||||
|
||||
update_date=Column(DATETIME,default=datetime.now,onupdate=datetime.now)
|
||||
|
||||
delete_status = Column(
|
||||
Integer,default=0,comment='删除状态:0未删除,1已删除')
|
||||
|
||||
delete_time = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='删除时间')
|
||||
|
||||
Base.metadata.create_all(engine)
|
||||
|
||||
@@ -3,6 +3,7 @@ from typing import Self
|
||||
from pydantic import BaseModel, field_serializer, field_validator,model_validator
|
||||
|
||||
|
||||
|
||||
class StudentRequest(BaseModel):
|
||||
class_id:int |None = None
|
||||
stu_name:str |None = None
|
||||
@@ -29,6 +30,7 @@ class StudentRequest(BaseModel):
|
||||
raise ValueError ('入学日期不能晚于毕业日期')
|
||||
return self
|
||||
|
||||
|
||||
class StudentResponse(BaseModel):
|
||||
code:int = 200
|
||||
detail:str = 'ok'
|
||||
@@ -45,3 +47,20 @@ class StudentResponse(BaseModel):
|
||||
2:'已就业'
|
||||
}
|
||||
return d1.get(progress,'暂不明确')
|
||||
|
||||
class StugetResponse(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
|
||||
Reference in New Issue
Block a user