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

# Conflicts:
#	class_management/main.py

README.md

@@ -10,23 +10,35 @@
 2.教师信息的新增\
 3.教师信息的更新\
 4.教师信息的逻辑删除\
+    4.1输入id查\
+    4.2输入任意信息查\
+5.学科信息的新增\
 **dao数据筛选文件**\
 1.查询 get_tea_dao:\
 2.新增 add_tea_dao:\
 3.更新 update_tea_dao:\
-4.逻辑删除 delete_tea_dao:\
+4.根据教师id逻辑删除 delete_tea_dao:\
+5.任意信息逻辑删除\
+6.科目信息的新增\
 **tea_model数据库建表文件**\
 1.教师表\
+2.科目表\
 字段名：id、name、sex、class_id、sub（学科）\
 home_place specialty（专业）、start_time（入职时间）\
 work_experience、collage、creat_date、update_date\
-is_delete、delete_time\
+is_delete、delete_time、phone\
 2.学科表\
-字段名：id，name(科目名字)
+字段名：id，name(科目名字)\
 **schema 请求体、响应体**\
-请求体：设置了两个，一个带自增组件用于查询\
-一个不带自增组件，新增用；\
-响应体:用于返回给前端
+教师表\
+请求体：\
+1.查询、任意逻辑删除调用
+2.新增、更改时调用
+响应体:用于返回给前端\
+科目表：\
+1.请求体：新增科目时调用
+
+
 
 
 

Teachers/api/tea_api.py

@@ -3,9 +3,10 @@ from Teachers.schema import *
 from Teachers.database  import *
 from Teachers.model.tea_model import *
 from Teachers.dao.tea_dao import *
-from Teachers.schema.tea_request import TeaRequest,NewTeaRequest,NewTeaRequest1
+from Teachers.schema.tea_request import TeaRequest,NewTeaRequest,NewTeaRequest1,SubRequest
 from Teachers.schema.tea_response import TeaResponse
 
+
 tea_api = APIRouter()
 
 @tea_api.post('/tea',response_model=TeaResponse,summary='新增老师',description='输入新增的老师信息，除去姓名外可以为空')
@@ -43,4 +44,12 @@ def delete_other_tea_dao1(t:TeaRequest=Depends(),db=Depends(get_db)):
         raise HTTPException(status_code=404,detail='没有找到符合条件的老师')
     return{'code':200,'data':row1}
 
+#新增科目
+@tea_api.post('/subject',summary='新增科目',description='输入新增的科目')
+def add_sub(t:SubRequest=Depends(),db=Depends(get_db)):   #开启会话窗口
+    r = add_subject_dao(t.model_dump(),db=db)
+    if not r:
+        raise HTTPException(status_code=500,detail='科目已存在')
+    return TeaResponse(totals=len(r), data=r)
+
 

Teachers/dao/tea_dao.py

@@ -1,4 +1,6 @@
-from Teachers.model.tea_model import Tea
+from sys import excepthook
+
+from Teachers.model.tea_model import Tea,Sub
 from datetime import datetime
 
 #增加
@@ -122,3 +124,19 @@ def delete_other_tea_dao(t,db):
 
 
 
+def add_subject_dao(t,db):
+    try:
+        t1 = db.query(Sub).filter(Sub.name == t.get('name')).first()
+        if t1:
+            print('科目已存在')
+            raise Exception('科目已存在')
+        s1 = Sub(**t)
+        db.add(s1)
+        db.commit()
+        return '添加成功'
+    except Exception as e:
+        db.rollback()
+        print('失败的原因',e)
+        return False
+
+

Teachers/main.py

@@ -15,7 +15,7 @@ if __name__ == "__main__":
     Base.metadata.create_all(engine1)
 
     import uvicorn
-    uvicorn.run('main:app', host='0.0.0.0', port=55000)
+    uvicorn.run('main:app', host='0.0.0.0', port=57000)
     """
     IPv4 地址 . . . . . . . . . . . . : 192.168.1.51
     子网掩码  . . . . . . . . . . . . : 255.255.255.0

Teachers/schema/tea_request.py

@@ -43,3 +43,6 @@ class NewTeaRequest1(BaseModel):
     work_experience: str | None = None
     start_time: datetime | None = None
     specialty: str | None = None
+
+class SubRequest(BaseModel):
+    name: str | None = None

scores/main.py

@@ -1,7 +1,7 @@
 from fastapi import FastAPI,APIRouter
 from scores.api.score_api import score_api
 from scores.database import engine,Base
-from scores.api.score_api import score_api
+from scores.api.statistic_api import statistic_api
 
 # 合并接口
 Scores_API = APIRouter()
@@ -9,11 +9,12 @@ Scores_API.include_router(score_api)
 
 # 自测接口
 app = FastAPI(tags=['成绩'], title='成绩管理系统')
+app.include_router(score_api)
+app.include_router(statistic_api)
+
 
 if __name__ == '__main__':
 
-    app.include_router(score_api)
-
     Base.metadata.create_all(engine)
 
     import uvicorn