Merge branch 'main-v2' into lite-ba

src/modules/ne_data/repository/ue_event.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -58,24 +59,59 @@ func (r UEEvent) SelectByPage(neType string, query map[string]string) ([]model.U
 	pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
 	tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize))
 
-	// 排序
-	if v, ok := query["sortField"]; ok && v != "" {
-		sortSql := v
-		if o, ok := query["sortOrder"]; ok && o != "" {
-			if o == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		tx = tx.Order(sortSql)
-	}
-
 	// 查询数据
 	if err := tx.Find(&rows).Error; err != nil {
 		logger.Errorf("query err => %v", err)
 	}
 
+	// 排序
+	if v, ok := query["sortField"]; ok && v != "" {
+		sortField := v
+		sortOrder := "asc"
+		if o, ok := query["sortOrder"]; ok && o != "" {
+			if o == "desc" {
+				sortOrder = "desc"
+			} else {
+				sortOrder = "asc"
+			}
+		}
+		sort.SliceStable(rows, func(i, j int) bool {
+			// 支持的排序字段映射
+			fieldGetters := map[string]func(*model.UEEvent) any{
+				"id":        func(row *model.UEEvent) any { return row.ID },
+				"timestamp": func(row *model.UEEvent) any { return row.CreatedAt },
+				"createdAt": func(row *model.UEEvent) any { return row.CreatedAt },
+				// 可添加更多支持的字段
+			}
+
+			// 获取字段 getter 函数
+			getter, ok := fieldGetters[sortField]
+			if !ok {
+				// 非法字段，使用默认排序（id升序）
+				return rows[i].ID < rows[j].ID
+			}
+
+			// 获取比较值
+			valI, valJ := getter(&rows[i]), getter(&rows[j])
+
+			// 根据字段类型进行比较
+			switch v := valI.(type) {
+			case int64:
+				if sortOrder == "desc" {
+					return v > valJ.(int64)
+				}
+				return v < valJ.(int64)
+			case string:
+				if sortOrder == "desc" {
+					return v > valJ.(string)
+				}
+				return v < valJ.(string)
+			default:
+				// 不支持的字段类型，使用默认排序
+				return rows[i].ID < rows[j].ID
+			}
+		})
+	}
 	return rows, total
 }