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

# Conflicts:
#	scores/main.py
#	scores/model/score_model.py

scores/api/score_api.py

@@ -4,9 +4,9 @@ from scores.dao.score_dao import get_scores_dao,add_scores_dao,update_scores_dao
 from scores.model.score_model import Score
 from scores.schema.score_request import ScoreRequest, ScoreResponse,ScoreQuery
 
-score_api = APIRouter()
+score_api = APIRouter(tags=['成绩'])
 
-@score_api.get('/Score')
+@score_api.get('/Score',summary='成绩查询',description=f'查询条件为空即查询所有成绩')
 def get_scores(score:ScoreQuery=Depends(),db=Depends(get_db)):
     a = score.model_dump()
     aa = get_scores_dao(s=a,db=db)
@@ -14,16 +14,17 @@ def get_scores(score:ScoreQuery=Depends(),db=Depends(get_db)):
         return aa
     raise HTTPException(status_code=404,detail='不存在')
 
-@score_api.post('/Score',response_model=ScoreResponse)
+@score_api.post('/Score',response_model=ScoreResponse
+    ,summary='成绩添加')
 def add_scores(score:ScoreRequest=Depends(),db=Depends(get_db)):
     a = score.model_dump()
     # print(a,type(a))
     aa = add_scores_dao(b=a,db=db)
     if aa:
         return ScoreResponse(data=a)
-    raise HTTPException(status_code=500,detail='没有')
+    raise HTTPException(status_code=500,detail='不可以')
 
-@score_api.put('/Score')
+@score_api.put('/Score',summary='成绩更新',description=f'查询条件为学号,班级号,考试序次,考试科目,然后更改这位同学此次科目的成绩')
 def update_scores(score:ScoreRequest,sid:int,cid:int,num:int,tsub:str,db=Depends(get_db)):
     a = score.model_dump(exclude_unset=True,exclude={'id','sid','cid','num','tsub'})
     aa = update_scores_dao(sid = sid,cid = cid,num = num,tsub = tsub,update_data = a,db=db)
@@ -33,7 +34,7 @@ def update_scores(score:ScoreRequest,sid:int,cid:int,num:int,tsub:str,db=Depends
         raise HTTPException(status_code=404,detail='不存在')
     return {'message':'更新成功','data':a}
 
-@score_api.delete('/Score')
+@score_api.delete('/Score',summary='成绩删除',description=f'查询条件为学号,班级号,考试科目,然后进行删除')
 def delete_scores(sid:int,cid:int,tsub:str,db=Depends(get_db)):
     aaa = delete_scores_dao(sid,cid,tsub,db)
     if  aaa==1:

scores/dao/score_dao.py

@@ -43,20 +43,19 @@ def add_scores_dao(b,db):
         db.commit()
         return True
 
-def update_scores_dao(sid:int,cid:int,num:int,tsub:str,update_date:dict,db):
-    if not update_date:
+def update_scores_dao(sid:int,cid:int,num:int,tsub:str,update_data:dict,db):
+    if not update_data:
         return 0
-    update_date['update_date']=datetime.now
+    update_data['update_date']=datetime.now()
     try:
         aa = db.query(Score).filter(Score.sid == sid
                                     ,Score.cid == cid
                                     ,Score.num == num
-                                    ,Score.tsub == tsub ).update(update_date)
+                                    ,Score.tsub == tsub ).update(update_data)
         db.commit()
         return aa
-    except Exception as e:
+    except Exception :
         db.rollback()
-        print(e)
         return -1
 
 
@@ -67,11 +66,12 @@ def delete_scores_dao(sid:int,cid:int,tsub:str,db):
                                      ,Score.tsub == tsub
                                      ,Score.is_deleted==0
                                      ).update({'is_deleted':1
-                                     ,'deleted_date':datetime.now})
+                                     ,'deleted_date':datetime.now()})
         db.commit()
         return aaa
-    except Exception :
+    except Exception as e :
         db.rollback()
+        print(e)
         return -1
 
 

scores/main.py

@@ -7,7 +7,7 @@ Scores_API = APIRouter()
 Scores_API.include_router(score_api)
 
 # 自测接口
-app = FastAPI()
+app = FastAPI(title='成绩管理系统')
 app.include_router(score_api)
 
 Base.metadata.create_all(engine)

scores/model/score_model.py

@@ -1,6 +1,8 @@
 from databases import engine_all,Base_all,Session
 from scores.database import Base
 from datetime import datetime
+from sqlalchemy import DateTime,Column,Integer,String,Float,ForeignKey
+class Score(Base):
 from sqlalchemy import DateTime,Column,Integer,String,Float
 class Score(Base_all):
     __tablename__='scores'
@@ -10,9 +12,11 @@ class Score(Base_all):
                  ,comment ='编号'
                  )
     sid = Column(Integer
+                 ,ForeignKey('students.id')
                  ,comment ='学生ID'
                  )
     cid = Column(Integer
+                 ,ForeignKey('classes.id')
                  ,comment ='班级ID'
                  )
     num = Column(Integer
@@ -20,6 +24,7 @@ class Score(Base_all):
                  )
     score = Column(Integer,nullable = False)
     tsub = Column(String(100)
+                  , ForeignKey('subject.id')
                    ,nullable = False
                    )
     create_date = Column(DateTime