Merge remote-tracking branch 'origin/cyf_class_management' into lon_students_merge_code_test

# Conflicts:
#	class_management/database.py
#	class_management/main.py

StatCalc/api/statcalc_api.py

@@ -35,7 +35,7 @@ def get_students(g:get_student_dao = Depends()
     ,description=f'查询每次考试成绩都在80分以上的学生的编号，姓名和成绩。'
                   )
 def get_students(db=Depends(get_db)):
-    result = get_student_dao( db=db )
+    result = get_score_80( db=db )
     if result:
         return result
     raise HTTPException(status_code=404, detail="没有找到符合条件的学生")

StatCalc/dao/statcalc_dao.py

@@ -39,9 +39,11 @@ def get_class_count(g , db):
 from scores.model.score_model import Score
 
 def get_score_80(db):
-    q = (db.query(Score)
-         .filter(Score.score>=80)
-         .all())
+    q = ( db.query(Score)
+          .group_by(Score.score)
+          .having( min(Score.score) >= 80)
+          .all()
+         )
     return q
 
 

StatCalc/main.py

@@ -1,7 +1,6 @@
 from fastapi import FastAPI,APIRouter
 from StatCalc.api.statcalc_api import statcalc_api
 from databases import *
-from StatCalc.model import statcalc_model
 from contextlib import asynccontextmanager
 
 StatCalc_API = APIRouter()

Teachers/main.py

@@ -11,9 +11,9 @@ Teachers_API.include_router(tea_api)
 app = FastAPI()
 app.include_router(tea_api,tags=["老师"])
 
-Base.metadata.create_all(engine1)
-
 if __name__ == "__main__":
+    Base.metadata.create_all(engine1)
+
     import uvicorn
     uvicorn.run('main:app', host='0.0.0.0', port=55000)
     """

class_management/api/class_management_api.py

@@ -7,24 +7,52 @@ from class_management.schema.class_management_request import ClassCreate, ClassR
 class_api = APIRouter(prefix='/classes')
 # ,tags=['班级管理模块']
 
-
+#新增接口
 @class_api.post("",summary='新增班级')
 def add_class(cla:ClassCreate,db=Depends(get_db)):
     c_dict = cla.model_dump()
-    r = add_class_dao(c=c_dict,db=db)
-    if not r:
-        raise HTTPException(status_code=500,detail='服务器繁忙，请稍后添加!')
-    return ClassResponse(totals=1,data=c_dict)
+    res = add_class_dao(c=c_dict,db=db)
+    if not res:
+        raise HTTPException(status_code=400,detail='新增失败，班级已存在')
+    return ClassResponse(detail='新增成功',totals=1,data=c_dict)
 
 
-@class_api.get('/{id}',summary='根据id查询班级')
-def get_one_class(id:int,db=Depends(get_db)):
-    res = get_class_dao(c={'id':id},db=db)
+#更新接口
+@class_api.put("/{class_id}",summary='修改班级信息')
+def update_class(class_id:int
+                 ,update_info:ClassUpdate
+                 ,db=Depends(get_db)
+                 ):
+    update_dict=update_info.model_dump(exclude_unset=True)
+    if not update_dict:
+        raise HTTPException(status_code=400, detail="没有传入要修改的字段")
+    row_count = update_class_dao(cid=class_id, update_data=update_dict, db=db)
+    if not row_count :
+        raise HTTPException(status_code=404, detail="班级不存在，修改失败")
+    return ClassResponse(detail="修改成功", data={"id": class_id})
+
+
+#删除接口
+@class_api.delete('/{class_id}',summary='逻辑删除班级')
+def remove_class(class_id:int,db=Depends(get_db)):
+    del_rows = delete_class_dao(cid = class_id,db=db)
+    if not del_rows:
+        raise HTTPException(status_code=404, detail="班级不存在，删除失败")
+    return ClassResponse(detail='删除成功',data={'id':class_id})
+
+
+
+#单条查询接口
+@class_api.get('/{class_id}',summary='根据id查询班级')
+def get_one_class(class_id:int,db=Depends(get_db)):
+    res = get_class_dao(c={'id':class_id},db=db)
     if not res:
         raise HTTPException(status_code=404, detail="该班级不存在或已删除")
     return ClassResponse(totals=1,data=res[0])
 
-@class_api.get('',summary='多字段查询班级')
+
+#分类查询
+@class_api.get('',summary='多字段分页查询班级')
 def get_some_classes( num:str|None = Query(None,description='班级编号')
                      ,name:str|None = Query(None,description='班级名称')
                      ,head_teacher_id:int|None = Query(None,description='班主任')
@@ -33,10 +61,9 @@ def get_some_classes( num:str|None = Query(None,description='班级编号')
                      ,class_start_time:date|None = Query(None, description="开班日期，格式YYYY‑MM‑DD")
                      ,class_end_time: date|None = Query(None, description="结课日期，格式YYYY‑MM‑DD")
                      ,page:int = Query(1,ge=1,description='页码，从1开始')
-                     ,page_size:int = Query(5,ge=1,le=50,description='每页信息条数')
+                     ,page_size:int = Query(5,ge=1,le=20,description='每页信息条数')
                      ,db=Depends(get_db)
                      ):
-
     c_dict = {
         'num': num,
         'name': name,
@@ -52,7 +79,7 @@ def get_some_classes( num:str|None = Query(None,description='班级编号')
     res = get_class_dao(c=c_dict,db=db)
     total = len(res)
 
-    #内存分页
+    #分页
     start_index = (page-1)*page_size
     page_data = res[start_index:start_index + page_size]
 
@@ -61,23 +88,3 @@ def get_some_classes( num:str|None = Query(None,description='班级编号')
 
 
 
-@class_api.put("/{class_id}",summary='修改班级信息')
-def update_class(class_id:int
-                 ,update_info:ClassUpdate
-                 ,db=Depends(get_db)
-                 ):
-    update_dict=update_info.model_dump(exclude_unset=True)
-    if not update_dict:
-        raise HTTPException(status_code=400, detail="没有传入要修改的字段")
-    row_count = update_class_dao(cid=class_id, update_data=update_dict, db=db)
-    if row_count <= 0:
-        raise HTTPException(status_code=404, detail="班级不存在，修改失败")
-    return ClassResponse(detail="修改成功", data={"class_id": id})
-
-
-@class_api.delete('/{id}',summary='逻辑删除班级')
-def remove_class(id:int,db=Depends(get_db)):
-    del_rows = delete_class_dao(id,db)
-    if del_rows <= 0:
-        raise HTTPException(status_code=404, detail="班级不存在，删除失败")
-    return ClassResponse(detail='删除成功',data={'id':id})

class_management/dao/class_management_dao.py

@@ -1,6 +1,46 @@
 from class_management.model.class_management_model import ClassInfo
 from sqlalchemy.orm import Session
 
+#新增班级
+def add_class_dao(c,db):
+    try:
+        c1 = ClassInfo(**c)
+        db.add(c1)
+    except:
+        db.rollback()
+        return False
+    else:
+        db.commit()
+        return True
+
+
+#更新班级信息
+def update_class_dao(cid,update_data,db):
+    try:
+        rows = db.query(ClassInfo)\
+            .filter(ClassInfo.id == cid
+                    ,ClassInfo.is_delete==0)\
+            .update(update_data)
+    except :
+        db.rollback()
+        return False
+    else:
+        db.commit()
+        return rows
+
+
+#删除(逻辑删除)
+def delete_class_dao(cid,db):
+    try:
+        rows = db.query(ClassInfo)\
+            .filter(ClassInfo.id == cid,ClassInfo.is_delete==0)\
+            .update({'is_delete':1})
+        db.commit()
+        return rows
+    except Exception as e:
+        db.rollback()
+        print('删除失败',e)
+        return 0
 
 
 #查询
@@ -34,64 +74,6 @@ def get_class_dao(c:dict,db:Session) :
         ,'tutor_teacher_id':i.tutor_teacher_id
         ,'class_start_time':i.class_start_time
         ,'class_end_time':i.class_end_time
-        ,"is_delete": i.is_delete
-        ,"create_time": i.create_time
-        ,"update_time": i.update_time
         } for i in res
             ]
 
-
-#新增班级
-def add_class_dao(c:dict,db:Session):
-    try:
-        exist_class = db.query(ClassInfo)\
-            .filter(ClassInfo.name == c['name']
-                    ,ClassInfo.is_delete == 0)\
-            .first()
-        if exist_class:
-            msg = '班级名称已存在'
-            print(msg)
-            return (False,msg)
-        c1 = ClassInfo(**c)
-        db.add(c1)
-        db.commit()
-        db.refresh(c1)
-        return (True,None)
-
-    except Exception as e:
-        db.rollback()
-        err_msg = f'数据库异常：{str(e)}'
-        print(err_msg)
-        return (False,err_msg)
-
-
-#修改
-def update_class_dao(cid:int,update_data,db):
-    try:
-        rows = db.query(ClassInfo)\
-            .filter(ClassInfo.id == cid
-                    ,ClassInfo.is_delete==0)\
-            .update(update_data)
-        db.commit()
-        return rows
-
-    except Exception as e:
-        db.rollback()
-        print(f"update_class_dao异常:{e}")
-        return 0
-
-
-
-#删除(逻辑删除)
-def delete_class_dao(cid,db):
-    try:
-        rows = db.query(ClassInfo)\
-            .filter(ClassInfo.id == cid,ClassInfo.is_delete==0)\
-            .update({'is_delete':1})
-        db.commit()
-        return rows
-    except Exception as e:
-        db.rollback()
-        print(f"delete_class_dao异常:{e}")
-        rows = 0
-

class_management/database.py

@@ -18,7 +18,6 @@ SessionLocal = sessionmaker(bind=engine,autocommit=False, autoflush=False)
 Base = declarative_base()
 
 # 获取数据库会话依赖
-
 def get_db():
     db = SessionLocal()
     try :

class_management/main.py

@@ -7,13 +7,13 @@ from class_management.database import Base,engine
 Classes_API = APIRouter()
 Classes_API.include_router(class_api)
 
-# 自测接口
-app = FastAPI()
-
-app.include_router(class_api)
-
-Base.metadata.create_all(engine)
-
 if __name__ =='__main__':
+    # 自测接口
+    app = FastAPI()
+
+    app.include_router(class_api)
+
+    Base.metadata.create_all(engine)
+
     import uvicorn
     uvicorn.run('main:app',host='127.0.0.1',port=12345)

class_management/model/class_management_model.py

@@ -14,6 +14,7 @@ class ClassInfo(Base_all):
                 )
     num = Column(String(50)
                  ,nullable=False
+                 ,unique=True
                  ,comment='班级编号'
                  )
     name = Column(String(50)
@@ -21,26 +22,18 @@ class ClassInfo(Base_all):
                         ,comment='班级名称'
                         )
     head_teacher_id = Column(Integer
-                            # ,ForeignKey('teacher.id')
+                            ,ForeignKey('teacher.id')
                             ,comment='班主任编号'
                             )
 
     coach_teacher_id = Column(Integer
-                              # ,ForeignKey('teacher.id')
+                              ,ForeignKey('teacher.id')
                               ,comment='授课老师编号'
                               )
     tutor_teacher_id = Column(Integer
-                              # ,ForeignKey('teacher.id')
+                              ,ForeignKey('teacher.id')
                               ,comment='助教老师编号'
                               )
-    # class_teacher = Column(String(50)
-    #                        ,nullable=False
-    #                        ,comment='班主任'
-    #                        )
-    # class_lecturer = Column(String(50)
-    #                         ,nullable=False
-    #                         ,comment='授课老师'
-    #                         )
     class_start_time = Column(Date
                               ,comment='开班日期'
                               )

class_management/schema/class_management_request.py

@@ -12,17 +12,14 @@ class ClassBase(BaseModel):
     class_start_time:date|None = Field(None,description='开班日期 YYYY‑MM‑DD')
     class_end_time:date|None = Field(None,description='结课日期 YYYY‑MM‑DD')
 
-#新增班级请求体：num,name必填，其余继承父类ClassBase
+#新增班级请求体：继承父类ClassBase
 class ClassCreate(ClassBase):
-    num:str = Field(...,description='班级编号')
-    name:str = Field(...,description='班级名称')
+    pass
 
 #修改班级请求体,继承ClassBase,全部字段可选，传哪个就更新哪个
 class ClassUpdate(ClassBase):
     pass
 
-
-
 class ClassResponse(BaseModel):
     code:int = 200
     detail:str = 'OK'

main.py

@@ -17,9 +17,10 @@ app.include_router(Teachers_API,tags=["teachers"])
 # app.include_router(StatCalc_API,tags=["StatCalc"])
 
 
-Base_all.metadata.create_all(bind=engine_all)
 
 if __name__ == "__main__":
+    Base_all.metadata.create_all(bind=engine_all)
+
     def main():
         print("Hello from student-manage-system!")
 

scores/main.py

@@ -6,12 +6,14 @@ from scores.database import engine,Base
 Scores_API = APIRouter()
 Scores_API.include_router(score_api)
 
-# 自测接口
-app = FastAPI(tags=['成绩'],title='成绩管理系统')
-app.include_router(score_api)
 
-Base.metadata.create_all(engine)
 
 if __name__ == '__main__':
+    # 自测接口
+    app = FastAPI(tags=['成绩'], title='成绩管理系统')
+    app.include_router(score_api)
+
+    Base.metadata.create_all(engine)
+
     import uvicorn
     uvicorn.run('main:app',host='127.0.0.1',port=12346)

stu_jiuye/main.py

@@ -11,12 +11,13 @@ Shtudent_Jiuye.include_router(CURD)
 
 
 app=FastAPI()
-Base.metadata.create_all(engine)
+
 app.include_router(CURD,tags=['就业管理系统'])
 
 
-
 if __name__=='__main__':
+    Base.metadata.create_all(engine)
+
     import uvicorn
     uvicorn.run('main:app', host='127.0.0.1', port=12395)
 

students/main.py

@@ -8,18 +8,19 @@ from contextlib import asynccontextmanager
 Students_API = APIRouter()
 Students_API.include_router(s_api)
 
-# 自测接口
-@asynccontextmanager
-async def S_Fastapi(app: FastAPI):
-    Base.metadata.create_all(engine1)
-    yield
-    engine1.dispose()
-
-app = FastAPI(title="学生管理系统",lifespan=S_Fastapi) # 这里必须把上面写的加上
-app.include_router(s_api,tags=["students"])
-
 
 if __name__ == "__main__":
+    # 自测接口
+    @asynccontextmanager
+    async def S_Fastapi(app: FastAPI):
+        Base.metadata.create_all(engine1)
+        yield
+        engine1.dispose()
+
+
+    app = FastAPI(title="学生管理系统", lifespan=S_Fastapi)  # 这里必须把上面写的加上
+    app.include_router(s_api, tags=["students"])
+
     def main():
         print("Hello from student-manage-system!")