Release v0.1.121123

factory/database/db_factory.go

@@ -121,19 +121,19 @@ func (f *DBFactory) GetDBType() string {
 }
 
 // QueryToJSON 快捷查询，直接返回 JSON 字节流
-func (f *DBFactory) QueryToJSON(sql string, reqCtx *ctx.RequestContext) *types.QueryResult {
+func (f *DBFactory) QueryToJSON(sql string, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
 	return functions.QueryToJSON(f.db, sql, reqCtx)
 }
 
 // QueryParamsToJSON 位置参数查询并返回 JSON 字节数据
-func (f *DBFactory) QueryPositionalToJSON(sql string, params []interface{}, reqCtx *ctx.RequestContext) *types.QueryResult {
+func (f *DBFactory) QueryPositionalToJSON(sql string, params []interface{}, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
 
 	return functions.QueryPositionalToJSON(f.db, sql, params, reqCtx)
 }
 
 // QueryParamsNameToJSON 命名参数查询并返回 JSON 字节数据
 // params 可以是 map[string]interface{} 或结构体
-func (f *DBFactory) QueryParamsNameToJSON(sql string, params map[string]interface{}, reqCtx *ctx.RequestContext) *types.QueryResult {
+func (f *DBFactory) QueryParamsNameToJSON(sql string, params map[string]interface{}, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
 
 	return functions.QueryParamsNameToJSON(f.db, sql, params, reqCtx)
 }

factory/rabbitmq/consumer_factory.go

@@ -9,7 +9,7 @@ import (
 
 // MessageHandler 消息处理器接口
 type MessageHandler interface {
-	Process(ueueRequest *types.QueueRequest, body []byte) types.QueryResult
+	Process(ueueRequest *types.QueueRequest, body []byte) types.QueryResult[interface{}]
 }
 
 // Consumer 消费者结构体

functions/query_json.go

@@ -2,7 +2,6 @@ package functions
 
 import (
 	"database/sql"
-	"encoding/json"
 	"fmt"
 	"time"
 
@@ -12,7 +11,7 @@ import (
 )
 
 // QueryParamsNameToJSON 执行带命名参数的查询
-func QueryParamsNameToJSON(db *sqlx.DB, sql string, params map[string]interface{}, reqCtx *ctx.RequestContext) *types.QueryResult {
+func QueryParamsNameToJSON(db *sqlx.DB, sql string, params map[string]interface{}, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
 	startTime := time.Now()
 
 	if sql == "" {
@@ -38,7 +37,7 @@ func QueryParamsNameToJSON(db *sqlx.DB, sql string, params map[string]interface{
 }
 
 // QueryPositionalToJSON 执行带位置参数的查询
-func QueryPositionalToJSON(db *sqlx.DB, sql string, params []interface{}, reqCtx *ctx.RequestContext) *types.QueryResult {
+func QueryPositionalToJSON(db *sqlx.DB, sql string, params []interface{}, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
 	startTime := time.Now()
 
 	//fmt.Printf("positionalParams: %s", params)
@@ -59,7 +58,7 @@ func QueryPositionalToJSON(db *sqlx.DB, sql string, params []interface{}, reqCtx
 }
 
 // QueryToJSON 执行无参数的查询
-func QueryToJSON(db *sqlx.DB, sql string, reqCtx *ctx.RequestContext) *types.QueryResult {
+func QueryToJSON(db *sqlx.DB, sql string, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
 	startTime := time.Now()
 
 	if sql == "" {
@@ -78,9 +77,9 @@ func QueryToJSON(db *sqlx.DB, sql string, reqCtx *ctx.RequestContext) *types.Que
 }
 
 // processQueryResult 处理查询结果（公共部分）
-func processQueryResult(rows *sql.Rows, startTime time.Time) *types.QueryResult {
-	result := &types.QueryResult{}
+func processQueryResult(rows *sql.Rows, startTime time.Time) *types.QueryResult[[]map[string]interface{}] {
 
+	result := &types.QueryResult[[]map[string]interface{}]{}
 	// 获取列信息
 	columns, err := rows.Columns()
 	if err != nil {
@@ -125,30 +124,17 @@ func processQueryResult(rows *sql.Rows, startTime time.Time) *types.QueryResult
 		return result
 	}
 
-	// 转换为JSON
-	jsonData, err := json.Marshal(results)
-	if err != nil {
-		result.Success = false
-		result.Error = fmt.Sprintf("JSON marshal failed: %v", err)
-		result.Time = time.Since(startTime).String()
-		return result
-	}
-
 	// 构建成功结果
 	result.Success = true
-	result.Data = map[string]interface{}{
-		"json":  string(jsonData),
-		"rows":  results,
-		"count": count,
-	}
+	result.Data = results
 	result.Count = count
 	result.Time = time.Since(startTime).String()
 	return result
 }
 
 // createErrorResult 创建错误结果的辅助函数
-func createErrorResult(errorMsg string, startTime time.Time, reqCtx *ctx.RequestContext) *types.QueryResult {
-	return &types.QueryResult{
+func createErrorResult(errorMsg string, startTime time.Time, reqCtx *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}] {
+	return &types.QueryResult[[]map[string]interface{}]{
 		Success:  false,
 		Error:    errorMsg,
 		Time:     time.Since(startTime).String(),

myhandle/query_handler_json.go

@@ -14,14 +14,14 @@ func QueryHandlerJson[T any, F any](
 	w http.ResponseWriter,
 	r *http.Request,
 	factory F,
-	handlerFunc func(F, T, *ctx.RequestContext) *types.QueryResult,
+	handlerFunc func(F, T, *ctx.RequestContext) *types.QueryResult[[]map[string]interface{}],
 ) {
 	// 解析请求参数
 	var req T
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 		// 如果解析失败，也返回 QueryResult 格式
 		w.Header().Set("Content-Type", "application/json")
-		json.NewEncoder(w).Encode(&types.QueryResult{
+		json.NewEncoder(w).Encode(&types.QueryResult[[]map[string]interface{}]{
 			Success: false,
 			Error:   "Invalid request body: " + err.Error(),
 			Time:    time.Now().Format(time.RFC3339),

myhandle/query_handler_map.go

@@ -0,0 +1,38 @@
+package myhandle
+
+import (
+	"encoding/json"
+	"net/http"
+	"time"
+
+	"git.x2erp.com/qdy/go-base/ctx"
+	"git.x2erp.com/qdy/go-base/types"
+)
+
+// queryHandler - 最简单的版本
+func QueryHandlerMap[T any, F any](
+	w http.ResponseWriter,
+	r *http.Request,
+	factory F,
+	handlerFunc func(F, T, *ctx.RequestContext) *types.QueryResult[map[string]interface{}],
+) {
+	// 解析请求参数
+	var req T
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		// 如果解析失败，也返回 QueryResult 格式
+		w.Header().Set("Content-Type", "application/json")
+		json.NewEncoder(w).Encode(&types.QueryResult[[]map[string]interface{}]{
+			Success: false,
+			Error:   "Invalid request body: " + err.Error(),
+			Time:    time.Now().Format(time.RFC3339),
+		})
+		return
+	}
+
+	// 执行业务逻辑
+	result := handlerFunc(factory, req, ctx.GetContext(r))
+
+	// 设置头，写入结果
+	w.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(result)
+}