Skip to content

Commit 94ff571

Browse files
committed
Update dict data and type to plugin
1 parent 0675e53 commit 94ff571

File tree

21 files changed

+50
-28
lines changed

21 files changed

+50
-28
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
from backend.app.admin.api.v1.sys.config import router as config_router
66
from backend.app.admin.api.v1.sys.data_rule import router as data_rule_router
77
from backend.app.admin.api.v1.sys.dept import router as dept_router
8-
from backend.app.admin.api.v1.sys.dict_data import router as dict_data_router
9-
from backend.app.admin.api.v1.sys.dict_type import router as dict_type_router
108
from backend.app.admin.api.v1.sys.menu import router as menu_router
119
from backend.app.admin.api.v1.sys.plugin import router as plugin_router
1210
from backend.app.admin.api.v1.sys.role import router as role_router
@@ -18,8 +16,6 @@
1816

1917
router.include_router(config_router, prefix='/configs', tags=['系统参数配置'])
2018
router.include_router(dept_router, prefix='/depts', tags=['系统部门'])
21-
router.include_router(dict_data_router, prefix='/dict-datas', tags=['系统字典数据'])
22-
router.include_router(dict_type_router, prefix='/dict-types', tags=['系统字典类型'])
2319
router.include_router(menu_router, prefix='/menus', tags=['系统菜单'])
2420
router.include_router(role_router, prefix='/roles', tags=['系统角色'])
2521
router.include_router(user_router, prefix='/users', tags=['系统用户'])

backend/app/admin/model/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
from backend.app.admin.model.config import Config
44
from backend.app.admin.model.data_rule import DataRule
55
from backend.app.admin.model.dept import Dept
6-
from backend.app.admin.model.dict_data import DictData
7-
from backend.app.admin.model.dict_type import DictType
86
from backend.app.admin.model.login_log import LoginLog
97
from backend.app.admin.model.menu import Menu
108
from backend.app.admin.model.opera_log import OperaLog

backend/plugin/dict/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-

backend/app/admin/api/v1/sys/dict_data.py renamed to backend/plugin/dict/api/v1/sys/dict_data.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44

55
from fastapi import APIRouter, Depends, Path, Query
66

7-
from backend.app.admin.schema.dict_data import (
8-
CreateDictDataParam,
9-
GetDictDataDetail,
10-
GetDictDataWithRelation,
11-
UpdateDictDataParam,
12-
)
13-
from backend.app.admin.service.dict_data_service import dict_data_service
147
from backend.common.pagination import DependsPagination, PageData, paging_data
158
from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
169
from backend.common.security.jwt import DependsJwtAuth
1710
from backend.common.security.permission import RequestPermission
1811
from backend.common.security.rbac import DependsRBAC
1912
from backend.database.db import CurrentSession
13+
from backend.plugin.dict.schema.dict_data import (
14+
CreateDictDataParam,
15+
GetDictDataDetail,
16+
GetDictDataWithRelation,
17+
UpdateDictDataParam,
18+
)
19+
from backend.plugin.dict.service.dict_data_service import dict_data_service
2020

2121
router = APIRouter()
2222

backend/app/admin/api/v1/sys/dict_type.py renamed to backend/plugin/dict/api/v1/sys/dict_type.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
from fastapi import APIRouter, Depends, Path, Query
66

7-
from backend.app.admin.schema.dict_type import CreateDictTypeParam, GetDictTypeDetail, UpdateDictTypeParam
8-
from backend.app.admin.service.dict_type_service import dict_type_service
97
from backend.common.pagination import DependsPagination, PageData, paging_data
108
from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
119
from backend.common.security.jwt import DependsJwtAuth
1210
from backend.common.security.permission import RequestPermission
1311
from backend.common.security.rbac import DependsRBAC
1412
from backend.database.db import CurrentSession
13+
from backend.plugin.dict.schema.dict_type import CreateDictTypeParam, GetDictTypeDetail, UpdateDictTypeParam
14+
from backend.plugin.dict.service.dict_type_service import dict_type_service
1515

1616
router = APIRouter()
1717

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-

backend/app/admin/crud/crud_dict_data.py renamed to backend/plugin/dict/crud/crud_dict_data.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from sqlalchemy.orm import noload, selectinload
66
from sqlalchemy_crud_plus import CRUDPlus
77

8-
from backend.app.admin.model import DictData
9-
from backend.app.admin.schema.dict_data import CreateDictDataParam, UpdateDictDataParam
8+
from backend.plugin.dict.model import DictData
9+
from backend.plugin.dict.schema.dict_data import CreateDictDataParam, UpdateDictDataParam
1010

1111

1212
class CRUDDictData(CRUDPlus[DictData]):

0 commit comments

Comments
 (0)