同步历史版本代码

2026-03-03 09:32:22 -08:00
parent 7d46b31866
commit 4d8516b2e1
140 changed files with 8399 additions and 489 deletions
@@ -14,6 +14,7 @@ type customServerLogicModel interface {
 	FilterNodeList(ctx context.Context, params *FilterNodeParams) (int64, []*Node, error)
 	ClearNodeCache(ctx context.Context, params *FilterNodeParams) error
 	ClearServerAllCache(ctx context.Context) error
+	CountNodesByIdsAndTags(ctx context.Context, nodeIds []int64, tags []string) (int64, error)
 }

 const (
@@ -129,7 +130,7 @@ func (m *customServerModel) ClearNodeCache(ctx context.Context, params *FilterNo
 					return err
 				}
 				if len(keys) > 0 {
-					cacheKeys = append(keys, keys...)
+					cacheKeys = append(cacheKeys, keys...)
 				}
 				cursor = newCursor
 				if cursor == 0 {
@@ -152,7 +153,7 @@ func (m *customServerModel) ClearServerCache(ctx context.Context, serverId int64
 	cacheKeys = append(cacheKeys, fmt.Sprintf("%s%d", ServerUserListCacheKey, serverId))
 	var cursor uint64
 	for {
-		keys, newCursor, err := m.Cache.Scan(ctx, 0, fmt.Sprintf("%s%d*", ServerConfigCacheKey, serverId), 100).Result()
+		keys, newCursor, err := m.Cache.Scan(ctx, cursor, fmt.Sprintf("%s%d*", ServerConfigCacheKey, serverId), 100).Result()
 		if err != nil {
 			return err
 		}
@@ -175,18 +176,21 @@ func (m *customServerModel) ClearServerCache(ctx context.Context, serverId int64
 func (m *customServerModel) ClearServerAllCache(ctx context.Context) error {
 	var cursor uint64
 	var keys []string
-	prefix := ServerUserListCacheKey + "*"
-	for {
-		scanKeys, newCursor, err := m.Cache.Scan(ctx, cursor, prefix, 999).Result()
-		if err != nil {
-			m.Logger.Error(ctx, fmt.Sprintf("ClearServerAllCache err:%v", err))
-			break
-		}
-		m.Logger.Info(ctx, fmt.Sprintf("ClearServerAllCache query keys:%v", scanKeys))
-		keys = append(keys, scanKeys...)
-		cursor = newCursor
-		if cursor == 0 {
-			break
+	prefixes := []string{ServerConfigCacheKey + "*", ServerUserListCacheKey + "*"}
+	for _, prefix := range prefixes {
+		cursor = 0
+		for {
+			scanKeys, newCursor, err := m.Cache.Scan(ctx, cursor, prefix, 999).Result()
+			if err != nil {
+				m.Logger.Error(ctx, fmt.Sprintf("ClearServerAllCache err:%v", err))
+				break
+			}
+			m.Logger.Info(ctx, fmt.Sprintf("ClearServerAllCache query keys:%v", scanKeys))
+			keys = append(keys, scanKeys...)
+			cursor = newCursor
+			if cursor == 0 {
+				break
+			}
 		}
 	}
 	if len(keys) > 0 {
@@ -196,6 +200,29 @@ func (m *customServerModel) ClearServerAllCache(ctx context.Context) error {
 	return nil
 }

+// CountNodesByIdsAndTags 根据节点ID和标签计算启用的节点数量
+func (m *customServerModel) CountNodesByIdsAndTags(ctx context.Context, nodeIds []int64, tags []string) (int64, error) {
+	var count int64
+	query := m.WithContext(ctx).Model(&Node{}).Where("enabled = ?", true)
+
+	if len(nodeIds) > 0 || len(tags) > 0 {
+		subQuery := m.WithContext(ctx).Model(&Node{}).Where("enabled = ?", true)
+
+		if len(nodeIds) > 0 && len(tags) > 0 {
+			subQuery = subQuery.Where("id IN ? OR ?", nodeIds, InSet("tags", tags))
+		} else if len(nodeIds) > 0 {
+			subQuery = subQuery.Where("id IN ?", nodeIds)
+		} else {
+			subQuery = subQuery.Scopes(InSet("tags", tags))
+		}
+
+		query = subQuery
+	}
+
+	err := query.Count(&count).Error
+	return count, err
+}
+
 // InSet 支持多值 OR 查询
 func InSet(field string, values []string) func(db *gorm.DB) *gorm.DB {
 	return func(db *gorm.DB) *gorm.DB {