mirror of
https://github.com/insistence/RuoYi-Vue3-FastAPI.git
synced 2026-10-15 05:19:14 +00:00
feat: 新增多数据源功能 (#123)
* feat: 新增多数据源功能 * perf: 优化多worker下数据源打印重复日志的问题 * perf: 优化代码 * perf: 优化代码 * chore: 固定ai插件相关依赖
This commit is contained in:
@@ -19,7 +19,7 @@ from pydantic_validation_decorator import ValidateFields
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from common.annotation.log_annotation import Log
|
||||
from common.aspect.db_seesion import DBSessionDependency
|
||||
from common.aspect.db_session import DBSessionDependency
|
||||
from common.aspect.interface_auth import UserInterfaceAuthDependency
|
||||
from common.aspect.pre_auth import CurrentUserDependency, PreAuthDependency
|
||||
from common.enums import BusinessType
|
||||
@@ -48,7 +48,7 @@ from utils.response_util import ResponseUtil
|
||||
async def get_{{ moduleName }}_{{ businessName }}_list(
|
||||
request: Request,
|
||||
{% if table.crud or table.sub %}{{ businessName }}_page_query{% elif table.tree %}{{ businessName }}_query{% endif %}: Annotated[{{ BusinessName }}PageQueryModel, Query()],
|
||||
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
||||
query_db: Annotated[AsyncSession, {{ dbSessionDependency }}],
|
||||
) -> Response:
|
||||
{% if table.crud or table.sub %}
|
||||
# 获取分页数据
|
||||
@@ -76,7 +76,7 @@ async def get_{{ moduleName }}_{{ businessName }}_list(
|
||||
async def add_{{ moduleName }}_{{ businessName }}(
|
||||
request: Request,
|
||||
add_{{ businessName }}: {{ BusinessName }}Model,
|
||||
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
||||
query_db: Annotated[AsyncSession, {{ dbSessionDependency }}],
|
||||
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
||||
) -> Response:
|
||||
{% for column in columns %}
|
||||
@@ -108,7 +108,7 @@ async def add_{{ moduleName }}_{{ businessName }}(
|
||||
async def edit_{{ moduleName }}_{{ businessName }}(
|
||||
request: Request,
|
||||
edit_{{ businessName }}: {{ BusinessName }}Model,
|
||||
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
||||
query_db: Annotated[AsyncSession, {{ dbSessionDependency }}],
|
||||
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
||||
) -> Response:
|
||||
{% for column in columns %}
|
||||
@@ -135,7 +135,7 @@ async def edit_{{ moduleName }}_{{ businessName }}(
|
||||
async def delete_{{ moduleName }}_{{ businessName }}(
|
||||
request: Request,
|
||||
{{ pk_field }}s: Annotated[str, Path(description='需要删除的{{ pk_field_comment }}')],
|
||||
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
||||
query_db: Annotated[AsyncSession, {{ dbSessionDependency }}],
|
||||
) -> Response:
|
||||
delete_{{ businessName }} = Delete{{ BusinessName }}Model({{ pkField }}s={{ pk_field }}s)
|
||||
delete_{{ businessName }}_result = await {{ BusinessName }}Service.delete_{{ businessName }}_services(query_db, delete_{{ businessName }})
|
||||
@@ -154,7 +154,7 @@ async def delete_{{ moduleName }}_{{ businessName }}(
|
||||
async def query_detail_{{ moduleName }}_{{ businessName }}(
|
||||
request: Request,
|
||||
{{ pk_field }}: Annotated[{{ pkColumn.python_type }}, Path(description='{{ pk_field_comment }}')],
|
||||
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
||||
query_db: Annotated[AsyncSession, {{ dbSessionDependency }}],
|
||||
) -> Response:
|
||||
{{ businessName }}_detail_result = await {{ BusinessName }}Service.{{ businessName }}_detail_services(query_db, {{ pk_field }})
|
||||
logger.info(f'获取{{ pk_field }}为{% raw %}{{% endraw %}{{ pk_field }}{% raw %}}{% endraw %}的信息成功')
|
||||
@@ -181,7 +181,7 @@ async def query_detail_{{ moduleName }}_{{ businessName }}(
|
||||
async def export_{{ moduleName }}_{{ businessName }}_list(
|
||||
request: Request,
|
||||
{{ businessName }}_page_query: Annotated[{{ BusinessName }}PageQueryModel, Form()],
|
||||
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
||||
query_db: Annotated[AsyncSession, {{ dbSessionDependency }}],
|
||||
) -> Response:
|
||||
# 获取全量数据
|
||||
{{ businessName }}_query_result = await {{ BusinessName }}Service.get_{{ businessName }}_list_services(query_db, {{ businessName }}_page_query, is_page=False)
|
||||
|
||||
@@ -5,10 +5,17 @@
|
||||
from sqlalchemy.orm import relationship
|
||||
{% endif %}
|
||||
|
||||
{% if dataSourceName == defaultDataSourceName %}
|
||||
from config.database import Base
|
||||
{% else %}
|
||||
from config.database import get_data_source_base
|
||||
|
||||
|
||||
class {{ ClassName }}(Base):
|
||||
DataSourceBase = get_data_source_base('{{ dataSourceName }}')
|
||||
{% endif %}
|
||||
|
||||
|
||||
class {{ ClassName }}({% if dataSourceName == defaultDataSourceName %}Base{% else %}DataSourceBase{% endif %}):
|
||||
"""
|
||||
{{ functionName }}表
|
||||
"""
|
||||
@@ -17,7 +24,7 @@ class {{ ClassName }}(Base):
|
||||
__table_args__ = {'comment': '{{ tableComment }}'}
|
||||
|
||||
{% for column in columns %}
|
||||
{{ column.column_name }} = Column({{ column.column_type | get_sqlalchemy_type }}, {% if column.pk %}primary_key=True, {% endif %}{% if column.increment %}autoincrement=True, {% endif %}{% if column.required or column.pk %}nullable=False{% else %}nullable=True{% endif %}, comment='{{ column.column_comment }}')
|
||||
{{ column.column_name }} = Column({{ column.column_type | get_sqlalchemy_type(dataSourceName) }}, {% if column.pk %}primary_key=True, {% endif %}{% if column.increment %}autoincrement=True, {% endif %}{% if column.required or column.pk %}nullable=False{% else %}nullable=True{% endif %}, comment='{{ column.column_comment }}')
|
||||
{% endfor %}
|
||||
|
||||
{% if table.sub %}
|
||||
@@ -26,7 +33,7 @@ class {{ ClassName }}(Base):
|
||||
|
||||
|
||||
{% if table.sub %}
|
||||
class {{ subClassName }}(Base):
|
||||
class {{ subClassName }}({% if dataSourceName == defaultDataSourceName %}Base{% else %}DataSourceBase{% endif %}):
|
||||
"""
|
||||
{{ subTable.function_name }}表
|
||||
"""
|
||||
@@ -34,7 +41,7 @@ class {{ subClassName }}(Base):
|
||||
__tablename__ = '{{ subTableName }}'
|
||||
|
||||
{% for column in subTable.columns %}
|
||||
{{ column.column_name }} = Column({{ column.column_type | get_sqlalchemy_type }}, {% if column.column_name == subTableFkName %}ForeignKey('{{ tableName }}.{{ subTableFkName }}'), {% endif %}{% if column.pk %}primary_key=True, {% endif %}{% if column.increment %}autoincrement=True, {% endif %}{% if column.required %}nullable=True{% else %}nullable=False{% endif %}, comment='{{ column.column_comment }}')
|
||||
{{ column.column_name }} = Column({{ column.column_type | get_sqlalchemy_type(dataSourceName) }}, {% if column.column_name == subTableFkName %}ForeignKey('{{ tableName }}.{{ subTableFkName }}'), {% endif %}{% if column.pk %}primary_key=True, {% endif %}{% if column.increment %}autoincrement=True, {% endif %}{% if column.required or column.pk %}nullable=False{% else %}nullable=True{% endif %}, comment='{{ column.column_comment }}')
|
||||
{% endfor %}
|
||||
|
||||
{% if table.sub %}
|
||||
|
||||
Reference in New Issue
Block a user