From d9a19ce3ee489e2e1a8d3c7d7337849149916325 Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Sat, 13 Dec 2025 11:28:43 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=93=8D=E4=BD=9C=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8=E5=85=AC?= =?UTF-8?q?=E5=85=B1vo=E6=A8=A1=E5=9D=97=E7=9A=84CrudResponseModel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_admin/controller/login_controller.py | 2 +- .../module_admin/entity/vo/common_vo.py | 12 +----------- .../module_admin/service/cache_service.py | 2 +- .../module_admin/service/common_service.py | 3 ++- .../module_admin/service/config_service.py | 3 +-- .../module_admin/service/dept_service.py | 2 +- .../module_admin/service/dict_service.py | 3 +-- .../module_admin/service/job_log_service.py | 3 +-- .../module_admin/service/job_service.py | 3 +-- .../module_admin/service/log_service.py | 3 +-- .../module_admin/service/login_service.py | 2 +- .../module_admin/service/menu_service.py | 2 +- .../module_admin/service/notice_service.py | 3 +-- .../module_admin/service/online_service.py | 2 +- .../module_admin/service/post_service.py | 3 +-- .../module_admin/service/role_service.py | 3 +-- .../module_admin/service/user_service.py | 3 +-- .../module_generator/service/gen_service.py | 3 +-- .../templates/python/service.py.jinja2 | 3 +-- 19 files changed, 20 insertions(+), 40 deletions(-) diff --git a/ruoyi-fastapi-backend/module_admin/controller/login_controller.py b/ruoyi-fastapi-backend/module_admin/controller/login_controller.py index b00b3e1..4dbb055 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/login_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/login_controller.py @@ -10,8 +10,8 @@ from common.annotation.log_annotation import Log from common.aspect.db_seesion import DBSessionDependency from common.aspect.pre_auth import CurrentUserDependency from common.enums import BusinessType, RedisInitKeyConfig +from common.vo import CrudResponseModel from config.env import AppConfig, JwtConfig -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.login_vo import Token, UserLogin, UserRegister from module_admin.entity.vo.user_vo import CurrentUserModel, EditUserModel from module_admin.service.login_service import CustomOAuth2PasswordRequestForm, LoginService, oauth2_scheme diff --git a/ruoyi-fastapi-backend/module_admin/entity/vo/common_vo.py b/ruoyi-fastapi-backend/module_admin/entity/vo/common_vo.py index f885c31..c589cd1 100644 --- a/ruoyi-fastapi-backend/module_admin/entity/vo/common_vo.py +++ b/ruoyi-fastapi-backend/module_admin/entity/vo/common_vo.py @@ -1,19 +1,9 @@ -from typing import Any, Optional +from typing import Optional from pydantic import BaseModel, ConfigDict, Field from pydantic.alias_generators import to_camel -class CrudResponseModel(BaseModel): - """ - 操作响应模型 - """ - - is_success: bool = Field(description='操作是否成功') - message: str = Field(description='响应信息') - result: Optional[Any] = Field(default=None, description='响应结果') - - class UploadResponseModel(BaseModel): """ 上传响应模型 diff --git a/ruoyi-fastapi-backend/module_admin/service/cache_service.py b/ruoyi-fastapi-backend/module_admin/service/cache_service.py index 6ffb2eb..410f6b8 100644 --- a/ruoyi-fastapi-backend/module_admin/service/cache_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/cache_service.py @@ -1,9 +1,9 @@ from fastapi import Request from common.enums import RedisInitKeyConfig +from common.vo import CrudResponseModel from config.get_redis import RedisUtil from module_admin.entity.vo.cache_vo import CacheInfoModel, CacheMonitorModel -from module_admin.entity.vo.common_vo import CrudResponseModel class CacheService: diff --git a/ruoyi-fastapi-backend/module_admin/service/common_service.py b/ruoyi-fastapi-backend/module_admin/service/common_service.py index b5832ad..254ad9f 100644 --- a/ruoyi-fastapi-backend/module_admin/service/common_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/common_service.py @@ -4,9 +4,10 @@ from datetime import datetime import aiofiles from fastapi import BackgroundTasks, Request, UploadFile +from common.vo import CrudResponseModel from config.env import UploadConfig from exceptions.exception import ServiceException -from module_admin.entity.vo.common_vo import CrudResponseModel, UploadResponseModel +from module_admin.entity.vo.common_vo import UploadResponseModel from utils.upload_util import UploadUtil diff --git a/ruoyi-fastapi-backend/module_admin/service/config_service.py b/ruoyi-fastapi-backend/module_admin/service/config_service.py index eee4e9b..a16828d 100644 --- a/ruoyi-fastapi-backend/module_admin/service/config_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/config_service.py @@ -6,10 +6,9 @@ from sqlalchemy.ext.asyncio import AsyncSession from common.constant import CommonConstant from common.enums import RedisInitKeyConfig -from common.vo import PageModel +from common.vo import CrudResponseModel, PageModel from exceptions.exception import ServiceException from module_admin.dao.config_dao import ConfigDao -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.config_vo import ConfigModel, ConfigPageQueryModel, DeleteConfigModel from utils.common_util import CamelCaseUtil from utils.excel_util import ExcelUtil diff --git a/ruoyi-fastapi-backend/module_admin/service/dept_service.py b/ruoyi-fastapi-backend/module_admin/service/dept_service.py index 186ea32..d36b2f4 100644 --- a/ruoyi-fastapi-backend/module_admin/service/dept_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/dept_service.py @@ -4,10 +4,10 @@ from typing import Any from sqlalchemy.ext.asyncio import AsyncSession from common.constant import CommonConstant +from common.vo import CrudResponseModel from exceptions.exception import ServiceException, ServiceWarning from module_admin.dao.dept_dao import DeptDao from module_admin.entity.do.dept_do import SysDept -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.dept_vo import DeleteDeptModel, DeptModel from utils.common_util import CamelCaseUtil diff --git a/ruoyi-fastapi-backend/module_admin/service/dict_service.py b/ruoyi-fastapi-backend/module_admin/service/dict_service.py index c2a95a6..9717ac5 100644 --- a/ruoyi-fastapi-backend/module_admin/service/dict_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/dict_service.py @@ -8,11 +8,10 @@ from sqlalchemy.ext.asyncio import AsyncSession from common.constant import CommonConstant from common.enums import RedisInitKeyConfig -from common.vo import PageModel +from common.vo import CrudResponseModel, PageModel from exceptions.exception import ServiceException from module_admin.dao.dict_dao import DictDataDao, DictTypeDao from module_admin.entity.do.dict_do import SysDictData -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.dict_vo import ( DeleteDictDataModel, DeleteDictTypeModel, diff --git a/ruoyi-fastapi-backend/module_admin/service/job_log_service.py b/ruoyi-fastapi-backend/module_admin/service/job_log_service.py index 311d4f3..45f046e 100644 --- a/ruoyi-fastapi-backend/module_admin/service/job_log_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/job_log_service.py @@ -4,9 +4,8 @@ from fastapi import Request from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm import Session -from common.vo import PageModel +from common.vo import CrudResponseModel, PageModel from module_admin.dao.job_log_dao import JobLogDao -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.job_vo import DeleteJobLogModel, JobLogModel, JobLogPageQueryModel from module_admin.service.dict_service import DictDataService from utils.excel_util import ExcelUtil diff --git a/ruoyi-fastapi-backend/module_admin/service/job_service.py b/ruoyi-fastapi-backend/module_admin/service/job_service.py index c4a01bc..7f327bf 100644 --- a/ruoyi-fastapi-backend/module_admin/service/job_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/job_service.py @@ -4,11 +4,10 @@ from fastapi import Request from sqlalchemy.ext.asyncio import AsyncSession from common.constant import CommonConstant, JobConstant -from common.vo import PageModel +from common.vo import CrudResponseModel, PageModel from config.get_scheduler import SchedulerUtil from exceptions.exception import ServiceException from module_admin.dao.job_dao import JobDao -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.job_vo import DeleteJobModel, EditJobModel, JobModel, JobPageQueryModel from module_admin.service.dict_service import DictDataService from utils.common_util import CamelCaseUtil diff --git a/ruoyi-fastapi-backend/module_admin/service/log_service.py b/ruoyi-fastapi-backend/module_admin/service/log_service.py index a857da1..4e89c54 100644 --- a/ruoyi-fastapi-backend/module_admin/service/log_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/log_service.py @@ -3,10 +3,9 @@ from typing import Any, Union from fastapi import Request from sqlalchemy.ext.asyncio import AsyncSession -from common.vo import PageModel +from common.vo import CrudResponseModel, PageModel from exceptions.exception import ServiceException from module_admin.dao.log_dao import LoginLogDao, OperationLogDao -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.log_vo import ( DeleteLoginLogModel, DeleteOperLogModel, diff --git a/ruoyi-fastapi-backend/module_admin/service/login_service.py b/ruoyi-fastapi-backend/module_admin/service/login_service.py index a7834df..d982925 100644 --- a/ruoyi-fastapi-backend/module_admin/service/login_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/login_service.py @@ -13,6 +13,7 @@ from sqlalchemy.ext.asyncio import AsyncSession from common.constant import CommonConstant, MenuConstant from common.context import RequestContext from common.enums import RedisInitKeyConfig +from common.vo import CrudResponseModel from config.env import AppConfig, JwtConfig from config.get_db import get_db from exceptions.exception import AuthException, LoginException, ServiceException @@ -21,7 +22,6 @@ from module_admin.dao.user_dao import UserDao from module_admin.entity.do.dept_do import SysDept from module_admin.entity.do.menu_do import SysMenu from module_admin.entity.do.user_do import SysUser -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.login_vo import MenuTreeModel, MetaModel, RouterModel, SmsCode, UserLogin, UserRegister from module_admin.entity.vo.user_vo import AddUserModel, CurrentUserModel, ResetUserModel, TokenData, UserInfoModel from module_admin.service.user_service import UserService diff --git a/ruoyi-fastapi-backend/module_admin/service/menu_service.py b/ruoyi-fastapi-backend/module_admin/service/menu_service.py index 43526bd..1767b69 100644 --- a/ruoyi-fastapi-backend/module_admin/service/menu_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/menu_service.py @@ -4,11 +4,11 @@ from typing import Any, Optional from sqlalchemy.ext.asyncio import AsyncSession from common.constant import CommonConstant, MenuConstant +from common.vo import CrudResponseModel from exceptions.exception import ServiceException, ServiceWarning from module_admin.dao.menu_dao import MenuDao from module_admin.dao.role_dao import RoleDao from module_admin.entity.do.menu_do import SysMenu -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.menu_vo import DeleteMenuModel, MenuModel, MenuQueryModel from module_admin.entity.vo.role_vo import RoleMenuQueryModel from module_admin.entity.vo.user_vo import CurrentUserModel diff --git a/ruoyi-fastapi-backend/module_admin/service/notice_service.py b/ruoyi-fastapi-backend/module_admin/service/notice_service.py index 14106f6..4c210a8 100644 --- a/ruoyi-fastapi-backend/module_admin/service/notice_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/notice_service.py @@ -3,10 +3,9 @@ from typing import Any, Union from sqlalchemy.ext.asyncio import AsyncSession from common.constant import CommonConstant -from common.vo import PageModel +from common.vo import CrudResponseModel, PageModel from exceptions.exception import ServiceException from module_admin.dao.notice_dao import NoticeDao -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.notice_vo import DeleteNoticeModel, NoticeModel, NoticePageQueryModel from utils.common_util import CamelCaseUtil diff --git a/ruoyi-fastapi-backend/module_admin/service/online_service.py b/ruoyi-fastapi-backend/module_admin/service/online_service.py index 8cde457..6ed5070 100644 --- a/ruoyi-fastapi-backend/module_admin/service/online_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/online_service.py @@ -4,9 +4,9 @@ import jwt from fastapi import Request from common.enums import RedisInitKeyConfig +from common.vo import CrudResponseModel from config.env import AppConfig, JwtConfig from exceptions.exception import ServiceException -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.online_vo import DeleteOnlineModel, OnlineQueryModel from utils.common_util import CamelCaseUtil diff --git a/ruoyi-fastapi-backend/module_admin/service/post_service.py b/ruoyi-fastapi-backend/module_admin/service/post_service.py index 45f0342..c25d462 100644 --- a/ruoyi-fastapi-backend/module_admin/service/post_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/post_service.py @@ -3,10 +3,9 @@ from typing import Any, Union from sqlalchemy.ext.asyncio import AsyncSession from common.constant import CommonConstant -from common.vo import PageModel +from common.vo import CrudResponseModel, PageModel from exceptions.exception import ServiceException from module_admin.dao.post_dao import PostDao -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.post_vo import DeletePostModel, PostModel, PostPageQueryModel from utils.common_util import CamelCaseUtil from utils.excel_util import ExcelUtil diff --git a/ruoyi-fastapi-backend/module_admin/service/role_service.py b/ruoyi-fastapi-backend/module_admin/service/role_service.py index d5fec77..c960197 100644 --- a/ruoyi-fastapi-backend/module_admin/service/role_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/role_service.py @@ -3,11 +3,10 @@ from typing import Any, Union from sqlalchemy.ext.asyncio import AsyncSession from common.constant import CommonConstant -from common.vo import PageModel +from common.vo import CrudResponseModel, PageModel from exceptions.exception import ServiceException from module_admin.dao.role_dao import RoleDao from module_admin.dao.user_dao import UserDao -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.role_vo import ( AddRoleModel, DeleteRoleModel, diff --git a/ruoyi-fastapi-backend/module_admin/service/user_service.py b/ruoyi-fastapi-backend/module_admin/service/user_service.py index 71270ee..9a8bc3c 100644 --- a/ruoyi-fastapi-backend/module_admin/service/user_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/user_service.py @@ -7,11 +7,10 @@ from fastapi import Request, UploadFile from sqlalchemy.ext.asyncio import AsyncSession from common.constant import CommonConstant -from common.vo import PageModel +from common.vo import CrudResponseModel, PageModel from exceptions.exception import ServiceException from module_admin.dao.user_dao import UserDao from module_admin.entity.do.user_do import SysUserRole -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.post_vo import PostPageQueryModel from module_admin.entity.vo.user_vo import ( AddUserModel, diff --git a/ruoyi-fastapi-backend/module_generator/service/gen_service.py b/ruoyi-fastapi-backend/module_generator/service/gen_service.py index 14b31f8..4918d00 100644 --- a/ruoyi-fastapi-backend/module_generator/service/gen_service.py +++ b/ruoyi-fastapi-backend/module_generator/service/gen_service.py @@ -11,10 +11,9 @@ from sqlglot import parse as sqlglot_parse from sqlglot.expressions import Add, Alter, Create, Delete, Drop, Expression, Insert, Table, TruncateTable, Update from common.constant import GenConstant -from common.vo import PageModel +from common.vo import CrudResponseModel, PageModel from config.env import DataBaseConfig, GenConfig from exceptions.exception import ServiceException -from module_admin.entity.vo.common_vo import CrudResponseModel from module_admin.entity.vo.user_vo import CurrentUserModel from module_generator.dao.gen_dao import GenTableColumnDao, GenTableDao from module_generator.entity.vo.gen_vo import ( diff --git a/ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2 b/ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2 index bfd8a2a..c13d8cd 100644 --- a/ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2 +++ b/ruoyi-fastapi-backend/module_generator/templates/python/service.py.jinja2 @@ -10,10 +10,9 @@ from fastapi import Request from sqlalchemy.ext.asyncio import AsyncSession from common.constant import CommonConstant -from common.vo import PageModel +from common.vo import CrudResponseModel, PageModel from exceptions.exception import ServiceException from {{ packageName }}.dao.{{ businessName }}_dao import {{ BusinessName }}Dao -from module_admin.entity.vo.common_vo import CrudResponseModel from {{ packageName }}.entity.vo.{{ businessName }}_vo import Delete{{ BusinessName }}Model, {{ BusinessName }}Model, {{ BusinessName }}PageQueryModel {% if dicts %} from module_admin.service.dict_service import DictDataService