From 3755b84edb9dfed43701acf3d10fffdd1242439f Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 21 May 2025 16:04:15 +0800 Subject: [PATCH] feat(datasource): datasource --- backend/apps/datasource/api/datasource.py | 6 +++--- backend/apps/datasource/crud/datasource.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/apps/datasource/api/datasource.py b/backend/apps/datasource/api/datasource.py index a468552b..d50b4061 100644 --- a/backend/apps/datasource/api/datasource.py +++ b/backend/apps/datasource/api/datasource.py @@ -7,7 +7,7 @@ import pandas as pd from fastapi import APIRouter, File, UploadFile, HTTPException from apps.db.engine import create_table, get_data_engine, insert_data -from common.core.deps import SessionDep +from common.core.deps import SessionDep, CurrentUser from ..crud.datasource import get_datasource_list, check_status, create_ds, update_ds, delete_ds, getTables, getFields, \ execSql, update_table_and_fields, getTablesByDs, chooseTables, preview from ..crud.field import get_fields_by_table_id @@ -29,8 +29,8 @@ async def check(session: SessionDep, ds: CoreDatasource): @router.post("/add", response_model=CoreDatasource) -async def add(session: SessionDep, ds: CreateDatasource): - return create_ds(session, ds) +async def add(session: SessionDep, user: CurrentUser, ds: CreateDatasource): + return create_ds(session, user, ds) @router.post("/chooseTables/{id}") diff --git a/backend/apps/datasource/crud/datasource.py b/backend/apps/datasource/crud/datasource.py index 0ae58661..6438aa8c 100644 --- a/backend/apps/datasource/crud/datasource.py +++ b/backend/apps/datasource/crud/datasource.py @@ -9,7 +9,7 @@ from apps.datasource.utils.utils import aes_decrypt from apps.db.db import get_engine, get_tables, get_fields, exec_sql from apps.db.engine import get_engine_config from apps.db.engine import get_engine_conn -from common.core.deps import SessionDep +from common.core.deps import SessionDep, CurrentUser from common.utils.utils import deepcopy_ignore_extra from ..crud.field import delete_field_by_ds_id, update_field from ..crud.table import delete_table_by_ds_id, update_table @@ -34,11 +34,12 @@ def check_status(session: SessionDep, ds: CoreDatasource): return False -def create_ds(session: SessionDep, create_ds: CreateDatasource): +def create_ds(session: SessionDep, user: CurrentUser, create_ds: CreateDatasource): ds = CoreDatasource() deepcopy_ignore_extra(create_ds, ds) ds.create_time = datetime.datetime.now() # status = check_status(session, ds) + ds.create_by = user.id ds.status = "Success" record = CoreDatasource(**ds.model_dump()) session.add(record)