Simplify data rule and remove type (#468)

* Simplify data rule and remove type

* fix lint

* fix user info cache

backend/app/admin/api/v1/sys/__init__.py

@@ -6,7 +6,6 @@ from backend.app.admin.api.v1.sys.api import router as api_router
 from backend.app.admin.api.v1.sys.casbin import router as casbin_router
 from backend.app.admin.api.v1.sys.config import router as config_router
 from backend.app.admin.api.v1.sys.data_rule import router as data_rule_router
-from backend.app.admin.api.v1.sys.data_rule_type import router as data_rule_type_router
 from backend.app.admin.api.v1.sys.dept import router as dept_router
 from backend.app.admin.api.v1.sys.dict_data import router as dict_data_router
 from backend.app.admin.api.v1.sys.dict_type import router as dict_type_router
@@ -26,4 +25,3 @@ router.include_router(menu_router, prefix='/menus', tags=['系统目录'])
 router.include_router(role_router, prefix='/roles', tags=['系统角色'])
 router.include_router(user_router, prefix='/users', tags=['系统用户'])
 router.include_router(data_rule_router, prefix='/data-rules', tags=['系统数据权限规则'])
-router.include_router(data_rule_type_router, prefix='/data-rule-types', tags=['系统数据权限类型'])

backend/app/admin/api/v1/sys/data_rule.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from typing import Annotated
 
-from fastapi import APIRouter, Depends, Path, Query
+from fastapi import APIRouter, Depends, Path, Query, Request
 
 from backend.app.admin.schema.data_rule import CreateDataRuleParam, GetDataRuleListDetails, UpdateDataRuleParam
 from backend.app.admin.service.data_rule_service import data_rule_service
@@ -12,7 +12,7 @@ from backend.common.security.jwt import DependsJwtAuth
 from backend.common.security.permission import RequestPermission
 from backend.common.security.rbac import DependsRBAC
 from backend.database.db_mysql import CurrentSession
-from backend.utils.serializers import select_as_dict
+from backend.utils.serializers import select_as_dict, select_list_serialize
 
 router = APIRouter()
 
@@ -29,6 +29,13 @@ async def get_data_rule_model_columns(model: Annotated[str, Path()]) -> Response
     return response_base.success(data=models)
 
 
+@router.get('/all', summary='获取所有数据规则', dependencies=[DependsJwtAuth])
+async def get_all_data_rule() -> ResponseModel:
+    data_rules = await data_rule_service.get_all()
+    data = select_list_serialize(data_rules)
+    return response_base.success(data=data)
+
+
 @router.get('/{pk}', summary='获取数据权限规则详情', dependencies=[DependsJwtAuth])
 async def get_data_rule(pk: Annotated[int, Path(...)]) -> ResponseModel:
     data_rule = await data_rule_service.get(pk=pk)
@@ -86,8 +93,8 @@ async def update_data_rule(pk: Annotated[int, Path(...)], obj: UpdateDataRulePar
         DependsRBAC,
     ],
 )
-async def delete_data_rule(pk: Annotated[list[int], Query(...)]) -> ResponseModel:
-    count = await data_rule_service.delete(pk=pk)
+async def delete_data_rule(request: Request, pk: Annotated[list[int], Query(...)]) -> ResponseModel:
+    count = await data_rule_service.delete(request=request, pk=pk)
     if count > 0:
         return response_base.success()
     return response_base.fail()

backend/app/admin/api/v1/sys/data_rule_type.py

@@ -1,85 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-from typing import Annotated
-
-from fastapi import APIRouter, Depends, Path, Query
-
-from backend.app.admin.schema.data_rule_type import (
-    CreateDataRuleTypeParam,
-    GetDataRuleTypeListDetails,
-    UpdateDataRuleTypeParam,
-)
-from backend.app.admin.service.data_rule_type_service import data_rule_type_service
-from backend.common.pagination import DependsPagination, paging_data
-from backend.common.response.response_schema import ResponseModel, response_base
-from backend.common.security.jwt import DependsJwtAuth
-from backend.common.security.permission import RequestPermission
-from backend.common.security.rbac import DependsRBAC
-from backend.database.db_mysql import CurrentSession
-from backend.utils.serializers import select_as_dict
-
-router = APIRouter()
-
-
-@router.get('/{pk}', summary='获取数据权限规则类型详情', dependencies=[DependsJwtAuth])
-async def get_data_rule_type(pk: Annotated[int, Path(...)]) -> ResponseModel:
-    data_rule_type = await data_rule_type_service.get(pk=pk)
-    data = GetDataRuleTypeListDetails(**select_as_dict(data_rule_type))
-    return response_base.success(data=data)
-
-
-@router.get(
-    '',
-    summary='（模糊条件）分页获取所有数据权限规则类型',
-    dependencies=[
-        DependsJwtAuth,
-        DependsPagination,
-    ],
-)
-async def get_pagination_data_rule_type(db: CurrentSession) -> ResponseModel:
-    data_rule_type_select = await data_rule_type_service.get_select()
-    page_data = await paging_data(db, data_rule_type_select, GetDataRuleTypeListDetails)
-    return response_base.success(data=page_data)
-
-
-@router.post(
-    '',
-    summary='创建数据权限规则类型',
-    dependencies=[
-        Depends(RequestPermission('data:rule:type:add')),
-        DependsRBAC,
-    ],
-)
-async def create_data_rule_type(obj: CreateDataRuleTypeParam) -> ResponseModel:
-    await data_rule_type_service.create(obj=obj)
-    return response_base.success()
-
-
-@router.put(
-    '/{pk}',
-    summary='更新数据权限规则类型',
-    dependencies=[
-        Depends(RequestPermission('data:rule:type:edit')),
-        DependsRBAC,
-    ],
-)
-async def update_data_rule_type(pk: Annotated[int, Path(...)], obj: UpdateDataRuleTypeParam) -> ResponseModel:
-    count = await data_rule_type_service.update(pk=pk, obj=obj)
-    if count > 0:
-        return response_base.success()
-    return response_base.fail()
-
-
-@router.delete(
-    '',
-    summary='（批量）删除数据权限规则类型',
-    dependencies=[
-        Depends(RequestPermission('data:rule:type:del')),
-        DependsRBAC,
-    ],
-)
-async def delete_data_rule_type(pk: Annotated[list[int], Query(...)]) -> ResponseModel:
-    count = await data_rule_type_service.delete(pk=pk)
-    if count > 0:
-        return response_base.success()
-    return response_base.fail()

backend/app/admin/api/v1/sys/dept.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from typing import Annotated
 
-from fastapi import APIRouter, Depends, Path, Query
+from fastapi import APIRouter, Depends, Path, Query, Request
 
 from backend.app.admin.schema.dept import CreateDeptParam, GetDeptListDetails, UpdateDeptParam
 from backend.app.admin.service.dept_service import dept_service
@@ -69,8 +69,8 @@ async def update_dept(pk: Annotated[int, Path(...)], obj: UpdateDeptParam) -> Re
         DependsRBAC,
     ],
 )
-async def delete_dept(pk: Annotated[int, Path(...)]) -> ResponseModel:
-    count = await dept_service.delete(pk=pk)
+async def delete_dept(request: Request, pk: Annotated[int, Path(...)]) -> ResponseModel:
+    count = await dept_service.delete(request=request, pk=pk)
     if count > 0:
         return response_base.success()
     return response_base.fail()

backend/app/admin/api/v1/sys/menu.py

@@ -72,8 +72,8 @@ async def update_menu(pk: Annotated[int, Path(...)], obj: UpdateMenuParam) -> Re
         DependsRBAC,
     ],
 )
-async def delete_menu(pk: Annotated[int, Path(...)]) -> ResponseModel:
-    count = await menu_service.delete(pk=pk)
+async def delete_menu(request: Request, pk: Annotated[int, Path(...)]) -> ResponseModel:
+    count = await menu_service.delete(request=request, pk=pk)
     if count > 0:
         return response_base.success()
     return response_base.fail()

backend/app/admin/api/v1/sys/role.py

@@ -11,6 +11,7 @@ from backend.app.admin.schema.role import (
     UpdateRoleParam,
     UpdateRoleRuleParam,
 )
+from backend.app.admin.service.data_rule_service import data_rule_service
 from backend.app.admin.service.menu_service import menu_service
 from backend.app.admin.service.role_service import role_service
 from backend.common.pagination import DependsPagination, paging_data
@@ -44,6 +45,12 @@ async def get_role_all_menus(pk: Annotated[int, Path(...)]) -> ResponseModel:
     return response_base.success(data=menu)
 
 
+@router.get('/{pk}/rules', summary='获取角色所有数据规则', dependencies=[DependsJwtAuth])
+async def get_role_all_rules(pk: Annotated[int, Path(...)]) -> ResponseModel:
+    rule = await data_rule_service.get_role_rules(pk=pk)
+    return response_base.success(data=rule)
+
+
 @router.get('/{pk}', summary='获取角色详情', dependencies=[DependsJwtAuth])
 async def get_role(pk: Annotated[int, Path(...)]) -> ResponseModel:
     role = await role_service.get(pk=pk)
@@ -140,8 +147,8 @@ async def update_role_rules(
         DependsRBAC,
     ],
 )
-async def delete_role(pk: Annotated[list[int], Query(...)]) -> ResponseModel:
-    count = await role_service.delete(pk=pk)
+async def delete_role(request: Request, pk: Annotated[list[int], Query(...)]) -> ResponseModel:
+    count = await role_service.delete(request=request, pk=pk)
     if count > 0:
         return response_base.success()
     return response_base.fail()