diff --git a/backend/app/admin/api/v1/sys/__init__.py b/backend/app/admin/api/v1/sys/__init__.py index 0263bcec..07e3faf8 100644 --- a/backend/app/admin/api/v1/sys/__init__.py +++ b/backend/app/admin/api/v1/sys/__init__.py @@ -5,8 +5,6 @@ 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.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 from backend.app.admin.api.v1.sys.menu import router as menu_router from backend.app.admin.api.v1.sys.plugin import router as plugin_router from backend.app.admin.api.v1.sys.role import router as role_router @@ -18,8 +16,6 @@ router.include_router(config_router, prefix='/configs', tags=['系统参数配置']) router.include_router(dept_router, prefix='/depts', tags=['系统部门']) -router.include_router(dict_data_router, prefix='/dict-datas', tags=['系统字典数据']) -router.include_router(dict_type_router, prefix='/dict-types', tags=['系统字典类型']) router.include_router(menu_router, prefix='/menus', tags=['系统菜单']) router.include_router(role_router, prefix='/roles', tags=['系统角色']) router.include_router(user_router, prefix='/users', tags=['系统用户']) diff --git a/backend/app/admin/model/__init__.py b/backend/app/admin/model/__init__.py index 2e7ff526..187d48af 100644 --- a/backend/app/admin/model/__init__.py +++ b/backend/app/admin/model/__init__.py @@ -3,8 +3,6 @@ from backend.app.admin.model.config import Config from backend.app.admin.model.data_rule import DataRule from backend.app.admin.model.dept import Dept -from backend.app.admin.model.dict_data import DictData -from backend.app.admin.model.dict_type import DictType from backend.app.admin.model.login_log import LoginLog from backend.app.admin.model.menu import Menu from backend.app.admin.model.opera_log import OperaLog diff --git a/backend/plugin/dict/__init__.py b/backend/plugin/dict/__init__.py new file mode 100644 index 00000000..56fafa58 --- /dev/null +++ b/backend/plugin/dict/__init__.py @@ -0,0 +1,2 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- diff --git a/backend/plugin/dict/api/__init__.py b/backend/plugin/dict/api/__init__.py new file mode 100644 index 00000000..56fafa58 --- /dev/null +++ b/backend/plugin/dict/api/__init__.py @@ -0,0 +1,2 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- diff --git a/backend/plugin/dict/api/v1/__init__.py b/backend/plugin/dict/api/v1/__init__.py new file mode 100644 index 00000000..56fafa58 --- /dev/null +++ b/backend/plugin/dict/api/v1/__init__.py @@ -0,0 +1,2 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- diff --git a/backend/plugin/dict/api/v1/sys/__init__.py b/backend/plugin/dict/api/v1/sys/__init__.py new file mode 100644 index 00000000..56fafa58 --- /dev/null +++ b/backend/plugin/dict/api/v1/sys/__init__.py @@ -0,0 +1,2 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- diff --git a/backend/app/admin/api/v1/sys/dict_data.py b/backend/plugin/dict/api/v1/sys/dict_data.py similarity index 95% rename from backend/app/admin/api/v1/sys/dict_data.py rename to backend/plugin/dict/api/v1/sys/dict_data.py index 6fd1787c..938adf6e 100644 --- a/backend/app/admin/api/v1/sys/dict_data.py +++ b/backend/plugin/dict/api/v1/sys/dict_data.py @@ -4,19 +4,19 @@ from fastapi import APIRouter, Depends, Path, Query -from backend.app.admin.schema.dict_data import ( - CreateDictDataParam, - GetDictDataDetail, - GetDictDataWithRelation, - UpdateDictDataParam, -) -from backend.app.admin.service.dict_data_service import dict_data_service from backend.common.pagination import DependsPagination, PageData, paging_data from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, 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 import CurrentSession +from backend.plugin.dict.schema.dict_data import ( + CreateDictDataParam, + GetDictDataDetail, + GetDictDataWithRelation, + UpdateDictDataParam, +) +from backend.plugin.dict.service.dict_data_service import dict_data_service router = APIRouter() diff --git a/backend/app/admin/api/v1/sys/dict_type.py b/backend/plugin/dict/api/v1/sys/dict_type.py similarity index 92% rename from backend/app/admin/api/v1/sys/dict_type.py rename to backend/plugin/dict/api/v1/sys/dict_type.py index 44ba7f8f..61f68f2e 100644 --- a/backend/app/admin/api/v1/sys/dict_type.py +++ b/backend/plugin/dict/api/v1/sys/dict_type.py @@ -4,14 +4,14 @@ from fastapi import APIRouter, Depends, Path, Query -from backend.app.admin.schema.dict_type import CreateDictTypeParam, GetDictTypeDetail, UpdateDictTypeParam -from backend.app.admin.service.dict_type_service import dict_type_service from backend.common.pagination import DependsPagination, PageData, paging_data from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, 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 import CurrentSession +from backend.plugin.dict.schema.dict_type import CreateDictTypeParam, GetDictTypeDetail, UpdateDictTypeParam +from backend.plugin.dict.service.dict_type_service import dict_type_service router = APIRouter() diff --git a/backend/plugin/dict/crud/__init__.py b/backend/plugin/dict/crud/__init__.py new file mode 100644 index 00000000..56fafa58 --- /dev/null +++ b/backend/plugin/dict/crud/__init__.py @@ -0,0 +1,2 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- diff --git a/backend/app/admin/crud/crud_dict_data.py b/backend/plugin/dict/crud/crud_dict_data.py similarity index 95% rename from backend/app/admin/crud/crud_dict_data.py rename to backend/plugin/dict/crud/crud_dict_data.py index fbb96c17..b1a98899 100644 --- a/backend/app/admin/crud/crud_dict_data.py +++ b/backend/plugin/dict/crud/crud_dict_data.py @@ -5,8 +5,8 @@ from sqlalchemy.orm import noload, selectinload from sqlalchemy_crud_plus import CRUDPlus -from backend.app.admin.model import DictData -from backend.app.admin.schema.dict_data import CreateDictDataParam, UpdateDictDataParam +from backend.plugin.dict.model import DictData +from backend.plugin.dict.schema.dict_data import CreateDictDataParam, UpdateDictDataParam class CRUDDictData(CRUDPlus[DictData]): diff --git a/backend/app/admin/crud/crud_dict_type.py b/backend/plugin/dict/crud/crud_dict_type.py similarity index 94% rename from backend/app/admin/crud/crud_dict_type.py rename to backend/plugin/dict/crud/crud_dict_type.py index c44e14e8..a9c7a737 100644 --- a/backend/app/admin/crud/crud_dict_type.py +++ b/backend/plugin/dict/crud/crud_dict_type.py @@ -4,8 +4,8 @@ from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy_crud_plus import CRUDPlus -from backend.app.admin.model import DictType -from backend.app.admin.schema.dict_type import CreateDictTypeParam, UpdateDictTypeParam +from backend.plugin.dict.model import DictType +from backend.plugin.dict.schema.dict_type import CreateDictTypeParam, UpdateDictTypeParam class CRUDDictType(CRUDPlus[DictType]): diff --git a/backend/plugin/dict/model/__init__.py b/backend/plugin/dict/model/__init__.py new file mode 100644 index 00000000..31a2c7cb --- /dev/null +++ b/backend/plugin/dict/model/__init__.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +from backend.plugin.dict.model.dict_data import DictData +from backend.plugin.dict.model.dict_type import DictType diff --git a/backend/app/admin/model/dict_data.py b/backend/plugin/dict/model/dict_data.py similarity index 96% rename from backend/app/admin/model/dict_data.py rename to backend/plugin/dict/model/dict_data.py index af11d494..717acf08 100644 --- a/backend/app/admin/model/dict_data.py +++ b/backend/plugin/dict/model/dict_data.py @@ -12,7 +12,7 @@ from backend.common.model import Base, id_key if TYPE_CHECKING: - from backend.app.admin.model import DictType + from backend.plugin.dict.model import DictType class DictData(Base): diff --git a/backend/app/admin/model/dict_type.py b/backend/plugin/dict/model/dict_type.py similarity index 95% rename from backend/app/admin/model/dict_type.py rename to backend/plugin/dict/model/dict_type.py index c901a784..76708e71 100644 --- a/backend/app/admin/model/dict_type.py +++ b/backend/plugin/dict/model/dict_type.py @@ -12,7 +12,7 @@ from backend.common.model import Base, id_key if TYPE_CHECKING: - from backend.app.admin.model import DictData + from backend.plugin.dict.model import DictData class DictType(Base): diff --git a/backend/plugin/dict/plugin.toml b/backend/plugin/dict/plugin.toml new file mode 100644 index 00000000..98379c21 --- /dev/null +++ b/backend/plugin/dict/plugin.toml @@ -0,0 +1,10 @@ +[app] +include = 'admin' + +[api.dict_data] +prefix = '/dict-datas' +tags = '系统字典数据' + +[api.dict_type] +prefix = '/dict-types' +tags = '系统字典类型' diff --git a/backend/plugin/dict/schema/__init__.py b/backend/plugin/dict/schema/__init__.py new file mode 100644 index 00000000..56fafa58 --- /dev/null +++ b/backend/plugin/dict/schema/__init__.py @@ -0,0 +1,2 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- diff --git a/backend/app/admin/schema/dict_data.py b/backend/plugin/dict/schema/dict_data.py similarity index 95% rename from backend/app/admin/schema/dict_data.py rename to backend/plugin/dict/schema/dict_data.py index e901bcf0..f0316d1e 100644 --- a/backend/app/admin/schema/dict_data.py +++ b/backend/plugin/dict/schema/dict_data.py @@ -4,9 +4,9 @@ from pydantic import ConfigDict, Field -from backend.app.admin.schema.dict_type import GetDictTypeDetail from backend.common.enums import StatusType from backend.common.schema import SchemaBase +from backend.plugin.dict.schema.dict_type import GetDictTypeDetail class DictDataSchemaBase(SchemaBase): diff --git a/backend/app/admin/schema/dict_type.py b/backend/plugin/dict/schema/dict_type.py similarity index 100% rename from backend/app/admin/schema/dict_type.py rename to backend/plugin/dict/schema/dict_type.py diff --git a/backend/plugin/dict/service/__init__.py b/backend/plugin/dict/service/__init__.py new file mode 100644 index 00000000..56fafa58 --- /dev/null +++ b/backend/plugin/dict/service/__init__.py @@ -0,0 +1,2 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- diff --git a/backend/app/admin/service/dict_data_service.py b/backend/plugin/dict/service/dict_data_service.py similarity index 91% rename from backend/app/admin/service/dict_data_service.py rename to backend/plugin/dict/service/dict_data_service.py index 48fdd219..ab316d4a 100644 --- a/backend/app/admin/service/dict_data_service.py +++ b/backend/plugin/dict/service/dict_data_service.py @@ -2,12 +2,12 @@ # -*- coding: utf-8 -*- from sqlalchemy import Select -from backend.app.admin.crud.crud_dict_data import dict_data_dao -from backend.app.admin.crud.crud_dict_type import dict_type_dao -from backend.app.admin.model import DictData -from backend.app.admin.schema.dict_data import CreateDictDataParam, UpdateDictDataParam from backend.common.exception import errors from backend.database.db import async_db_session +from backend.plugin.dict.crud.crud_dict_data import dict_data_dao +from backend.plugin.dict.crud.crud_dict_type import dict_type_dao +from backend.plugin.dict.model import DictData +from backend.plugin.dict.schema.dict_data import CreateDictDataParam, UpdateDictDataParam class DictDataService: diff --git a/backend/app/admin/service/dict_type_service.py b/backend/plugin/dict/service/dict_type_service.py similarity index 93% rename from backend/app/admin/service/dict_type_service.py rename to backend/plugin/dict/service/dict_type_service.py index 6da2ca88..89be65f2 100644 --- a/backend/app/admin/service/dict_type_service.py +++ b/backend/plugin/dict/service/dict_type_service.py @@ -2,10 +2,10 @@ # -*- coding: utf-8 -*- from sqlalchemy import Select -from backend.app.admin.crud.crud_dict_type import dict_type_dao -from backend.app.admin.schema.dict_type import CreateDictTypeParam, UpdateDictTypeParam from backend.common.exception import errors from backend.database.db import async_db_session +from backend.plugin.dict.crud.crud_dict_type import dict_type_dao +from backend.plugin.dict.schema.dict_type import CreateDictTypeParam, UpdateDictTypeParam class DictTypeService: