Update dict data and type to plugin (#562)

Author: wu-clan

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

@@ -4,8 +4,6 @@
 
 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
@@ -16,8 +14,6 @@
 router = APIRouter(prefix='/sys')
 
 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=['系统用户'])

backend/app/admin/model/__init__.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 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

backend/plugin/dict/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-

backend/plugin/dict/api/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-

backend/plugin/dict/api/v1/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-

backend/plugin/dict/api/v1/sys/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-

backend/app/admin/api/v1/sys/dict_data.py 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()
 

backend/app/admin/api/v1/sys/dict_type.py 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()
 

backend/plugin/dict/crud/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-

backend/app/admin/crud/crud_dict_data.py 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]):

backend/app/admin/crud/crud_dict_type.py 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]):

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

backend/app/admin/model/dict_data.py 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):

backend/app/admin/model/dict_type.py 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):

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 = '系统字典类型'

backend/plugin/dict/schema/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-

backend/app/admin/schema/dict_data.py 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):

backend/app/admin/schema/dict_type.py backend/plugin/dict/schema/dict_type.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-

backend/plugin/dict/service/__init__.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:

backend/app/admin/service/dict_data_service.py backend/plugin/dict/service/dict_data_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: