feat: 数据管理支持切换 CellData 数据库
This commit is contained in:
+30
-3
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"Update": "2026/06/24 23:16:46",
|
||||
"Update": "2026/06/25 02:26:49",
|
||||
"SourceType": "sftp",
|
||||
"WarehouseType": "mysql",
|
||||
"MySQL_DBInfo": {
|
||||
"host": "127.0.0.1",
|
||||
"port": 3306,
|
||||
"user": "root",
|
||||
"passwd": "123456",
|
||||
"dbname": "CapacityReport"
|
||||
"dbname": "CapacityReport",
|
||||
"passwd": "123456"
|
||||
},
|
||||
"Metrix": {
|
||||
"base_url": "http://host.docker.internal:8000",
|
||||
@@ -204,6 +204,33 @@
|
||||
},
|
||||
"passwd": "242520"
|
||||
},
|
||||
"CellData": {
|
||||
"remote_data": {
|
||||
"enabled": false,
|
||||
"protocol": "sftp",
|
||||
"host": "",
|
||||
"port": 22,
|
||||
"user": "",
|
||||
"remote_dir": "/CellData",
|
||||
"passive": true,
|
||||
"timeout": 30,
|
||||
"auto_delete_source": false,
|
||||
"auto_scheduler": {
|
||||
"enabled": false,
|
||||
"check_interval_hours": 1,
|
||||
"expected_directories": [],
|
||||
"week_offset": 0
|
||||
},
|
||||
"passwd": ""
|
||||
},
|
||||
"mysql": {
|
||||
"host": "localhost",
|
||||
"port": 3306,
|
||||
"user": "root",
|
||||
"dbname": "celldata",
|
||||
"passwd": "123456"
|
||||
}
|
||||
},
|
||||
"HistoryRetention": {
|
||||
"enabled": true,
|
||||
"keep_count": 1
|
||||
|
||||
+46
-23
@@ -12,7 +12,7 @@ from app.config import CACHE_DIR
|
||||
from app.database import DatabaseManager
|
||||
from app.services.platform import make_client
|
||||
from app.utils.files import remove_file_safely
|
||||
from app.warehouse import make_warehouse
|
||||
from app.warehouse import make_cell_data_warehouse, make_warehouse
|
||||
|
||||
|
||||
router = APIRouter(tags=["database"])
|
||||
@@ -42,6 +42,9 @@ def _make_sheet_name(table_name: str, used_names: set[str]) -> str:
|
||||
return sheet_name
|
||||
|
||||
|
||||
DatabaseSource = str
|
||||
|
||||
|
||||
def _dataframe_from_table(db: DatabaseManager, table_name: str) -> pd.DataFrame:
|
||||
result = db.query_table(table_name, page=1, page_size=1000000)
|
||||
table_info = db.get_table_info(table_name)
|
||||
@@ -49,21 +52,26 @@ def _dataframe_from_table(db: DatabaseManager, table_name: str) -> pd.DataFrame:
|
||||
return pd.DataFrame(result["data"], columns=columns)
|
||||
|
||||
|
||||
def _db():
|
||||
def _db(database_source: DatabaseSource = "main"):
|
||||
"""Direct MySQL DatabaseManager, or a Metrix-backed warehouse with the same interface."""
|
||||
return make_warehouse(state.current_config())
|
||||
config = state.current_config()
|
||||
if database_source == "cell_data":
|
||||
return make_cell_data_warehouse(config)
|
||||
if database_source != "main":
|
||||
raise HTTPException(status_code=400, detail="不支持的数据库来源")
|
||||
return make_warehouse(config)
|
||||
|
||||
|
||||
@router.post("/api/database/test")
|
||||
def test_database():
|
||||
db = _db()
|
||||
def test_database(database_source: DatabaseSource = Body("main", embed=True)):
|
||||
db = _db(database_source)
|
||||
success, message = db.test_connection()
|
||||
return {"success": success, "message": message}
|
||||
|
||||
|
||||
@router.get("/api/database/info")
|
||||
def get_database_info():
|
||||
db = _db()
|
||||
def get_database_info(database_source: DatabaseSource = "main"):
|
||||
db = _db(database_source)
|
||||
try:
|
||||
return {"success": True, **db.get_server_info()}
|
||||
except Exception as exc:
|
||||
@@ -72,8 +80,8 @@ def get_database_info():
|
||||
|
||||
@router.get("/api/database/tables")
|
||||
@router.post("/api/database/tables")
|
||||
def get_tables():
|
||||
db = _db()
|
||||
def get_tables(database_source: DatabaseSource = Body("main", embed=True)):
|
||||
db = _db(database_source)
|
||||
try:
|
||||
return {"tables": db.get_tables()}
|
||||
except Exception as exc:
|
||||
@@ -81,8 +89,11 @@ def get_tables():
|
||||
|
||||
|
||||
@router.post("/api/database/table/info")
|
||||
def get_table_info(table_name: str = Body(..., embed=True)):
|
||||
db = _db()
|
||||
def get_table_info(
|
||||
table_name: str = Body(..., embed=True),
|
||||
database_source: DatabaseSource = Body("main"),
|
||||
):
|
||||
db = _db(database_source)
|
||||
try:
|
||||
return db.get_table_info(table_name)
|
||||
except Exception as exc:
|
||||
@@ -92,12 +103,13 @@ def get_table_info(table_name: str = Body(..., embed=True)):
|
||||
@router.post("/api/database/table/data")
|
||||
def query_table_data(
|
||||
table_name: str = Body(..., embed=True),
|
||||
database_source: DatabaseSource = Body("main"),
|
||||
page: int = Body(1),
|
||||
page_size: int = Body(50),
|
||||
order_by: Optional[str] = Body(None),
|
||||
order_dir: str = Body("ASC"),
|
||||
):
|
||||
db = _db()
|
||||
db = _db(database_source)
|
||||
try:
|
||||
return db.query_table(table_name, page, page_size, order_by=order_by, order_dir=order_dir)
|
||||
except Exception as exc:
|
||||
@@ -107,13 +119,14 @@ def query_table_data(
|
||||
@router.post("/api/database/table/query")
|
||||
def query_table_with_filter(
|
||||
table_name: str = Body(..., embed=True),
|
||||
database_source: DatabaseSource = Body("main"),
|
||||
page: int = Body(1),
|
||||
page_size: int = Body(50),
|
||||
filters: Optional[dict[str, str]] = Body(None),
|
||||
order_by: Optional[str] = Body(None),
|
||||
order_dir: str = Body("ASC"),
|
||||
):
|
||||
db = _db()
|
||||
db = _db(database_source)
|
||||
try:
|
||||
return db.query_table(
|
||||
table_name,
|
||||
@@ -128,8 +141,11 @@ def query_table_with_filter(
|
||||
|
||||
|
||||
@router.post("/api/database/table/truncate")
|
||||
def truncate_table(table_name: str = Body(..., embed=True)):
|
||||
db = _db()
|
||||
def truncate_table(
|
||||
table_name: str = Body(..., embed=True),
|
||||
database_source: DatabaseSource = Body("main"),
|
||||
):
|
||||
db = _db(database_source)
|
||||
try:
|
||||
db.truncate_table(table_name)
|
||||
return {"success": True, "message": f"表 {table_name} 已清空"}
|
||||
@@ -138,8 +154,11 @@ def truncate_table(table_name: str = Body(..., embed=True)):
|
||||
|
||||
|
||||
@router.post("/api/database/table/drop")
|
||||
def drop_table(table_name: str = Body(..., embed=True)):
|
||||
db = _db()
|
||||
def drop_table(
|
||||
table_name: str = Body(..., embed=True),
|
||||
database_source: DatabaseSource = Body("main"),
|
||||
):
|
||||
db = _db(database_source)
|
||||
try:
|
||||
db.drop_table(table_name)
|
||||
return {"success": True, "message": f"表 {table_name} 已删除"}
|
||||
@@ -148,8 +167,8 @@ def drop_table(table_name: str = Body(..., embed=True)):
|
||||
|
||||
|
||||
@router.post("/api/database/table/drop-all")
|
||||
def drop_all_tables():
|
||||
db = _db()
|
||||
def drop_all_tables(database_source: DatabaseSource = Body("main", embed=True)):
|
||||
db = _db(database_source)
|
||||
try:
|
||||
result = db.drop_all_tables()
|
||||
return {
|
||||
@@ -163,8 +182,11 @@ def drop_all_tables():
|
||||
|
||||
|
||||
@router.post("/api/database/execute")
|
||||
def execute_sql(sql: str = Body(..., embed=True)):
|
||||
db = _db()
|
||||
def execute_sql(
|
||||
sql: str = Body(..., embed=True),
|
||||
database_source: DatabaseSource = Body("main"),
|
||||
):
|
||||
db = _db(database_source)
|
||||
try:
|
||||
success, result = db.execute_sql(sql)
|
||||
if success:
|
||||
@@ -182,6 +204,7 @@ def execute_sql(sql: str = Body(..., embed=True)):
|
||||
def download_table(
|
||||
table_name: Optional[str] = Body(None, embed=True),
|
||||
table_names: Optional[list[str]] = Body(None, embed=True),
|
||||
database_source: DatabaseSource = Body("main"),
|
||||
file_format: str = Body("csv", alias="format"),
|
||||
):
|
||||
if file_format not in {"csv", "xlsx"}:
|
||||
@@ -194,10 +217,10 @@ def download_table(
|
||||
raise HTTPException(status_code=400, detail="CSV 每次只能导出一张表")
|
||||
|
||||
config = state.current_config()
|
||||
if config.warehouse_type == "metrix":
|
||||
if database_source == "main" and config.warehouse_type == "metrix":
|
||||
return _download_via_metrix(config, requested_tables, file_format)
|
||||
|
||||
db = _db()
|
||||
db = _db(database_source)
|
||||
try:
|
||||
available_tables = set(db.get_tables())
|
||||
missing_tables = [name for name in requested_tables if name not in available_tables]
|
||||
|
||||
+5
-4
@@ -5,14 +5,15 @@ import pymysql
|
||||
from contextlib import contextmanager
|
||||
from typing import Any, Dict, List, Optional, Tuple
|
||||
|
||||
from app.config import AppConfig
|
||||
from app.config import AppConfig, MySQLConfig
|
||||
|
||||
|
||||
class DatabaseManager:
|
||||
"""数据库管理器"""
|
||||
|
||||
def __init__(self, config: AppConfig):
|
||||
def __init__(self, config: AppConfig, mysql_config: MySQLConfig | None = None):
|
||||
self.config = config
|
||||
self.mysql_config = (mysql_config or config.mysql).normalized()
|
||||
|
||||
@contextmanager
|
||||
def get_connection(self):
|
||||
@@ -26,7 +27,7 @@ class DatabaseManager:
|
||||
|
||||
如果需要高性能的短连接操作,请使用 engine 属性(连接池)
|
||||
"""
|
||||
mysql = self.config.mysql
|
||||
mysql = self.mysql_config
|
||||
conn = pymysql.connect(
|
||||
host=mysql.host,
|
||||
port=mysql.port,
|
||||
@@ -46,7 +47,7 @@ class DatabaseManager:
|
||||
@contextmanager
|
||||
def get_fast_connection(self):
|
||||
"""获取高性能 PyMySQL 连接(用于批量插入)"""
|
||||
mysql = self.config.mysql
|
||||
mysql = self.mysql_config
|
||||
conn = pymysql.connect(
|
||||
host=mysql.host,
|
||||
port=mysql.port,
|
||||
|
||||
@@ -22,6 +22,10 @@ def make_warehouse(config: AppConfig):
|
||||
return DatabaseManager(config)
|
||||
|
||||
|
||||
def make_cell_data_warehouse(config: AppConfig):
|
||||
return DatabaseManager(config, config.cell_data.normalized().mysql)
|
||||
|
||||
|
||||
def _quote_ident(name: str) -> str:
|
||||
return "`" + str(name).replace("`", "``") + "`"
|
||||
|
||||
|
||||
@@ -717,3 +717,10 @@
|
||||
- 设置页说明文案去掉开发实现细节,只保留用户填写配置所需的短提示:主数据源/仓库、Metrix 连接、CellData 数据库/远程源、远程数据源、自动调度、目录映射、Sheet 过滤和字段映射等位置均已压缩。
|
||||
- 历史删除确认中的“缓存文件”改为“相关文件”,避免把内部存储实现暴露给用户。
|
||||
- 验证:`frontend` `npm run build` 通过;构建产物已清理。
|
||||
|
||||
## 2026-06-25:数据管理支持切换主数据库与 CellData 数据库
|
||||
|
||||
- 数据管理页左侧表列表新增数据库选择,可在主数据库与 CellData 数据库之间切换;选项名称跟随系统设置里的主仓库库名和 `CellData.MySQL_DBInfo.dbname`。
|
||||
- 后端数据库接口新增 `database_source` 参数,`main` 保持原有直连 MySQL / Metrix 仓库逻辑,`cell_data` 使用 `CellData.MySQL_DBInfo` 创建独立 MySQL 仓库。表列表、表结构、分页数据、清空、删除、删除全部、执行 SQL 和导出均按该参数选择数据库。
|
||||
- CellData 数据库当前只支持直连 MySQL 配置;Metrix 仓库模式只影响主数据库。
|
||||
- 验证:`python -m compileall -q app` 通过;`frontend` `npm run build` 通过(仅既有大 chunk 提示);构建产物与 Python 缓存已清理。
|
||||
|
||||
@@ -3,7 +3,16 @@
|
||||
<aside class="database-sidebar-pane">
|
||||
<section class="database-table-pane">
|
||||
<div class="database-table-pane-header">
|
||||
<div class="database-source-header">
|
||||
<h2>表</h2>
|
||||
<n-select
|
||||
v-model:value="selectedDatabaseSource"
|
||||
size="small"
|
||||
class="database-source-select"
|
||||
:options="databaseSourceOptions"
|
||||
@update:value="switchDatabaseSource"
|
||||
/>
|
||||
</div>
|
||||
<n-button
|
||||
quaternary
|
||||
circle
|
||||
@@ -221,7 +230,7 @@
|
||||
import { computed, onActivated, onBeforeUnmount, onMounted, ref } from 'vue';
|
||||
import { onBeforeRouteLeave } from 'vue-router';
|
||||
import { useDialog, useMessage } from 'naive-ui';
|
||||
import type { DataTableColumns, DropdownOption } from 'naive-ui';
|
||||
import type { DataTableColumns, DropdownOption, SelectOption } from 'naive-ui';
|
||||
import {
|
||||
ChevronForwardOutline,
|
||||
CloudDownloadOutline,
|
||||
@@ -230,17 +239,23 @@ import {
|
||||
} from '@vicons/ionicons5';
|
||||
|
||||
import { apiGet, apiPost, download } from '../api/client';
|
||||
import type { ApiMessage, DatabaseInfo, TableData, TableInfo } from '../types';
|
||||
import type { ApiMessage, AppConfig, DatabaseInfo, TableData, TableInfo } from '../types';
|
||||
import { showDownloadCompleteDialog } from '../composables/downloadFeedback';
|
||||
import { resetPageHeader, setPageHeader } from '../composables/pageHeader';
|
||||
|
||||
type RowData = Record<string, unknown>;
|
||||
type DownloadFormat = 'csv' | 'xlsx';
|
||||
type DatabaseSource = 'main' | 'cell_data';
|
||||
|
||||
const COLUMN_MIN_WIDTH = 140;
|
||||
const message = useMessage();
|
||||
const dialog = useDialog();
|
||||
const databaseInfo = ref<DatabaseInfo | null>(null);
|
||||
const selectedDatabaseSource = ref<DatabaseSource>('main');
|
||||
const databaseSourceOptions = ref<SelectOption[]>([
|
||||
{ label: '主数据库', value: 'main' },
|
||||
{ label: 'CellData', value: 'cell_data' }
|
||||
]);
|
||||
const tables = ref<string[]>([]);
|
||||
const selectedTable = ref<string | null>(null);
|
||||
const tableInfo = ref<TableInfo | null>(null);
|
||||
@@ -320,6 +335,7 @@ onMounted(() => {
|
||||
}
|
||||
]
|
||||
});
|
||||
void loadDatabaseSourceOptions();
|
||||
void testConnection();
|
||||
void loadTables();
|
||||
});
|
||||
@@ -339,11 +355,13 @@ onBeforeUnmount(() => {
|
||||
async function testConnection() {
|
||||
testing.value = true;
|
||||
try {
|
||||
const result = await apiPost<ApiMessage>('/api/database/test');
|
||||
const result = await apiPost<ApiMessage>('/api/database/test', {
|
||||
database_source: selectedDatabaseSource.value
|
||||
});
|
||||
if (!result.success) {
|
||||
message.error(result.message || '数据库连接测试失败');
|
||||
}
|
||||
databaseInfo.value = await apiGet<DatabaseInfo>('/api/database/info');
|
||||
databaseInfo.value = await apiGet<DatabaseInfo>(`/api/database/info?database_source=${selectedDatabaseSource.value}`);
|
||||
} catch (error) {
|
||||
message.error(error instanceof Error ? error.message : '数据库连接测试失败');
|
||||
} finally {
|
||||
@@ -351,13 +369,34 @@ async function testConnection() {
|
||||
}
|
||||
}
|
||||
|
||||
async function loadDatabaseSourceOptions() {
|
||||
try {
|
||||
const config = await apiGet<AppConfig>('/api/config');
|
||||
const mainName = config.warehouse_type === 'metrix'
|
||||
? (config.metrix.target_database || 'Metrix')
|
||||
: (config.mysql.dbname || '主数据库');
|
||||
const cellName = config.cell_data?.mysql?.dbname || 'CellData';
|
||||
databaseSourceOptions.value = [
|
||||
{ label: `主数据库:${mainName}`, value: 'main' },
|
||||
{ label: `CellData:${cellName}`, value: 'cell_data' }
|
||||
];
|
||||
} catch {
|
||||
databaseSourceOptions.value = [
|
||||
{ label: '主数据库', value: 'main' },
|
||||
{ label: 'CellData', value: 'cell_data' }
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
async function loadTables() {
|
||||
if (loadingTables.value) return;
|
||||
|
||||
const currentToken = ++tableLoadToken;
|
||||
loadingTables.value = true;
|
||||
try {
|
||||
const result = await apiGet<{ tables: string[] }>('/api/database/tables');
|
||||
const result = await apiPost<{ tables: string[] }>('/api/database/tables', {
|
||||
database_source: selectedDatabaseSource.value
|
||||
});
|
||||
if (currentToken !== tableLoadToken) return;
|
||||
tables.value = result.tables;
|
||||
if (selectedTable.value && !tables.value.includes(selectedTable.value)) {
|
||||
@@ -377,6 +416,13 @@ async function loadTables() {
|
||||
}
|
||||
}
|
||||
|
||||
function switchDatabaseSource(value: string) {
|
||||
selectedDatabaseSource.value = value === 'cell_data' ? 'cell_data' : 'main';
|
||||
resetTableState();
|
||||
void testConnection();
|
||||
void loadTables();
|
||||
}
|
||||
|
||||
function resetTableState() {
|
||||
tableLoadToken += 1;
|
||||
tables.value = [];
|
||||
@@ -404,7 +450,10 @@ async function reloadTable() {
|
||||
|
||||
async function loadTableInfo(table: string) {
|
||||
try {
|
||||
tableInfo.value = await apiPost<TableInfo>('/api/database/table/info', { table_name: table });
|
||||
tableInfo.value = await apiPost<TableInfo>('/api/database/table/info', {
|
||||
table_name: table,
|
||||
database_source: selectedDatabaseSource.value
|
||||
});
|
||||
} catch (error) {
|
||||
message.error(error instanceof Error ? error.message : '加载表结构失败');
|
||||
}
|
||||
@@ -416,6 +465,7 @@ async function loadTableData() {
|
||||
try {
|
||||
const result = await apiPost<TableData>('/api/database/table/data', {
|
||||
table_name: selectedTable.value,
|
||||
database_source: selectedDatabaseSource.value,
|
||||
page: page.value,
|
||||
page_size: pageSize.value
|
||||
});
|
||||
@@ -489,7 +539,11 @@ async function downloadSelectedCsv() {
|
||||
try {
|
||||
const result = await download(
|
||||
'/api/download',
|
||||
{ table_name: selectedCsvTable.value, format: 'csv' },
|
||||
{
|
||||
table_name: selectedCsvTable.value,
|
||||
database_source: selectedDatabaseSource.value,
|
||||
format: 'csv'
|
||||
},
|
||||
filename
|
||||
);
|
||||
if (result.saved) {
|
||||
@@ -512,7 +566,11 @@ async function downloadSelectedXlsx() {
|
||||
try {
|
||||
const result = await download(
|
||||
'/api/download',
|
||||
{ table_names: selectedXlsxTables.value, format: 'xlsx' },
|
||||
{
|
||||
table_names: selectedXlsxTables.value,
|
||||
database_source: selectedDatabaseSource.value,
|
||||
format: 'xlsx'
|
||||
},
|
||||
filename
|
||||
);
|
||||
if (result.saved) {
|
||||
@@ -540,7 +598,10 @@ function confirmTruncate() {
|
||||
async function truncateTable() {
|
||||
if (!selectedTable.value) return;
|
||||
try {
|
||||
await apiPost('/api/database/table/truncate', { table_name: selectedTable.value });
|
||||
await apiPost('/api/database/table/truncate', {
|
||||
table_name: selectedTable.value,
|
||||
database_source: selectedDatabaseSource.value
|
||||
});
|
||||
message.success('数据表已清空');
|
||||
await reloadTable();
|
||||
} catch (error) {
|
||||
@@ -562,7 +623,10 @@ function confirmDrop() {
|
||||
async function dropTable() {
|
||||
if (!selectedTable.value) return;
|
||||
try {
|
||||
await apiPost('/api/database/table/drop', { table_name: selectedTable.value });
|
||||
await apiPost('/api/database/table/drop', {
|
||||
table_name: selectedTable.value,
|
||||
database_source: selectedDatabaseSource.value
|
||||
});
|
||||
message.success('数据表已删除');
|
||||
selectedTable.value = null;
|
||||
tableInfo.value = null;
|
||||
@@ -588,7 +652,9 @@ function confirmDropAll() {
|
||||
|
||||
async function dropAllTables() {
|
||||
try {
|
||||
const result = await apiPost<ApiMessage & { dropped_count?: number }>('/api/database/table/drop-all');
|
||||
const result = await apiPost<ApiMessage & { dropped_count?: number }>('/api/database/table/drop-all', {
|
||||
database_source: selectedDatabaseSource.value
|
||||
});
|
||||
message.success(result.message || `已删除 ${result.dropped_count || 0} 张表`);
|
||||
selectedTable.value = null;
|
||||
tableInfo.value = null;
|
||||
@@ -658,6 +724,18 @@ function formatCell(value: unknown): string {
|
||||
line-height: 22px;
|
||||
}
|
||||
|
||||
.database-source-header {
|
||||
display: flex;
|
||||
min-width: 0;
|
||||
flex: 1;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.database-source-select {
|
||||
width: 150px;
|
||||
}
|
||||
|
||||
.database-table-list-wrap {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
|
||||
Reference in New Issue
Block a user