批量保存

sdk/configure/client.go

@@ -154,137 +154,75 @@ func (c *Client) DeleteTable(ctx context.Context, tableID string) error {
 	return nil
 }
 
-// ListTableAliases 查询表别名字典列表
-func (c *Client) ListTableAliases(ctx context.Context, query *TableAliasQueryRequest) (*TableAliasList, error) {
-	endpoint := "/api/dic-table-alias/list"
+// BatchSaveTables 批量保存数据库表字典
+func (c *Client) BatchSaveTables(ctx context.Context, req *BatchSaveDicTablesRequest) error {
+	endpoint := "/api/dic-table/batch-save"
 
-	var result ResponseWrapper[[]DicTableAliasDB]
-	if err := c.doRequest(ctx, http.MethodPost, endpoint, query, &result); err != nil {
-		return nil, err
+	var result ResponseWrapper[bool]
+	if err := c.doRequest(ctx, http.MethodPost, endpoint, req, &result); err != nil {
+		return err
 	}
 
 	if !result.Success {
-		return nil, NewClientError("list_table_aliases", fmt.Sprintf("API error: %s", result.Error), nil)
+		return NewClientError("batch_save_tables", fmt.Sprintf("API error: %s", result.Error), nil)
 	}
 
-	return &TableAliasList{
-		TotalCount: result.TotalCount,
-		LastPage:   result.LastPage,
-		Data:       result.Data,
-	}, nil
+	return nil
 }
 
-// GetTableAlias 查询表别名字典详情
-func (c *Client) GetTableAlias(ctx context.Context, id string) (*TableAliasDetail, error) {
-	endpoint := fmt.Sprintf("/api/dic-table-alias/detail/%s", id)
+// BatchSyncTables 批量同步表字典
+func (c *Client) BatchSyncTables(ctx context.Context, req *BatchTableSyncRequest) (*BatchTableSyncResponse, error) {
+	endpoint := "/api/dic-table/batch-sync"
 
-	var result ResponseWrapper[TableAliasDetail]
-	if err := c.doRequest(ctx, http.MethodPost, endpoint, nil, &result); err != nil {
+	var result ResponseWrapper[BatchTableSyncResponse]
+	if err := c.doRequest(ctx, http.MethodPost, endpoint, req, &result); err != nil {
 		return nil, err
 	}
 
 	if !result.Success {
-		if result.Error == "not found" || strings.Contains(result.Error, "不存在") {
-			return nil, ErrNotFound
-		}
-		return nil, NewClientError("get_table_alias", fmt.Sprintf("API error: %s", result.Error), nil)
+		return nil, NewClientError("batch_sync_tables", fmt.Sprintf("API error: %s", result.Error), nil)
 	}
 
 	return &result.Data, nil
 }
 
-// SaveTableAlias 创建或更新表别名字典
-func (c *Client) SaveTableAlias(ctx context.Context, req *TableAliasRequest) (*TableAliasDetail, error) {
-	endpoint := "/api/dic-table-alias/save"
+// BatchSyncAliases 批量同步别名
+func (c *Client) BatchSyncAliases(ctx context.Context, req *BatchAliasSyncRequest) (*BatchAliasSyncResponse, error) {
+	endpoint := "/api/alias/batch-sync"
 
-	var result ResponseWrapper[TableAliasDetail]
+	var result ResponseWrapper[BatchAliasSyncResponse]
 	if err := c.doRequest(ctx, http.MethodPost, endpoint, req, &result); err != nil {
 		return nil, err
 	}
 
 	if !result.Success {
-		return nil, NewClientError("save_table_alias", fmt.Sprintf("API error: %s", result.Error), nil)
+		return nil, NewClientError("batch_sync_aliases", fmt.Sprintf("API error: %s", result.Error), nil)
 	}
 
 	return &result.Data, nil
 }
 
-// BatchSaveTableAliases 批量保存表别名字典
-func (c *Client) BatchSaveTableAliases(ctx context.Context, req *BatchTableAliasRequest) ([]TableAliasDetail, error) {
-	endpoint := "/api/dic-table-alias/batch-save"
+// SaveTableAlias 保存表别名字典
+func (c *Client) SaveTableAlias(ctx context.Context, req *TableAliasRequest) (*TableAliasResponse, error) {
+	endpoint := "/api/dic-table-alias/save"
 
-	var result ResponseWrapper[[]TableAliasDetail]
+	var result ResponseWrapper[TableAliasResponse]
 	if err := c.doRequest(ctx, http.MethodPost, endpoint, req, &result); err != nil {
 		return nil, err
 	}
 
 	if !result.Success {
-		return nil, NewClientError("batch_save_table_aliases", fmt.Sprintf("API error: %s", result.Error), nil)
-	}
-
-	return result.Data, nil
-}
-
-// DeleteTableAlias 删除表别名字典
-func (c *Client) DeleteTableAlias(ctx context.Context, id string) error {
-	endpoint := fmt.Sprintf("/api/dic-table-alias/delete/%s", id)
-
-	var result ResponseWrapper[int64]
-	if err := c.doRequest(ctx, http.MethodPost, endpoint, nil, &result); err != nil {
-		return err
-	}
-
-	if !result.Success {
-		return NewClientError("delete_table_alias", fmt.Sprintf("API error: %s", result.Error), nil)
-	}
-
-	return nil
-}
-
-// ListTableFieldAliases 查询字段别名字典列表
-func (c *Client) ListTableFieldAliases(ctx context.Context, query *TableFieldAliasQueryRequest) (*TableFieldAliasList, error) {
-	endpoint := "/api/dic-table-field-alias/list"
-
-	var result ResponseWrapper[[]DicTableFieldAliasDB]
-	if err := c.doRequest(ctx, http.MethodPost, endpoint, query, &result); err != nil {
-		return nil, err
-	}
-
-	if !result.Success {
-		return nil, NewClientError("list_table_field_aliases", fmt.Sprintf("API error: %s", result.Error), nil)
-	}
-
-	return &TableFieldAliasList{
-		TotalCount: result.TotalCount,
-		LastPage:   result.LastPage,
-		Data:       result.Data,
-	}, nil
-}
-
-// GetTableFieldAlias 查询字段别名字典详情
-func (c *Client) GetTableFieldAlias(ctx context.Context, id string) (*TableFieldAliasDetail, error) {
-	endpoint := fmt.Sprintf("/api/dic-table-field-alias/detail/%s", id)
-
-	var result ResponseWrapper[TableFieldAliasDetail]
-	if err := c.doRequest(ctx, http.MethodPost, endpoint, nil, &result); err != nil {
-		return nil, err
-	}
-
-	if !result.Success {
-		if result.Error == "not found" || strings.Contains(result.Error, "不存在") {
-			return nil, ErrNotFound
-		}
-		return nil, NewClientError("get_table_field_alias", fmt.Sprintf("API error: %s", result.Error), nil)
+		return nil, NewClientError("save_table_alias", fmt.Sprintf("API error: %s", result.Error), nil)
 	}
 
 	return &result.Data, nil
 }
 
-// SaveTableFieldAlias 创建或更新字段别名字典
-func (c *Client) SaveTableFieldAlias(ctx context.Context, req *TableFieldAliasRequest) (*TableFieldAliasDetail, error) {
+// SaveTableFieldAlias 保存表字段别名字典
+func (c *Client) SaveTableFieldAlias(ctx context.Context, req *TableFieldAliasRequest) (*TableFieldAliasResponse, error) {
 	endpoint := "/api/dic-table-field-alias/save"
 
-	var result ResponseWrapper[TableFieldAliasDetail]
+	var result ResponseWrapper[TableFieldAliasResponse]
 	if err := c.doRequest(ctx, http.MethodPost, endpoint, req, &result); err != nil {
 		return nil, err
 	}
@@ -296,142 +234,46 @@ func (c *Client) SaveTableFieldAlias(ctx context.Context, req *TableFieldAliasRe
 	return &result.Data, nil
 }
 
-// BatchSaveTableFieldAliases 批量保存字段别名字典
-func (c *Client) BatchSaveTableFieldAliases(ctx context.Context, req *BatchTableFieldAliasRequest) ([]TableFieldAliasDetail, error) {
-	endpoint := "/api/dic-table-field-alias/batch-save"
-
-	var result ResponseWrapper[[]TableFieldAliasDetail]
-	if err := c.doRequest(ctx, http.MethodPost, endpoint, req, &result); err != nil {
-		return nil, err
-	}
-
-	if !result.Success {
-		return nil, NewClientError("batch_save_table_field_aliases", fmt.Sprintf("API error: %s", result.Error), nil)
-	}
-
-	return result.Data, nil
-}
-
-// DeleteTableFieldAlias 删除字段别名字典
-func (c *Client) DeleteTableFieldAlias(ctx context.Context, id string) error {
-	endpoint := fmt.Sprintf("/api/dic-table-field-alias/delete/%s", id)
-
-	var result ResponseWrapper[int64]
-	if err := c.doRequest(ctx, http.MethodPost, endpoint, nil, &result); err != nil {
-		return err
-	}
-
-	if !result.Success {
-		return NewClientError("delete_table_field_alias", fmt.Sprintf("API error: %s", result.Error), nil)
-	}
-
-	return nil
-}
-
-// ListTableAliasFlow 查询表别名字典流水列表
-func (c *Client) ListTableAliasFlow(ctx context.Context, query *TableAliasFlowQueryRequest) (*TableAliasFlowList, error) {
-	endpoint := "/api/dic-table-alias-flow/list"
+// ListTableAliases 查询表别名字典列表
+func (c *Client) ListTableAliases(ctx context.Context, query *TableAliasQueryRequest) (*TableAliasList, error) {
+	endpoint := "/api/dic-table-alias/list"
 
-	var result ResponseWrapper[[]DicTableAliasFlowDB]
+	var result ResponseWrapper[[]TableAliasResponse]
 	if err := c.doRequest(ctx, http.MethodPost, endpoint, query, &result); err != nil {
 		return nil, err
 	}
 
 	if !result.Success {
-		return nil, NewClientError("list_table_alias_flow", fmt.Sprintf("API error: %s", result.Error), nil)
+		return nil, NewClientError("list_table_aliases", fmt.Sprintf("API error: %s", result.Error), nil)
 	}
 
-	return &TableAliasFlowList{
+	return &TableAliasList{
 		TotalCount: result.TotalCount,
 		LastPage:   result.LastPage,
 		Data:       result.Data,
 	}, nil
 }
 
-// BatchSaveTableAliasFlow 批量保存表别名字典流水
-func (c *Client) BatchSaveTableAliasFlow(ctx context.Context, req *BatchTableAliasRequest) ([]DicTableAliasFlowDB, error) {
-	endpoint := "/api/dic-table-alias-flow/batch-save"
-
-	var result ResponseWrapper[[]DicTableAliasFlowDB]
-	if err := c.doRequest(ctx, http.MethodPost, endpoint, req, &result); err != nil {
-		return nil, err
-	}
-
-	if !result.Success {
-		return nil, NewClientError("batch_save_table_alias_flow", fmt.Sprintf("API error: %s", result.Error), nil)
-	}
-
-	return result.Data, nil
-}
-
-// BatchApprovalTableAliasFlow 批量审批表别名字典流水
-func (c *Client) BatchApprovalTableAliasFlow(ctx context.Context, req *BatchApprovalFlowRequest) error {
-	endpoint := "/api/dic-table-alias-flow/batch-approval"
-
-	var result ResponseWrapper[int64]
-	if err := c.doRequest(ctx, http.MethodPost, endpoint, req, &result); err != nil {
-		return err
-	}
-
-	if !result.Success {
-		return NewClientError("batch_approval_table_alias_flow", fmt.Sprintf("API error: %s", result.Error), nil)
-	}
-
-	return nil
-}
-
-// ListTableFieldAliasFlow 查询字段别名字典流水列表
-func (c *Client) ListTableFieldAliasFlow(ctx context.Context, query *TableFieldAliasFlowQueryRequest) (*TableFieldAliasFlowList, error) {
-	endpoint := "/api/dic-table-field-alias-flow/list"
+// ListTableFieldAliases 查询表字段别名字典列表
+func (c *Client) ListTableFieldAliases(ctx context.Context, query *TableFieldAliasQueryRequest) (*TableFieldAliasList, error) {
+	endpoint := "/api/dic-table-field-alias/list"
 
-	var result ResponseWrapper[[]DicTableFieldAliasFlowDB]
+	var result ResponseWrapper[[]TableFieldAliasResponse]
 	if err := c.doRequest(ctx, http.MethodPost, endpoint, query, &result); err != nil {
 		return nil, err
 	}
 
 	if !result.Success {
-		return nil, NewClientError("list_table_field_alias_flow", fmt.Sprintf("API error: %s", result.Error), nil)
+		return nil, NewClientError("list_table_field_aliases", fmt.Sprintf("API error: %s", result.Error), nil)
 	}
 
-	return &TableFieldAliasFlowList{
+	return &TableFieldAliasList{
 		TotalCount: result.TotalCount,
 		LastPage:   result.LastPage,
 		Data:       result.Data,
 	}, nil
 }
 
-// BatchSaveTableFieldAliasFlow 批量保存字段别名字典流水
-func (c *Client) BatchSaveTableFieldAliasFlow(ctx context.Context, req *BatchTableFieldAliasRequest) ([]DicTableFieldAliasFlowDB, error) {
-	endpoint := "/api/dic-table-field-alias-flow/batch-save"
-
-	var result ResponseWrapper[[]DicTableFieldAliasFlowDB]
-	if err := c.doRequest(ctx, http.MethodPost, endpoint, req, &result); err != nil {
-		return nil, err
-	}
-
-	if !result.Success {
-		return nil, NewClientError("batch_save_table_field_alias_flow", fmt.Sprintf("API error: %s", result.Error), nil)
-	}
-
-	return result.Data, nil
-}
-
-// BatchApprovalTableFieldAliasFlow 批量审批字段别名字典流水
-func (c *Client) BatchApprovalTableFieldAliasFlow(ctx context.Context, req *BatchApprovalFlowRequest) error {
-	endpoint := "/api/dic-table-field-alias-flow/batch-approval"
-
-	var result ResponseWrapper[int64]
-	if err := c.doRequest(ctx, http.MethodPost, endpoint, req, &result); err != nil {
-		return err
-	}
-
-	if !result.Success {
-		return NewClientError("batch_approval_table_field_alias_flow", fmt.Sprintf("API error: %s", result.Error), nil)
-	}
-
-	return nil
-}
-
 // doRequest 执行HTTP请求
 func (c *Client) doRequest(ctx context.Context, method, endpoint string, body interface{}, result interface{}) error {
 	// 构建URL

sdk/configure/test/example.go

@@ -30,8 +30,9 @@ func ExampleUsage() {
 	// 示例5：删除表
 	exampleDeleteTable()
 
-	// 示例6：别名字典管理
-	exampleAliasManagement()
+	// 示例6：批量保存表
+	exampleBatchSaveTables()
+
 }
 
 func exampleCreateClient() {
@@ -211,86 +212,92 @@ func exampleDeleteTable() {
 	fmt.Println()
 }
 
-func exampleAliasManagement() {
-	fmt.Println("=== 示例6：别名字典管理 ===")
+func exampleBatchSaveTables() {
+	fmt.Println("=== 示例6：批量保存数据库表字典 ===")
 
-	// 创建客户端
-	client, err := configure.NewBasicAuthClient("http://localhost:8080", "admin", "123")
+	// 创建客户端（使用Token认证）
+	// 注意：实际使用时需要从认证服务获取有效的token
+	client, err := configure.NewTokenAuthClient("http://localhost:8080", "your-valid-token-here")
 	if err != nil {
 		log.Printf("Failed to create client: %v", err)
 		return
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	// 1. 创建表别名字典
-	tableAliasReq := &configure.TableAliasRequest{
-		TableID:    "example_table_001",
-		TableAlias: "示例表别名",
-	}
-
-	tableAliasDetail, err := client.SaveTableAlias(ctx, tableAliasReq)
-	if err != nil {
-		log.Printf("Error saving table alias: %v", err)
-		return
-	}
-	fmt.Printf("Table alias saved: ID=%s, TableID=%s, Alias=%s\n",
-		tableAliasDetail.TableAlias.ID,
-		tableAliasDetail.TableAlias.TableID,
-		tableAliasDetail.TableAlias.TableAlias)
-
-	// 2. 查询表别名字典列表
-	query := &configure.TableAliasQueryRequest{
-		QueryRequest: queryreq.QueryRequest{
-			Page:     0,
-			PageSize: 10,
+	// 创建批量保存请求
+	req := &configure.BatchSaveDicTablesRequest{
+		Tables: []configure.DicTableRequest{
+			{
+				TableID:     "batch_table_001",
+				TableType:   "实体表",
+				Name:        "批量测试表001",
+				Description: "批量测试表001描述",
+			},
+			{
+				TableID:     "batch_table_002",
+				TableType:   "视图",
+				Name:        "批量测试表002",
+				Description: "批量测试表002描述",
+			},
+		},
+		Fields: []configure.DicTableFieldRequest{
+			// 表1的字段
+			{
+				FieldID:     "batch_table_001.id",
+				TableID:     "batch_table_001",
+				FiledType:   "实际字段",
+				DataType:    "数值型",
+				FieldName:   "id",
+				FieldNameCN: "主键ID",
+				Description: "表1主键字段",
+			},
+			{
+				FieldID:     "batch_table_001.name",
+				TableID:     "batch_table_001",
+				FiledType:   "实际字段",
+				DataType:    "字符型",
+				FieldName:   "name",
+				FieldNameCN: "名称",
+				Description: "表1名称字段",
+			},
+			// 表2的字段
+			{
+				FieldID:     "batch_table_002.code",
+				TableID:     "batch_table_002",
+				FiledType:   "实际字段",
+				DataType:    "字符型",
+				FieldName:   "code",
+				FieldNameCN: "编码",
+				Description: "表2编码字段",
+			},
+			{
+				FieldID:     "batch_table_002.value",
+				TableID:     "batch_table_002",
+				FiledType:   "计算字段",
+				DataType:    "数值型",
+				FieldName:   "value",
+				FieldNameCN: "数值",
+				Description: "表2数值字段",
+			},
 		},
-		TableID: "example_table_001",
-	}
-
-	tableAliasList, err := client.ListTableAliases(ctx, query)
-	if err != nil {
-		log.Printf("Error listing table aliases: %v", err)
-		return
-	}
-	fmt.Printf("Total table aliases: %d\n", tableAliasList.TotalCount)
-
-	// 3. 创建字段别名字典
-	fieldAliasReq := &configure.TableFieldAliasRequest{
-		FieldID:        "example_table_001.id",
-		TableID:        "example_table_001",
-		FieldName:      "id",
-		FieldAlias:     "主键别名",
-		Description:    "主键字段别名",
-		WhereCondition: "查询条件描述",
 	}
 
-	fieldAliasDetail, err := client.SaveTableFieldAlias(ctx, fieldAliasReq)
-	if err != nil {
-		log.Printf("Error saving field alias: %v", err)
-		return
-	}
-	fmt.Printf("Field alias saved: ID=%s, FieldID=%s, Alias=%s\n",
-		fieldAliasDetail.TableFieldAlias.ID,
-		fieldAliasDetail.TableFieldAlias.FieldID,
-		fieldAliasDetail.TableFieldAlias.FieldAlias)
+	// 执行批量保存
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
 
-	// 4. 查询字段别名字典列表
-	fieldQuery := &configure.TableFieldAliasQueryRequest{
-		QueryRequest: queryreq.QueryRequest{
-			Page:     0,
-			PageSize: 10,
-		},
-		TableID: "example_table_001",
-	}
+	fmt.Println("开始批量保存2个表，4个字段...")
+	startTime := time.Now()
 
-	fieldAliasList, err := client.ListTableFieldAliases(ctx, fieldQuery)
-	if err != nil {
-		log.Printf("Error listing field aliases: %v", err)
+	if err := client.BatchSaveTables(ctx, req); err != nil {
+		log.Printf("批量保存失败: %v", err)
 		return
 	}
-	fmt.Printf("Total field aliases: %d\n", fieldAliasList.TotalCount)
 
+	elapsed := time.Since(startTime)
+	fmt.Printf("批量保存成功！耗时: %v\n", elapsed)
+	fmt.Println("注意：示例中的token需要替换为实际有效的token")
+	fmt.Println("批量保存逻辑包括：")
+	fmt.Println("  1. 字段字典：先删除表的所有字段，再批量插入")
+	fmt.Println("  2. 表字典：存在则UPDATE，不存在则INSERT")
 	fmt.Println()
 }

sdk/configure/types.go

@@ -54,7 +54,6 @@ type DicTableQueryRequest struct {
 
 // DicTableDB 数据库表字典数据库模型
 type DicTableDB struct {
-	ID          string     `db:"id" json:"id"`
 	TableID     string     `db:"table_id" json:"tableID"`
 	TableType   string     `db:"table_type" json:"tableType"`
 	Name        string     `db:"table_name" json:"name"`
@@ -81,184 +80,126 @@ type DicTableFieldDB struct {
 	DeletedAt   *time.Time `db:"deleted_at" json:"deletedAt"`
 }
 
-// 数据库别名字典类型
-// 表别名字典数据库模型
-type DicTableAliasDB struct {
-	ID         string     `db:"id" json:"id"`
-	TableID    string     `db:"table_id" json:"tableID"`
-	TableAlias string     `db:"table_alias" json:"tableAlias"`
-	CreatedAt  time.Time  `db:"created_at" json:"createdAt"`
-	UpdatedAt  time.Time  `db:"updated_at" json:"updatedAt"`
-	DeletedAt  *time.Time `db:"deleted_at" json:"deletedAt"`
-}
-
-// 字段别名字典数据库模型
-type DicTableFieldAliasDB struct {
-	ID             string     `db:"id" json:"id"`
-	FieldID        string     `db:"field_id" json:"fieldID"`
-	TableID        string     `db:"table_id" json:"tableID"`
-	FieldName      string     `db:"field_name" json:"fieldName"`
-	FieldAlias     string     `db:"field_alias" json:"fieldAlias"`
-	Description    string     `db:"description" json:"description"`
-	WhereCondition string     `db:"where_condition" json:"whereCondition"`
-	CreatedAt      time.Time  `db:"created_at" json:"createdAt"`
-	UpdatedAt      time.Time  `db:"updated_at" json:"updatedAt"`
-	DeletedAt      *time.Time `db:"deleted_at" json:"deletedAt"`
-}
-
-// 表别名字典流水数据库模型
-type DicTableAliasFlowDB struct {
-	ID             string     `db:"id" json:"id"`
-	TableID        string     `db:"table_id" json:"tableID"`
-	TableAlias     string     `db:"table_alias" json:"tableAlias"`
-	TenantID       string     `db:"tenant_id" json:"tenantID"`
-	ApprovalStatus int8       `db:"approval_status" json:"approvalStatus"`
-	Approver       string     `db:"approver" json:"approver"`
-	ApprovedAt     *time.Time `db:"approved_at" json:"approvedAt"`
-	CreatedAt      time.Time  `db:"created_at" json:"createdAt"`
-	UpdatedAt      time.Time  `db:"updated_at" json:"updatedAt"`
-	DeletedAt      *time.Time `db:"deleted_at" json:"deletedAt"`
-}
-
-// 字段别名字典流水数据库模型
-type DicTableFieldAliasFlowDB struct {
-	ID             string     `db:"id" json:"id"`
-	FieldID        string     `db:"field_id" json:"fieldID"`
-	TableID        string     `db:"table_id" json:"tableID"`
-	FieldName      string     `db:"field_name" json:"fieldName"`
-	FieldAlias     string     `db:"field_alias" json:"fieldAlias"`
-	Description    string     `db:"description" json:"description"`
-	WhereCondition string     `db:"where_condition" json:"whereCondition"`
-	TenantID       string     `db:"tenant_id" json:"tenantID"`
-	ApprovalStatus int8       `db:"approval_status" json:"approvalStatus"`
-	Approver       string     `db:"approver" json:"approver"`
-	ApprovedAt     *time.Time `db:"approved_at" json:"approvedAt"`
-	CreatedAt      time.Time  `db:"created_at" json:"createdAt"`
-	UpdatedAt      time.Time  `db:"updated_at" json:"updatedAt"`
-	DeletedAt      *time.Time `db:"deleted_at" json:"deletedAt"`
-}
-
-// 表别名字典查询请求
-type TableAliasQueryRequest struct {
-	queryreq.QueryRequest // 通用查询请求（分页、排序、筛选）
-
-	// 向后兼容的旧字段（新客户端应使用QueryRequest中的Filters）
-	TableID    string `json:"tableID,omitempty"`    // 表ID模糊搜索
-	TableAlias string `json:"tableAlias,omitempty"` // 别名模糊搜索
-	SortField  string `json:"sortField,omitempty"`  // 排序字段（单字段）
-	SortOrder  string `json:"sortOrder,omitempty"`  // 排序方向: asc/desc
+// BatchSaveDicTablesRequest 批量保存数据库表字典请求
+type BatchSaveDicTablesRequest struct {
+	Tables []DicTableRequest      `json:"tables" binding:"required"`
+	Fields []DicTableFieldRequest `json:"fields" binding:"required"`
 }
 
-// 表别名字典请求
+// TableAliasRequest 表别名字典请求
 type TableAliasRequest struct {
-	ID         string `json:"id,omitempty"`                  // 主键（创建时可选，更新时必填）
-	TableID    string `json:"tableID" binding:"required"`    // 表ID
-	TableAlias string `json:"tableAlias" binding:"required"` // 别名
-}
-
-// 批量表别名字典请求
-type BatchTableAliasRequest struct {
-	Items []TableAliasRequest `json:"items" binding:"required"` // 表别名列表
-}
-
-// 表别名字典详情
-type TableAliasDetail struct {
-	TableAlias DicTableAliasDB `json:"tableAlias"` // 表别名字典信息
-}
-
-// 表别名字典列表
-type TableAliasList struct {
-	TotalCount int               `json:"totalCount"`
-	LastPage   int               `json:"lastPage"`
-	Data       []DicTableAliasDB `json:"data"`
+	TableID    string `json:"tableID" binding:"required"`
+	TableAlias string `json:"tableAlias" binding:"required"`
 }
 
-// 字段别名字典查询请求
-type TableFieldAliasQueryRequest struct {
-	queryreq.QueryRequest // 通用查询请求（分页、排序、筛选）
-
-	// 向后兼容的旧字段（新客户端应使用QueryRequest中的Filters）
-	TableID    string `json:"tableID,omitempty"`    // 表ID模糊搜索
-	FieldID    string `json:"fieldID,omitempty"`    // 字段ID模糊搜索
-	FieldName  string `json:"fieldName,omitempty"`  // 字段名称模糊搜索
-	FieldAlias string `json:"fieldAlias,omitempty"` // 字段别名模糊搜索
-	SortField  string `json:"sortField,omitempty"`  // 排序字段（单字段）
-	SortOrder  string `json:"sortOrder,omitempty"`  // 排序方向: asc/desc
-}
-
-// 字段别名字典请求
+// TableFieldAliasRequest 表字段别名字典请求
 type TableFieldAliasRequest struct {
-	ID             string `json:"id,omitempty"`                  // 主键（创建时可选，更新时必填）
-	FieldID        string `json:"fieldID" binding:"required"`    // 字段ID
-	TableID        string `json:"tableID" binding:"required"`    // 表ID
-	FieldName      string `json:"fieldName" binding:"required"`  // 字段名称
-	FieldAlias     string `json:"fieldAlias" binding:"required"` // 字段别名
-	Description    string `json:"description"`                   // 字段别名描述
-	WhereCondition string `json:"whereCondition"`                // 此别名获取数据的查询条件描述
-}
-
-// 批量字段别名字典请求
-type BatchTableFieldAliasRequest struct {
-	Items []TableFieldAliasRequest `json:"items" binding:"required"` // 字段别名列表
+	FieldID    string `json:"fieldID" binding:"required"`
+	FieldAlias string `json:"fieldAlias" binding:"required"`
 }
 
-// 字段别名字典详情
-type TableFieldAliasDetail struct {
-	TableFieldAlias DicTableFieldAliasDB `json:"tableFieldAlias"` // 字段别名字典信息
+// BatchTableSyncRequest 批量表同步请求
+type BatchTableSyncRequest struct {
+	Tables []DicTableRequest      `json:"tables" binding:"required"`
+	Fields []DicTableFieldRequest `json:"fields" binding:"required"`
 }
 
-// 字段别名字典列表
-type TableFieldAliasList struct {
-	TotalCount int                    `json:"totalCount"`
-	LastPage   int                    `json:"lastPage"`
-	Data       []DicTableFieldAliasDB `json:"data"`
+// BatchAliasSyncRequest 批量别名同步请求
+type BatchAliasSyncRequest struct {
+	TableAliases []TableAliasRequest      `json:"tableAliases" binding:"required"`
+	FieldAliases []TableFieldAliasRequest `json:"fieldAliases" binding:"required"`
 }
 
-// 表别名字典流水查询请求
-type TableAliasFlowQueryRequest struct {
-	queryreq.QueryRequest // 通用查询请求（分页、排序、筛选）
-
-	// 向后兼容的旧字段
-	TableID        string `json:"tableID,omitempty"`        // 表ID模糊搜索
-	TableAlias     string `json:"tableAlias,omitempty"`     // 别名模糊搜索
-	TenantID       string `json:"tenantID,omitempty"`       // 租户ID精确搜索
-	ApprovalStatus int8   `json:"approvalStatus,omitempty"` // 审批状态精确搜索
-	SortField      string `json:"sortField,omitempty"`      // 排序字段（单字段）
-	SortOrder      string `json:"sortOrder,omitempty"`      // 排序方向: asc/desc
+// TableAliasQueryRequest 表别名字典查询请求
+type TableAliasQueryRequest struct {
+	TableID    string `json:"tableID,omitempty"`
+	TableAlias string `json:"tableAlias,omitempty"`
 }
 
-// 字段别名字典流水查询请求
-type TableFieldAliasFlowQueryRequest struct {
-	queryreq.QueryRequest // 通用查询请求（分页、排序、筛选）
-
-	// 向后兼容的旧字段
-	TableID        string `json:"tableID,omitempty"`        // 表ID模糊搜索
-	FieldID        string `json:"fieldID,omitempty"`        // 字段ID模糊搜索
-	FieldName      string `json:"fieldName,omitempty"`      // 字段名称模糊搜索
-	FieldAlias     string `json:"fieldAlias,omitempty"`     // 字段别名模糊搜索
-	TenantID       string `json:"tenantID,omitempty"`       // 租户ID精确搜索
-	ApprovalStatus int8   `json:"approvalStatus,omitempty"` // 审批状态精确搜索
-	SortField      string `json:"sortField,omitempty"`      // 排序字段（单字段）
-	SortOrder      string `json:"sortOrder,omitempty"`      // 排序方向: asc/desc
+// TableFieldAliasQueryRequest 表字段别名字典查询请求
+type TableFieldAliasQueryRequest struct {
+	FieldID    string `json:"fieldID,omitempty"`
+	FieldAlias string `json:"fieldAlias,omitempty"`
+}
+
+// BatchTableSyncResponse 批量表同步响应
+type BatchTableSyncResponse struct {
+	TotalTables   int                        `json:"totalTables"`
+	CreatedTables int                        `json:"createdTables"`
+	UpdatedTables int                        `json:"updatedTables"`
+	DeletedTables int                        `json:"deletedTables"`
+	TotalFields   int                        `json:"totalFields"`
+	CreatedFields int                        `json:"createdFields"`
+	UpdatedFields int                        `json:"updatedFields"`
+	DeletedFields int                        `json:"deletedFields"`
+	FailedTables  []BatchTableSyncFailedItem `json:"failedTables"`
+	FailedFields  []BatchFieldSyncFailedItem `json:"failedFields"`
+}
+
+// BatchTableSyncFailedItem 批量表同步失败项
+type BatchTableSyncFailedItem struct {
+	TableID string `json:"tableID"`
+	Error   string `json:"error"`
+}
+
+// BatchFieldSyncFailedItem 批量字段同步失败项
+type BatchFieldSyncFailedItem struct {
+	FieldID string `json:"fieldID"`
+	Error   string `json:"error"`
+}
+
+// BatchAliasSyncResponse 批量别名同步响应
+type BatchAliasSyncResponse struct {
+	TotalTableAliases   int                        `json:"totalTableAliases"`
+	CreatedTableAliases int                        `json:"createdTableAliases"`
+	UpdatedTableAliases int                        `json:"updatedTableAliases"`
+	DeletedTableAliases int                        `json:"deletedTableAliases"`
+	TotalFieldAliases   int                        `json:"totalFieldAliases"`
+	CreatedFieldAliases int                        `json:"createdFieldAliases"`
+	UpdatedFieldAliases int                        `json:"updatedFieldAliases"`
+	DeletedFieldAliases int                        `json:"deletedFieldAliases"`
+	FailedTableAliases  []BatchAliasSyncFailedItem `json:"failedTableAliases"`
+	FailedFieldAliases  []BatchAliasSyncFailedItem `json:"failedFieldAliases"`
+}
+
+// BatchAliasSyncFailedItem 批量别名同步失败项
+type BatchAliasSyncFailedItem struct {
+	AliasID string `json:"aliasID"`
+	Error   string `json:"error"`
+}
+
+// TableAliasResponse 表别名字典响应
+type TableAliasResponse struct {
+	ID         string     `db:"id" json:"id"`
+	TableID    string     `db:"table_id" json:"tableID"`
+	TableAlias string     `db:"table_alias" json:"tableAlias"`
+	Creator    string     `db:"creator" json:"creator"`
+	CreatedAt  time.Time  `db:"created_at" json:"createdAt"`
+	UpdatedAt  time.Time  `db:"updated_at" json:"updatedAt"`
+	DeletedAt  *time.Time `db:"deleted_at" json:"deletedAt"`
 }
 
-// 批量审批流水请求
-type BatchApprovalFlowRequest struct {
-	IDs            []string `json:"ids" binding:"required"`            // 流水记录ID列表
-	ApprovalStatus int8     `json:"approvalStatus" binding:"required"` // 审批状态：0待审批，1通过，2拒绝
-	Approver       string   `json:"approver" binding:"required"`       // 审批人
+// TableFieldAliasResponse 表字段别名字典响应
+type TableFieldAliasResponse struct {
+	ID         string     `db:"id" json:"id"`
+	FieldID    string     `db:"field_id" json:"fieldID"`
+	FieldAlias string     `db:"field_alias" json:"fieldAlias"`
+	Creator    string     `db:"creator" json:"creator"`
+	CreatedAt  time.Time  `db:"created_at" json:"createdAt"`
+	UpdatedAt  time.Time  `db:"updated_at" json:"updatedAt"`
+	DeletedAt  *time.Time `db:"deleted_at" json:"deletedAt"`
 }
 
-// 表别名字典流水列表
-type TableAliasFlowList struct {
-	TotalCount int                   `json:"totalCount"`
-	LastPage   int                   `json:"lastPage"`
-	Data       []DicTableAliasFlowDB `json:"data"`
+// TableAliasList 表别名字典列表
+type TableAliasList struct {
+	TotalCount int                  `json:"totalCount"`
+	LastPage   int                  `json:"lastPage"`
+	Data       []TableAliasResponse `json:"data"`
 }
 
-// 字段别名字典流水列表
-type TableFieldAliasFlowList struct {
-	TotalCount int                        `json:"totalCount"`
-	LastPage   int                        `json:"lastPage"`
-	Data       []DicTableFieldAliasFlowDB `json:"data"`
+// TableFieldAliasList 表字段别名字典列表
+type TableFieldAliasList struct {
+	TotalCount int                       `json:"totalCount"`
+	LastPage   int                       `json:"lastPage"`
+	Data       []TableFieldAliasResponse `json:"data"`
 }