diff --git a/AppUser/Crud/DepartmentCrud.py b/AppUser/Crud/DepartmentCrud.py index 46ecf67..80337d8 100644 --- a/AppUser/Crud/DepartmentCrud.py +++ b/AppUser/Crud/DepartmentCrud.py @@ -23,3 +23,8 @@ def create_department(db: Session, name: str): def get_department_by_id(db: Session, department_id: str): role_obj = db.query(Department).filter_by(id=department_id).first() return role_obj + + +def get_department_list(db: Session): + role_list = db.query(Department).order_by(Department.id.asc()).all() + return role_list diff --git a/AppUser/Crud/RoleCrud.py b/AppUser/Crud/RoleCrud.py index 86f70af..8d89694 100644 --- a/AppUser/Crud/RoleCrud.py +++ b/AppUser/Crud/RoleCrud.py @@ -28,6 +28,11 @@ def get_role_by_id(db: Session, role_id: str): return role_obj +def get_role_list(db: Session): + role_list = db.query(Role).order_by(Role.id.asc()).all() + return role_list + + def create_role_policy(db: Session, role_id: str, schema: RoleSchema.CreateRolePolicyReqBody): rap_obj = RoleAccessPolicy(**schema.dict()) rap_obj.id = TimeSerialNumUtils.create_time_serial_num(prefix="AP", suffix="") diff --git a/AppUser/Router/DepartmentRouter.py b/AppUser/Router/DepartmentRouter.py new file mode 100644 index 0000000..d3d57c9 --- /dev/null +++ b/AppUser/Router/DepartmentRouter.py @@ -0,0 +1,23 @@ +from fastapi import APIRouter, Depends +from sqlalchemy.orm import Session + +from AppUser.Crud import DepartmentCrud +from Utils.DataBase.SqlAlchemyUtils import get_db + +router = APIRouter( + tags=["部门"], + prefix="/api/user/department", + # dependencies=[Depends(ac_admin)] +) + + +@router.post("/create", summary="新建部门") +def func01(name: str, db: Session = Depends(get_db)): + DepartmentCrud.create_department(db=db, name=name) + return {"info": "Success"} + + +@router.get("/list", summary="部门列表") +def func04(db: Session = Depends(get_db)): + role_list = DepartmentCrud.get_department_list(db=db) + return role_list diff --git a/AppUser/Router/RoleAdminRouter.py b/AppUser/Router/RoleAdminRouter.py index 0104b81..ff50830 100644 --- a/AppUser/Router/RoleAdminRouter.py +++ b/AppUser/Router/RoleAdminRouter.py @@ -13,7 +13,7 @@ RoleModel.Base.metadata.create_all(bind=engine) router = APIRouter( tags=["角色管理"], prefix="/api/user/role", - dependencies=[Depends(ac_admin)] + # dependencies=[Depends(ac_admin)] ) @@ -33,3 +33,9 @@ def func02(role_id: str, schema: RoleSchema.CreateRolePolicyReqBody, db: Session def func03(role_id: str, db: Session = Depends(get_db)): role_obj = RoleCrud.get_role_by_id(db=db, role_id=role_id) return role_obj.to_dict() + + +@router.get("/list", summary="角色列表") +def func04(db: Session = Depends(get_db)): + role_list = RoleCrud.get_role_list(db=db) + return role_list diff --git a/main.py b/main.py index c63abb1..1769cf2 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,7 @@ from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware -from AppUser.Router import UserRouter, RoleAdminRouter, UserAdminRouter +from AppUser.Router import UserRouter, RoleAdminRouter, UserAdminRouter, DepartmentRouter app = FastAPI( title="用户", @@ -20,3 +20,4 @@ app.add_middleware( app.include_router(UserRouter.router) app.include_router(UserAdminRouter.router) app.include_router(RoleAdminRouter.router) +app.include_router(DepartmentRouter.router)