Merge pull request 'Conding' (#7) from conding into master

Reviewed-on: #7

PythonProject/api/employment_api.py

@@ -7,15 +7,15 @@ from typing import Optional
 emp_api = APIRouter(tags=['学生就业管理模块'])
 
 @emp_api.get('/employment/class/{class_id}',response_model=list[EmploymentResponse],summary='获取班级学生就业信息')
-def get_emp_info2(class_id: Optional[int]=Path(description='班级编号')
+def get_emp_info1(class_id: Optional[int]=Path(description='班级编号')
                   ,db=Depends(get_db)):
-    e2 = employment_dao.get_emp_dao(class_id=class_id, db=db)
-    if e2:
-        return e2
+    e1 = employment_dao.get_emp_dao(class_id=class_id, db=db)
+    if e1:
+        return e1
     raise HTTPException(status_code=404, detail='该班级就业信息不存在')
 
 @emp_api.get('/employment/students/{stu_id}',response_model=list[EmploymentResponse],summary='按照学⽣编号，公司名字，⼯资范围查询学⽣就业信息')
-def get_emp_info3(stu_id:int = Path(description='学生编号')
+def get_emp_info2(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='最高工资')
@@ -27,6 +27,8 @@ def get_emp_info3(stu_id:int = Path(description='学生编号')
                                , company_name=company_name
                                , min_salary=min_salary
                                , max_salary=max_salary)
+    if not l1:
+        raise HTTPException(status_code=404,detail='该学生就业信息不存在！')
     return l1
 
 @emp_api.post('/employment/students/{stu_id}',response_model=EmploymentResponse,summary='新增学生就业信息')

PythonProject/api/statistics_api.py

@@ -6,7 +6,7 @@ from util.database import get_db
 
 StatisticsAPI = APIRouter(tags=['统计分析模块'])
 
-@StatisticsAPI.get("/age",response_model=list[StudentResponse],summary='根据年龄查询学生信息')
+@StatisticsAPI.get("/age",response_model=list[StugetResponse],summary='根据年龄查询学生信息')
 def get_students(min_age:int|None=Query(None,ge=0,le=150),max_age:int|None=Query(None,ge=0,le=150),db=Depends(get_db)):
     l = select_age(min_age,max_age,db)
     return l
@@ -44,4 +44,9 @@ def get_emp(db=Depends(get_db)):
 @StatisticsAPI.get('/salaries',summary='统计薪资分布')
 def get_salaries(db=Depends(get_db)):
     s=classify_salary(db)
-    return s
+    return s
+
+@StatisticsAPI.get('/avg_salaries',summary='统计每个班级平均薪资')
+def get_avg_salaries(db=Depends(get_db)):
+    s=avg_salary(db)
+    return s

PythonProject/api/student_api.py

@@ -6,7 +6,7 @@ from util.database import get_db
 
 StudentAPI = APIRouter(tags=['学生基本信息管理模块'])
 
-@StudentAPI.get('/students',response_model=StudentPageResponse,summary='学生信息查询接口',description='查询学生信息')
+@StudentAPI.get('/students',response_model=StuPageResponse,summary='学生信息查询接口',description='查询学生信息')
 def get_students(stu_id:int|None=None
                 ,stu_name:str|None=None
                 ,class_id:int|None=None
@@ -19,39 +19,11 @@ def get_students(stu_id:int|None=None
                                ,page=page
                                ,page_size=page_size
                                ,db=db)
-
-    if not r:
-          raise HTTPException(status_code=404,detail='学生不存在')
-    return StudentPageResponse(page=page,
+    return StuPageResponse(page=page,
                                page_size=page_size,
                                totals=total,
                                data=r)
 
-@StudentAPI.put('/{stu_id}',summary='学生信息更新接口',description='更新学生信息')
-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=404, detail='没有更新')
-    return {'code':200,'totals':r,'detail':'更新成功'}
-
-@StudentAPI.delete('/{stu_id}',summary='学生信息删除接口',description='删除学生信息')
-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=404,detail='对象已被删除')
-    return {'code':200,'totals':rows,'detail':'删除成功'}
-
 @StudentAPI.post('/students',response_model=StugetResponse,summary='学生信息新增接口',description='新增学生信息')
 def add_students(s:StudentRequest
                  ,db=Depends(get_db)):
@@ -62,5 +34,28 @@ def add_students(s:StudentRequest
     if r == 'conflict':
         raise HTTPException(status_code=409, detail='身份证号已存在，请勿重复添加')
     if r == 'error':
-        raise HTTPException(status_code=500, detail='更添加失败，请稍后重试')
+        raise HTTPException(status_code=500, detail='添加失败，请稍后重试')
     return r
+
+@StudentAPI.put('/students/{stu_id}',summary='学生信息更新接口',description='更新学生信息')
+def update_students(stu_id:int
+                    ,s:StuUpdateRequest
+                    ,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 == 'error':
+        raise HTTPException(status_code=500, detail='更新失败，请稍后重试')
+    if not r:
+        raise HTTPException(status_code=404, detail='学生不存在或已被删除，更新失败')
+    return {'code':200,'totals':r,'detail':'更新成功'}
+
+@StudentAPI.delete('/students/{stu_id}',response_model= StudelResponse,summary='学生信息删除接口',description='删除学生信息')
+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=404,detail='学生不存在或已被删除')
+    return {'code':200,'totals':rows,'detail':'删除成功'}

PythonProject/dao/cla_dao.py

@@ -1,6 +1,7 @@
 from model.all_model import ClassManagement
 from fastapi import HTTPException
 from schema.cla_schema import claRequest
+from datetime import datetime
 
 
 def add_class_dao(c: claRequest, session):
@@ -34,7 +35,7 @@ def update_class_dao(id:int,req:claRequest,session):
 def delete_class_dao(id:int,session):
     try:
         session.query(ClassManagement).filter(ClassManagement.class_id==id,ClassManagement.delete_status==0)\
-        .update({'delete_status': 1})
+        .update({'delete_status': 1,'delete_time': datetime.now()})
         session.commit()
     except:
         raise HTTPException(status_code=404, detail="删除异常,请重新核对之后删除！")

PythonProject/dao/employment_dao.py

@@ -31,12 +31,9 @@ def get_emp_dao(db,stu_id=None,class_id=None,company_name=None,min_salary=None,m
         q = q.filter(Employment_info.salary <= max_salary)
 
     r = q.all()
-    if not r:
-        raise HTTPException(status_code=500,detail='查询异常，没有结果！')
     return r
 
 
-
 def add_emp_dao(o,db):
     try:
         stu = db.query(Student_Model).filter(Student_Model.stu_id == o['stu_id']

PythonProject/dao/statistics_dao.py

@@ -23,17 +23,26 @@ def select_all(db):
     try:
         l1 = db.query(Student_Model.class_id,Student_Model.gender,func.count(1).label('cnt'))\
             .group_by(Student_Model.class_id,Student_Model.gender).all()
-        all_cnt = sum(i.cnt for i in l1)
+
+        d1 = {}
+        for i in l1:
+            if i.class_id not in d1:
+                d1[i.class_id] = 0
+            d1[i.class_id] += i.cnt
 
         l2 = []
         for i in l1:
             l2.append({
-                "all_cnt": all_cnt,
+                "all_cnt": d1[i.class_id],
                 "class_id": i.class_id,
                 "gender": i.gender,
                 "cnt": i.cnt
             })
+        if not l2:
+            raise HTTPException(status_code=404, detail="没有数据")
         return l2
+    except HTTPException:
+        raise
     except Exception:
         raise HTTPException(status_code=500,detail="查询异常")
 
@@ -60,7 +69,10 @@ def select_score(min_score,max_score,db):
             db = db.filter(WlScore.score >= min_score)
         if max_score is not None:
             db = db.filter(WlScore.score <= max_score)
-        return db.all()
+        l1 = db.all()
+        if not l1:
+            raise HTTPException(status_code=404, detail="没有数据")
+        return l1
     except HTTPException:
         raise
     except Exception:
@@ -69,12 +81,16 @@ def select_score(min_score,max_score,db):
 # 实现统计每次考试每个班级的平均分并排序的功能
 def select_avg_score(db):
     try:
-        l1 = db.query(Student_Model.class_id,func.avg(WlScore.score).label('avg_score'))\
+        l1 = db.query(Student_Model.class_id,func.round(func.avg(WlScore.score),1).label('avg_score'))\
             .join(Student_Model,WlScore.stu_id == Student_Model.stu_id)\
             .filter(WlScore.delete_status==0,Student_Model.delete_status == 0)\
             .group_by(Student_Model.class_id)\
-            .order_by(func.avg(WlScore.score)).all()
+            .order_by(func.round(func.avg(WlScore.score),1)).all()
+        if not l1:
+            raise HTTPException(status_code=404, detail="没有数据")
         return l1
+    except HTTPException:
+        raise
     except Exception:
         raise HTTPException(status_code=500,detail="查询异常")
 
@@ -96,7 +112,11 @@ def select_salary(db):
             .filter(Employment_info.delete_status==0,Student_Model.delete_status == 0)\
             .order_by(Employment_info.salary.desc())\
             .limit(5).all()
+        if not l1:
+            raise HTTPException(status_code=404, detail="没有数据")
         return l1
+    except HTTPException:
+        raise
     except Exception:
         raise HTTPException(status_code=500,detail="查询异常")
 
@@ -117,19 +137,27 @@ def select_avg_days(db):
                     Employment_info.offer_issuance_date.isnot(None),)\
             .group_by(Student_Model.class_id)\
             .order_by(func.avg(func.datediff(Employment_info.offer_issuance_date,Student_Model.admission_date)).desc()).all()
+        if not l1:
+            raise HTTPException(status_code=404, detail="没有数据")
         return l1
+    except HTTPException:
+        raise
     except Exception:
         raise HTTPException(status_code=500, detail="查询异常")
 
 #统计每个学⽣的就业时⻓
 def select_days(db):
     try:
-        l2 =db.query(Employment_info.stu_id
+        l1 =db.query(Employment_info.stu_id
                     ,func.coalesce(func.datediff(Employment_info.offer_issuance_date
                                    ,Employment_info.employment_opening_date),0)\
                      .label("diff_days")
                      ).filter(Employment_info.delete_status == 0).all()
-        return l2
+        if not l1:
+            raise HTTPException(status_code=404, detail="没有数据")
+        return l1
+    except HTTPException:
+        raise
     except Exception:
         raise HTTPException(status_code=500, detail="查询异常")
 
@@ -150,7 +178,19 @@ def classify_salary(db):
                 c+=1
             else:
                 d+=1
-        return {'5k以下': a, '5k-10k': b, '10k-15k': c, '15k': d}
+        return {'5k以下': a, '5k-10k': b, '10k-15k': c, '15k以上': d}
     except:
         raise HTTPException(status_code=500,detail='查询异常！')
 
+#统计每个班的平均就业薪资
+def avg_salary(db):
+    try:
+        l=db.query(Student_Model.class_id,func.avg(Employment_info.salary).label('avg_salaries'))\
+            .join(Employment_info,Employment_info.stu_id == Student_Model.stu_id)\
+            .filter(Employment_info.salary>0,Employment_info.delete_status==0,Student_Model.delete_status==0)\
+            .group_by(Student_Model.class_id)\
+            .order_by(func.avg(Employment_info.salary).desc()).all()
+        return [{'class_id':i[0],'avg_salaries':i[1]} for i in l]
+    except:
+        raise HTTPException(status_code=500,detail='统计异常！')
+

PythonProject/dao/student_dao.py

@@ -15,7 +15,6 @@ def add_student_dao(o,db):
         o2 = Student_Model(**o)
         db.add(o2)
         db.commit()
-        db.refresh(o2)  # 回填自增的 stu_id
         return o2
     except IntegrityError:
         db.rollback()
@@ -24,27 +23,21 @@ def add_student_dao(o,db):
         db.rollback()
         return 'error'
 
-def delete_student_dao(stu_id,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,'delete_time': datetime.now()})
+        rows = (db.query(Student_Model)
+                .filter(Student_Model.stu_id == stu_id,
+                        Student_Model.delete_status == 0)
+                .update({'delete_status': 1, 'delete_time': datetime.now()}))
         db.commit()
-    except:
-        db.rollback()
-        rows = 0
-    finally:
         return rows
+    except Exception:
+        db.rollback()
+        raise
 
-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'
-
+def update_student_dao(stu_id, update_data, db):
+    if not update_data:
+        return 0
     try:
         rows = (db.query(Student_Model)
                 .filter(Student_Model.stu_id == stu_id,
@@ -57,7 +50,6 @@ def update_student_dao(stu_id,update_data,db):
     except Exception:
         db.rollback()
         return 'error'
-
     return rows
 
 def get_student_dao(stu_id:Optional[int]
@@ -67,17 +59,13 @@ def get_student_dao(stu_id:Optional[int]
                    ,page_size: int
                    ,db
                    ) -> tuple[List[Dict[str, Any]], int]:
-    try:
-        q = db.query(Student_Model).filter(Student_Model.delete_status == 0)
-        if stu_id:
-          q = q.filter(Student_Model.stu_id == stu_id)
-        if stu_name and stu_name.strip() != "":
-          q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"))
-        if class_id:
-          q= q.filter(Student_Model.class_id == class_id)
-        total = q.count()
-        r = q.offset((page - 1) * page_size).limit(page_size).all()
-        return r,total
-    except:
-        db.rollback()
-        return [],0
+    q = db.query(Student_Model).filter(Student_Model.delete_status == 0)
+    if stu_id:
+        q = q.filter(Student_Model.stu_id == stu_id)
+    if stu_name and stu_name.strip() != "":
+        q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"))
+    if class_id:
+        q = q.filter(Student_Model.class_id == class_id)
+    total = q.count()
+    r = q.offset((page - 1) * page_size).limit(page_size).all()
+    return r, total

PythonProject/dao/teacher_dao.py

@@ -10,7 +10,6 @@ def add_teacher(teacher,session):
         return teacher
     except:
         session.rollback()
-        # raise HTTPException(status_code=500,detail='添加异常！')
         return None
 
 def get_teacher(id,session):

PythonProject/main.py

@@ -14,7 +14,7 @@ tags_metadata = [
     {"name": "学生就业管理模块"},
     {"name": "统计分析模块"},
 ]
-app = FastAPI(title='沃林学⽣管理系统',openapi_tags=tags_metadata)
+app = FastAPI(title='沃林学生管理系统',openapi_tags=tags_metadata)
 
 app.include_router(StudentAPI)
 

PythonProject/model/all_model.py

@@ -72,7 +72,7 @@ class ClassManagement(Base):
 
     delete_status = Column(Integer,default=0,comment='删除状态：0未删除，1已删除')
 
-    delete_time = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='删除时间')
+    delete_time = Column(DATETIME,comment='删除时间')
 
 class Teacher_Model(Base):
     __tablename__ = 'wl_teacher'
@@ -149,7 +149,7 @@ class Employment_info(Base):
     delete_status = Column(
         Integer,default=0,comment='删除状态：0未删除，1已删除')
 
-    delete_time = Column(DATETIME,default=None,comment='删除时间')
+    delete_time = Column(DATETIME,comment='删除时间')
 
 class WlScore(Base):
     __tablename__ = 'wl_score'

PythonProject/schema/student_schema.py

@@ -31,23 +31,34 @@ class StudentRequest(BaseModel):
                 raise ValueError ('入学日期不能晚于毕业日期')
         return self
 
+class StuUpdateRequest(BaseModel):
+    class_id: int | None = None
+    stu_name: str | None = None
+    age: int | None = None
+    gender: str | None = None
+    id_card: 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 | None = None
 
-class StudentResponse(BaseModel):
-    code:int = 200
-    detail:str = 'ok'
-    stu_name:str
-    age:int
-    gender:str
-    progress:int
+    @field_validator('age')
+    @classmethod
+    def check_age(cls, v):
+        if v is not None and v < 0:
+            raise ValueError('年龄不能为负数')
+        return v
 
-    @field_serializer('progress')
-    def int_to_string(self,progress:int):
-        d1 ={
-            0:'学习中',
-            1:'求职中',
-            2:'已就业'
-        }
-        return d1.get(progress,'暂不明确')
+    @model_validator(mode='after')
+    def check_admission_graduation(self) -> Self:
+        if self.admission_date and self.graduation_date:
+            if self.admission_date > self.graduation_date:
+                raise ValueError('入学日期不能晚于毕业日期')
+        return self
 
 class StugetResponse(BaseModel):
     model_config = ConfigDict(from_attributes=True)
@@ -58,7 +69,7 @@ class StugetResponse(BaseModel):
     stu_name: str | None = None
     age: int | None = None
     gender: str | None = None
-    id_card: str
+    id_card: str | None = None
     native_place: str | None = None
     birthday: date | None = None
     school: str | None = None
@@ -66,18 +77,21 @@ class StugetResponse(BaseModel):
     degree: str | None = None
     admission_date: date | None = None
     graduation_date: date | None = None
-    progress: int = 0
+    progress: int
 
     @field_serializer('progress')
-    def int_to_string(self, progress: int):
+    def progress_to_label(self, progress):
         d1 = {
             0: '学习中',
             1: '求职中',
             2: '已就业'
         }
-        return d1.get(progress, '暂不明确')
+        try:
+            return d1.get(int(progress), '暂不明确')
+        except (TypeError, ValueError):
+            return progress
 
-class StudentPageResponse(BaseModel):
+class StuPageResponse(BaseModel):
     code: int = 200
     detail: str = "ok"
     page: int
@@ -85,4 +99,10 @@ class StudentPageResponse(BaseModel):
     totals: int
     data: List[StugetResponse]
 
+class StudelResponse(BaseModel):
+    code: int = 200
+    detail: str = "ok"
+    totals: int
+
+