diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/datasource/SchemaReader.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/datasource/SchemaReader.java index e0382d6d..9f17e014 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/datasource/SchemaReader.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/datasource/SchemaReader.java @@ -67,24 +67,26 @@ public List getTables(DatasourcePo datasource) { } } - public List getTableSchema(DatasourcePo datasource, String tableName) { - csvAccess.requireReady(datasource, tableName); - return readTableSchema(datasource, tableName); + public List getTableSchema( + DatasourcePo datasource, PhysicalTableInfo table) { + csvAccess.requireReady(datasource, table.tableName()); + return readTableSchema(datasource, table.tableName(), "VIEW".equals(table.objectType())); } public List getImportTableSchema( DatasourcePo datasource, CsvImportPo task) { csvAccess.requireImportTable(datasource, task); - return readTableSchema(datasource, task.getPhysicalTableName()); + return readTableSchema(datasource, task.getPhysicalTableName(), false); } - private List readTableSchema(DatasourcePo datasource, String tableName) { + private List readTableSchema( + DatasourcePo datasource, String tableName, boolean view) { javax.sql.DataSource ds = dynamicDataSourceManager.getOrCreateDataSource(datasource); try (Connection conn = ds.getConnection()) { - List primaryKeys = getPrimaryKeys(conn, tableName); + List primaryKeys = view ? List.of() : getPrimaryKeys(conn, tableName); Map> indexesByColumn = - getIndexesByColumn(conn, tableName, primaryKeys); + view ? Map.of() : getIndexesByColumn(conn, tableName, primaryKeys); return getColumns(conn, tableName, primaryKeys, indexesByColumn); } catch (SQLException e) { log.error("Failed to read schema for table {}: {}", tableName, e.getMessage(), e); @@ -140,10 +142,13 @@ private List getTables(Connection conn) throws SQLException { conn.getCatalog(), schemaPattern(conn).orElse(null), "%", - new String[] {"TABLE"})) { + new String[] {"TABLE", "VIEW"})) { while (rs.next()) { tables.add( - new PhysicalTableInfo(rs.getString("TABLE_NAME"), rs.getString("REMARKS"))); + new PhysicalTableInfo( + rs.getString("TABLE_NAME"), + rs.getString("REMARKS"), + rs.getString("TABLE_TYPE"))); } } diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/provenance/AnswerProvenanceBuilder.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/provenance/AnswerProvenanceBuilder.java index d00778e3..2ea452b7 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/provenance/AnswerProvenanceBuilder.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/provenance/AnswerProvenanceBuilder.java @@ -232,6 +232,9 @@ private static List mergeTables(List tables) { (old, next) -> new TableUse( old.name(), + next.objectType() == null + ? old.objectType() + : next.objectType(), old.domain(), old.description(), mergeDistinct(old.columns(), next.columns()))); diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/provenance/SqlLineageExtractor.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/provenance/SqlLineageExtractor.java index 0e7e3d88..a7c4fb68 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/provenance/SqlLineageExtractor.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/provenance/SqlLineageExtractor.java @@ -85,6 +85,7 @@ public Lineage extract(String sql, List tableInfo, List c tables.add( new TableUse( name, + info == null ? null : info.getObjectType(), info == null ? null : info.getDomain(), info == null ? null : info.getTableDescription(), columns)); diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetTablesTool.java b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetTablesTool.java index 1d18e4cb..072825e3 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetTablesTool.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/agent/tools/impls/GetTablesTool.java @@ -57,7 +57,7 @@ public class GetTablesTool implements DataAgentTool { converter = ToolResultBoConverter.class, description = """ - Get synced semantic-layer table information, including table name, domain, \ + Get synced semantic-layer tables and ordinary views, including name, object type, domain, \ description, data granularity (what one row represents) and enabled relations.\ """) public ToolResultBo getTables( @@ -114,12 +114,6 @@ private TablePromptResponse filterTable( rel.targetTableName(), rel.targetColumnNames())) .toList(); - return TablePromptResponse.builder() - .name(table.name()) - .domain(table.domain()) - .description(table.description()) - .dataGranularity(table.dataGranularity()) - .relations(relations) - .build(); + return table.toBuilder().relations(relations).build(); } } diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/controller/DatasourceController.java b/data-agent-backend/src/main/java/io/github/malonetalk/controller/DatasourceController.java index cd59ae5c..2c5bbb30 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/controller/DatasourceController.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/controller/DatasourceController.java @@ -29,6 +29,7 @@ import io.github.malonetalk.model.holder.UserContextHolder; import io.github.malonetalk.model.vo.BooleanVo; import io.github.malonetalk.model.vo.DatasourceColumnsVo; +import io.github.malonetalk.model.vo.DatasourceObjectVo; import io.github.malonetalk.model.vo.DatasourceOptionVo; import io.github.malonetalk.model.vo.DatasourceVo; import io.github.malonetalk.model.vo.ListVo; @@ -84,7 +85,7 @@ public DatasourceVo findById(@PathVariable Integer id) { return datasourceConverter.toVo(dataSourceService.requireById(id)); } - /** 返回某数据源下的所有物理表名,供权限配置页使用。 */ + /** 保留表和视图名称列表的兼容格式。 */ @GetMapping("/{id}/tables") @RequirePermission(PermissionEnum.SYS_ROLE_GRANT) public ListVo listTableNames(@PathVariable Integer id) { @@ -96,6 +97,19 @@ public ListVo listTableNames(@PathVariable Integer id) { return new ListVo<>(tables); } + @GetMapping("/{id}/objects") + @RequirePermission(PermissionEnum.SYS_ROLE_GRANT) + public ListVo listObjects(@PathVariable Integer id) { + dataSourceService.requireById(id); + return new ListVo<>( + tableInfoMapper.selectByDatasourceId(id).stream() + .map( + table -> + new DatasourceObjectVo( + table.getTableName(), table.getObjectType())) + .toList()); + } + /** 返回某数据源下所有表的列名,一次查询,供列级权限配置使用。 */ @GetMapping("/{id}/columns") @RequirePermission(PermissionEnum.SYS_ROLE_GRANT) diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/convertor/PromptConverter.java b/data-agent-backend/src/main/java/io/github/malonetalk/convertor/PromptConverter.java index 5399eb2d..1f9ae161 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/convertor/PromptConverter.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/convertor/PromptConverter.java @@ -52,6 +52,7 @@ public static TablePromptResponse mapTablePrompt( } return TablePromptResponse.builder() .name(table.getTableName()) + .objectType(table.getObjectType()) .domain(SemanticUtils.normalizeDomain(table.getDomain())) .description(SemanticUtils.trimToNull(table.getTableDescription())) .dataGranularity(SemanticUtils.trimToNull(table.getDataGranularity())) diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/convertor/SemanticConverter.java b/data-agent-backend/src/main/java/io/github/malonetalk/convertor/SemanticConverter.java index 299cc6d8..dabb5e04 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/convertor/SemanticConverter.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/convertor/SemanticConverter.java @@ -46,6 +46,7 @@ public TableSemanticResponse toResponse(TableInfo tableInfo) { return TableSemanticResponse.builder() .id(tableInfo.getId()) .tableName(tableInfo.getTableName()) + .objectType(tableInfo.getObjectType()) .domain(SemanticUtils.normalizeDomain(tableInfo.getDomain())) .physicalTableDescription( SemanticUtils.trimToNull(tableInfo.getPhysicalTableDescription())) @@ -105,6 +106,7 @@ public RelationWorkspaceTableResponse toWorkspaceTable( TableInfo tableInfo, List columns) { return RelationWorkspaceTableResponse.builder() .tableName(tableInfo.getTableName()) + .objectType(tableInfo.getObjectType()) .domain(SemanticUtils.normalizeDomain(tableInfo.getDomain())) .description( SemanticUtils.firstNonBlank( diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/dto/datasource/PhysicalTableInfo.java b/data-agent-backend/src/main/java/io/github/malonetalk/dto/datasource/PhysicalTableInfo.java index 2ae48233..0eacbd1b 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/dto/datasource/PhysicalTableInfo.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/dto/datasource/PhysicalTableInfo.java @@ -17,5 +17,5 @@ */ package io.github.malonetalk.dto.datasource; -/** 物理数据源表信息,由 SchemaReader 从 JDBC 元数据读取 */ -public record PhysicalTableInfo(String tableName, String remarks) {} +/** 数据库表或普通视图信息,由 SchemaReader 从 JDBC 元数据读取。 */ +public record PhysicalTableInfo(String tableName, String remarks, String objectType) {} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/dto/prompt/TablePromptResponse.java b/data-agent-backend/src/main/java/io/github/malonetalk/dto/prompt/TablePromptResponse.java index 48e5a942..31e995bb 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/dto/prompt/TablePromptResponse.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/dto/prompt/TablePromptResponse.java @@ -21,9 +21,10 @@ import lombok.Builder; /** Agent-facing DTO for LLM prompt formatting. */ -@Builder +@Builder(toBuilder = true) public record TablePromptResponse( String name, + String objectType, String domain, String description, String dataGranularity, diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/dto/semantic/PhysicalTableCandidateResponse.java b/data-agent-backend/src/main/java/io/github/malonetalk/dto/semantic/PhysicalTableCandidateResponse.java index 9c1acb0c..32be44e3 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/dto/semantic/PhysicalTableCandidateResponse.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/dto/semantic/PhysicalTableCandidateResponse.java @@ -18,4 +18,4 @@ package io.github.malonetalk.dto.semantic; public record PhysicalTableCandidateResponse( - String tableName, String physicalTableDescription, Boolean synced) {} + String tableName, String physicalTableDescription, String objectType, Boolean synced) {} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/dto/semantic/RelationWorkspaceTableResponse.java b/data-agent-backend/src/main/java/io/github/malonetalk/dto/semantic/RelationWorkspaceTableResponse.java index 8d8bc49a..c5e105c1 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/dto/semantic/RelationWorkspaceTableResponse.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/dto/semantic/RelationWorkspaceTableResponse.java @@ -23,6 +23,7 @@ @Builder public record RelationWorkspaceTableResponse( String tableName, + String objectType, String domain, String description, boolean operable, diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/dto/semantic/TableSemanticResponse.java b/data-agent-backend/src/main/java/io/github/malonetalk/dto/semantic/TableSemanticResponse.java index 914c67c9..e3690c3f 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/dto/semantic/TableSemanticResponse.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/dto/semantic/TableSemanticResponse.java @@ -24,6 +24,7 @@ public record TableSemanticResponse( Integer id, String tableName, + String objectType, String domain, String physicalTableDescription, String tableDescription, diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/entity/TableInfo.java b/data-agent-backend/src/main/java/io/github/malonetalk/entity/TableInfo.java index 0e87ade9..aed8d5e2 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/entity/TableInfo.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/entity/TableInfo.java @@ -25,6 +25,7 @@ public class TableInfo { private Integer id; private String tableName; + private String objectType = "TABLE"; private String physicalTableDescription; private String tableDescription; private String dataGranularity; diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/model/bo/TableSyncSourceBo.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/bo/TableSyncSourceBo.java index 1bc035a0..c5cbb2a8 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/model/bo/TableSyncSourceBo.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/bo/TableSyncSourceBo.java @@ -19,6 +19,9 @@ import java.util.List; -/** Physical table snapshot shared by schema conversion, CSV publication and semantic sync. */ +/** Table or ordinary view snapshot shared by schema conversion, CSV publication and semantic sync. */ public record TableSyncSourceBo( - String tableName, String description, List columns) {} + String tableName, + String description, + String objectType, + List columns) {} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/model/converter/SemanticSyncConverter.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/converter/SemanticSyncConverter.java index acce85b7..5ee9858c 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/model/converter/SemanticSyncConverter.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/converter/SemanticSyncConverter.java @@ -38,6 +38,7 @@ public abstract class SemanticSyncConverter { @BeanMapping(ignoreByDefault = true) @Mapping(target = "datasourceId", source = "datasourceId") @Mapping(target = "tableName", source = "table.tableName") + @Mapping(target = "objectType", source = "table.objectType") @Mapping(target = "physicalTableDescription", source = "table.description") @Mapping(target = "tableDescription", source = "table.description") public abstract TableInfo toTableInfo(Integer datasourceId, TableSyncSourceBo table); @@ -55,10 +56,11 @@ public abstract ColumnInfo toColumnInfo( Integer datasourceId, Integer tableId, ColumnSyncSourceBo column); public TableSyncSourceBo toTable( - String name, String description, List columns) { + String name, String description, String objectType, List columns) { return new TableSyncSourceBo( name, SemanticUtils.trimToNull(description), + objectType, columns.stream().map(this::toColumn).toList()); } @@ -71,6 +73,7 @@ public TableSyncSourceBo toCsvTable(CsvImportPo task, List c return toTable( task.getPhysicalTableName(), description.substring(0, Math.min(500, description.length())), + "TABLE", columns); } diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/AnswerProvenanceVo.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/AnswerProvenanceVo.java index 35ff6e9d..f4bfdf70 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/AnswerProvenanceVo.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/AnswerProvenanceVo.java @@ -48,7 +48,11 @@ public record MetricUse(String key, String name, String measureExpr, String filt public record PythonUse(String callId, String code, String status) {} public record TableUse( - String name, String domain, String description, List columns) {} + String name, + String objectType, + String domain, + String description, + List columns) {} public record ColumnUse(String name, String description) {} } diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/DatasourceObjectVo.java b/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/DatasourceObjectVo.java new file mode 100644 index 00000000..2149776e --- /dev/null +++ b/data-agent-backend/src/main/java/io/github/malonetalk/model/vo/DatasourceObjectVo.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2026 github.com/MaloneTalk + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * limitations under the License. + */ +package io.github.malonetalk.model.vo; + +/** Synced database object available for role authorization. */ +public record DatasourceObjectVo(String tableName, String objectType) implements BaseVo {} diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/service/semantic/enums/TableInvalidReasonEnum.java b/data-agent-backend/src/main/java/io/github/malonetalk/service/semantic/enums/TableInvalidReasonEnum.java index 890858bf..eb37069c 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/service/semantic/enums/TableInvalidReasonEnum.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/service/semantic/enums/TableInvalidReasonEnum.java @@ -23,8 +23,8 @@ @Getter @AllArgsConstructor public enum TableInvalidReasonEnum { - PHYSICAL_TABLE_NOT_FOUND("物理表不存在"), - TABLE_HIDDEN("表已隐藏"); + PHYSICAL_TABLE_NOT_FOUND("数据库对象不存在或当前连接账号不可见"), + TABLE_HIDDEN("表或视图已隐藏"); private final String reason; } diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/service/semantic/sync/SemanticSyncDiffService.java b/data-agent-backend/src/main/java/io/github/malonetalk/service/semantic/sync/SemanticSyncDiffService.java index eb7e084e..98a29d97 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/service/semantic/sync/SemanticSyncDiffService.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/service/semantic/sync/SemanticSyncDiffService.java @@ -154,6 +154,17 @@ private SyncTableResult buildPresentTableResult( } int missingColumnsMarked = collectMissingColumnIds(existingColumns, physicalColumnNames, missingColumnIds); + boolean tableUpdated = + existingTable + .map( + existing -> + !Objects.equals( + existing.getObjectType(), + table.objectType()) + || !Objects.equals( + existing.getPhysicalTableDescription(), + table.description())) + .orElse(false); return SyncTableResult.builder() .tableName(table.tableName()) .physicalTableFound(true) @@ -163,14 +174,7 @@ private SyncTableResult buildPresentTableResult( .map(TableInfo::getPhysicalStatus) .filter(Boolean.FALSE::equals) .isPresent()) - .tableUpdated( - existingTable - .filter( - existing -> - !Objects.equals( - existing.getPhysicalTableDescription(), - table.description())) - .isPresent()) + .tableUpdated(tableUpdated) .addedColumns(addedColumns) .reactivatedColumns(reactivatedColumns) .updatedColumns(updatedColumns) @@ -196,7 +200,7 @@ private SyncTableResult buildMissingTableResult( !Boolean.FALSE.equals(existing.getPhysicalStatus())) .isPresent()) .missingColumnsMarked(missingColumnsMarked) - .message("物理表不存在") + .message("数据库对象不存在或当前连接账号不可见") .build(); } diff --git a/data-agent-backend/src/main/java/io/github/malonetalk/service/semantic/sync/SemanticSyncServiceImpl.java b/data-agent-backend/src/main/java/io/github/malonetalk/service/semantic/sync/SemanticSyncServiceImpl.java index d4d110dc..69a95ef0 100644 --- a/data-agent-backend/src/main/java/io/github/malonetalk/service/semantic/sync/SemanticSyncServiceImpl.java +++ b/data-agent-backend/src/main/java/io/github/malonetalk/service/semantic/sync/SemanticSyncServiceImpl.java @@ -86,7 +86,7 @@ public PageResponse getPhysicalTableCandidates( table.getTableName(), "Missing semantic tableName.")) .collect(Collectors.toSet()); - // SchemaReader 一次性读取物理表,筛选、排序和分页统一在内存中完成。 + // SchemaReader 一次性读取表和普通视图,筛选、排序和分页统一在内存中完成。 List filteredTables = loadCandidateTables(datasource, semanticTables).stream() .filter( @@ -108,6 +108,7 @@ public PageResponse getPhysicalTableCandidates( new PhysicalTableCandidateResponse( table.tableName(), SemanticUtils.trimToNull(table.remarks()), + table.objectType(), syncedTableNames.contains( SemanticUtils.normalizeObjectName( table.tableName(), @@ -120,7 +121,7 @@ private List loadCandidateTables( DatasourcePo datasource, List semanticTables) { Map candidates = loadPhysicalTableIndex(datasource); var ready = csvAccess.readyFilter(datasource); - // 保留语义缓存中的表,供用户发现已从物理数据源消失的表。 + // 保留语义缓存中的对象,供用户发现已从数据源消失的表或视图。 for (TableInfo table : semanticTables) { if (!ready.test(table.getTableName())) continue; String tableName = @@ -130,7 +131,8 @@ private List loadCandidateTables( SemanticUtils.normalizeObjectName(tableName, "Missing semantic tableName."), new PhysicalTableInfo( tableName, - SemanticUtils.trimToNull(table.getPhysicalTableDescription()))); + SemanticUtils.trimToNull(table.getPhysicalTableDescription()), + table.getObjectType())); } return List.copyOf(candidates.values()); } @@ -210,7 +212,8 @@ private TableSyncSourceBo readTableSyncSource( return converter.toTable( physicalTable.tableName(), physicalTable.remarks(), - schemaReader.getTableSchema(datasource, physicalTable.tableName())); + physicalTable.objectType(), + schemaReader.getTableSchema(datasource, physicalTable)); } private Map> loadPhysicalColumnNamesByTable( diff --git a/data-agent-backend/src/main/resources/application.properties b/data-agent-backend/src/main/resources/application.properties index 52df9ff7..88f824b1 100644 --- a/data-agent-backend/src/main/resources/application.properties +++ b/data-agent-backend/src/main/resources/application.properties @@ -28,6 +28,7 @@ io.github.malonetalk.model.name=deepseek-v4-flash io.github.malonetalk.model.base-url=https://api.deepseek.com io.github.malonetalk.model.api-key=${IO_GITHUB_MALONETALK_MODEL_API_KEY:} io.github.malonetalk.model.thinking-enabled=${IO_GITHUB_MALONETALK_MODEL_THINKING_ENABLED:true} +dev spring.config.import=classpath:skill.properties diff --git a/data-agent-backend/src/main/resources/mapper/TableInfoMapper.xml b/data-agent-backend/src/main/resources/mapper/TableInfoMapper.xml index df98eff7..c8852ac5 100644 --- a/data-agent-backend/src/main/resources/mapper/TableInfoMapper.xml +++ b/data-agent-backend/src/main/resources/mapper/TableInfoMapper.xml @@ -5,6 +5,7 @@ + @@ -68,12 +69,12 @@ INSERT INTO table_info ( - table_name, physical_table_description, table_description, data_granularity, domain, + table_name, object_type, physical_table_description, table_description, data_granularity, domain, datasource_id, is_visible, physical_status, create_time, update_time ) VALUES ( - #{tableName}, #{physicalTableDescription}, #{tableDescription}, #{dataGranularity}, + #{tableName}, #{objectType}, #{physicalTableDescription}, #{tableDescription}, #{dataGranularity}, #{domain}, #{datasourceId}, COALESCE(#{isVisible}, 1), COALESCE(#{physicalStatus}, 1), COALESCE(#{createTime}, NOW()), COALESCE(#{updateTime}, NOW()) @@ -82,18 +83,19 @@ INSERT INTO table_info ( - table_name, physical_table_description, table_description, domain, datasource_id, + table_name, object_type, physical_table_description, table_description, domain, datasource_id, is_visible, physical_status, create_time, update_time ) VALUES ( - #{table.tableName}, #{table.physicalTableDescription}, #{table.tableDescription}, + #{table.tableName}, #{table.objectType}, #{table.physicalTableDescription}, #{table.tableDescription}, #{table.domain}, #{table.datasourceId}, COALESCE(#{table.isVisible}, 1), COALESCE(#{table.physicalStatus}, 1), COALESCE(#{table.createTime}, NOW()), COALESCE(#{table.updateTime}, NOW()) ) ON DUPLICATE KEY UPDATE + object_type = VALUES(object_type), physical_table_description = VALUES(physical_table_description), table_description = COALESCE(NULLIF(table_description, ''), VALUES(table_description)), physical_status = VALUES(physical_status), @@ -116,6 +118,7 @@ UPDATE table_info table_name = #{tableName}, + object_type = #{objectType}, physical_table_description = #{physicalTableDescription}, physical_status = #{physicalStatus}, update_time = #{updateTime}, diff --git a/data-agent-backend/src/test/java/io/github/malonetalk/service/semantic/sync/SemanticSyncApplyServiceTest.java b/data-agent-backend/src/test/java/io/github/malonetalk/service/semantic/sync/SemanticSyncApplyServiceTest.java index 4903a962..5ecbf947 100644 --- a/data-agent-backend/src/test/java/io/github/malonetalk/service/semantic/sync/SemanticSyncApplyServiceTest.java +++ b/data-agent-backend/src/test/java/io/github/malonetalk/service/semantic/sync/SemanticSyncApplyServiceTest.java @@ -64,6 +64,7 @@ void associatesNewColumnWithPersistedTableId() { new TableSyncSourceBo( "orders", "orders table", + "TABLE", List.of( new ColumnSyncSourceBo( "id", "order id", "BIGINT", true, "PRIMARY")))), diff --git a/data-agent-frontend/src/api/agent.ts b/data-agent-frontend/src/api/agent.ts index 4c086667..eed8a766 100644 --- a/data-agent-frontend/src/api/agent.ts +++ b/data-agent-frontend/src/api/agent.ts @@ -75,6 +75,7 @@ export interface AnswerProvenance { }[]; tables: { name: string; + objectType?: 'TABLE' | 'VIEW' | null; domain: string | null; description: string | null; columns: { name: string; description: string | null }[]; diff --git a/data-agent-frontend/src/api/datasource.ts b/data-agent-frontend/src/api/datasource.ts index 34480468..d91594dc 100644 --- a/data-agent-frontend/src/api/datasource.ts +++ b/data-agent-frontend/src/api/datasource.ts @@ -57,6 +57,17 @@ export function getDatasourceTables(id: number) { return request.get>(`/datasource/${id}/tables`).then(res => res.data.data); } +export interface DatasourceObject { + tableName: string; + objectType: 'TABLE' | 'VIEW'; +} + +export function getDatasourceObjects(id: number) { + return request + .get>(`/datasource/${id}/objects`) + .then(res => res.data.data); +} + export function createDatasource(data: DatasourceRequest) { return request.post>('/datasource', data).then(res => res.data.data.value); } diff --git a/data-agent-frontend/src/api/semantic.ts b/data-agent-frontend/src/api/semantic.ts index 80c227e2..301fa891 100644 --- a/data-agent-frontend/src/api/semantic.ts +++ b/data-agent-frontend/src/api/semantic.ts @@ -20,12 +20,14 @@ import type { PageResponse } from './types'; export interface PhysicalTableCandidateResponse { tableName: string; + objectType: 'TABLE' | 'VIEW'; synced: boolean; } export interface TableSemanticResponse { id: number | null; tableName: string; + objectType: 'TABLE' | 'VIEW'; domain: string | null; tableDescription: string | null; dataGranularity: string | null; @@ -117,6 +119,7 @@ export interface RelationWorkspaceColumnResponse { export interface RelationWorkspaceTableResponse { tableName: string; + objectType: 'TABLE' | 'VIEW'; domain: string | null; description: string | null; operable: boolean; diff --git a/data-agent-frontend/src/views/chat/components/ProvenancePanel.vue b/data-agent-frontend/src/views/chat/components/ProvenancePanel.vue index 92c62be9..7e5db1c7 100644 --- a/data-agent-frontend/src/views/chat/components/ProvenancePanel.vue +++ b/data-agent-frontend/src/views/chat/components/ProvenancePanel.vue @@ -41,10 +41,13 @@
-

2. 领域、表、字段

-

无已确认的来源表

+

2. 领域、表或视图、字段

+

无已确认的来源对象

{{ table.domain || '未分配领域' }} / {{ table.name }} + + {{ table.objectType === 'VIEW' ? '普通视图' : '表' }} + · {{ table.description }}
字段:{{ diff --git a/data-agent-frontend/src/views/semantic/components/RelationWorkspace.vue b/data-agent-frontend/src/views/semantic/components/RelationWorkspace.vue index 35b2ba49..4978d903 100644 --- a/data-agent-frontend/src/views/semantic/components/RelationWorkspace.vue +++ b/data-agent-frontend/src/views/semantic/components/RelationWorkspace.vue @@ -251,7 +251,10 @@

{{ node.tableName }}

-

{{ node.domain || '未设置业务域' }}

+

+ {{ node.objectType === 'VIEW' ? '普通视图' : '表' }} · + {{ node.domain || '未设置业务域' }} +

{{ node.invalidReason || '不可操作' }} diff --git a/data-agent-frontend/src/views/semantic/components/SyncPhysicalTableDialog.vue b/data-agent-frontend/src/views/semantic/components/SyncPhysicalTableDialog.vue index 106a3d02..02b9ef2c 100644 --- a/data-agent-frontend/src/views/semantic/components/SyncPhysicalTableDialog.vue +++ b/data-agent-frontend/src/views/semantic/components/SyncPhysicalTableDialog.vue @@ -118,7 +118,7 @@ const handleConfirm = async () => { if (selectedTableNameSet.value.size === 0) { - ElMessage.warning('请至少选择一张物理表'); + ElMessage.warning('请至少选择一个表或视图'); return; } if (props.datasourceId === null) { @@ -151,12 +151,12 @@