新增功能

internal/repository/model.go

@@ -6,45 +6,132 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/luxsin/app-api/internal/cache"
 	"github.com/luxsin/app-api/internal/model"
+	"github.com/redis/go-redis/v9"
 )
 
 type ModelRepository struct {
-	db *sql.DB
+	db    *sql.DB
+	cache *cache.ModelCache
 }
 
-func NewModelRepository(db *sql.DB) *ModelRepository {
-	return &ModelRepository{db: db}
+func NewModelRepository(db *sql.DB, modelCache *cache.ModelCache) *ModelRepository {
+	return &ModelRepository{db: db, cache: modelCache}
 }
 
 func (r *ModelRepository) List(ctx context.Context, brandName, modelName string) ([]model.Model, error) {
 	brandName = strings.TrimSpace(brandName)
 	modelName = strings.TrimSpace(modelName)
 
-	const baseQuery = `SELECT id, brand_name, name, form, rig, source, eq_key, create_at FROM model`
-
-	var (
-		query string
-		args  []any
-	)
-
 	switch {
 	case brandName != "":
-		query = baseQuery + " WHERE brand_name = ? ORDER BY name ASC"
-		args = []any{brandName}
+		// 按品牌精确查询：优先从缓存获取
+		list, err := r.cache.GetByBrand(ctx, brandName)
+		if err == nil {
+			return list, nil
+		}
+		// 缓存未命中或 Redis 异常，降级到数据库
+		if err != redis.Nil {
+			fmt.Printf("model cache read failed, fallback to db: %v\n", err)
+		}
+
+		list, err = r.ListByBrandFromDB(ctx, brandName)
+		if err != nil {
+			return nil, err
+		}
+
+		// 回写缓存
+		if cacheErr := r.cache.SetByBrand(ctx, brandName, list); cacheErr != nil {
+			fmt.Printf("model cache write failed: %v\n", cacheErr)
+		}
+
+		return list, nil
+
 	case modelName != "":
-		query = baseQuery + " WHERE name LIKE ? ORDER BY name ASC"
-		args = []any{"%" + modelName + "%"}
+		// 按型号模糊查询：从全量缓存中过滤
+		list, err := r.cache.GetAll(ctx)
+		if err == nil {
+			return filterModels(list, modelName), nil
+		}
+		// 缓存未命中或 Redis 异常，降级到数据库
+		if err != redis.Nil {
+			fmt.Printf("model cache read failed, fallback to db: %v\n", err)
+		}
+
+		list, err = r.ListByModelFromDB(ctx, modelName)
+		if err != nil {
+			return nil, err
+		}
+
+		// 回写全量缓存
+		if allModels, dbErr := r.ListAllFromDB(ctx); dbErr == nil {
+			if cacheErr := r.cache.SetAll(ctx, allModels); cacheErr != nil {
+				fmt.Printf("model cache write failed: %v\n", cacheErr)
+			}
+		}
+
+		return list, nil
+
 	default:
 		return []model.Model{}, nil
 	}
+}
 
-	rows, err := r.db.QueryContext(ctx, query, args...)
+// ListAllFromDB 从数据库查询全部型号（用于预热和缓存回写）
+func (r *ModelRepository) ListAllFromDB(ctx context.Context) ([]model.Model, error) {
+	const query = `SELECT id, brand_name, name, form, rig, source, eq_key, create_at FROM model ORDER BY name ASC`
+
+	rows, err := r.db.QueryContext(ctx, query)
 	if err != nil {
 		return nil, fmt.Errorf("query model: %w", err)
 	}
 	defer rows.Close()
 
+	return scanModels(rows)
+}
+
+// ListByBrandFromDB 从数据库按品牌查询型号
+func (r *ModelRepository) ListByBrandFromDB(ctx context.Context, brandName string) ([]model.Model, error) {
+	const query = `SELECT id, brand_name, name, form, rig, source, eq_key, create_at FROM model WHERE brand_name = ? ORDER BY name ASC`
+
+	rows, err := r.db.QueryContext(ctx, query, brandName)
+	if err != nil {
+		return nil, fmt.Errorf("query model: %w", err)
+	}
+	defer rows.Close()
+
+	return scanModels(rows)
+}
+
+// ListByModelFromDB 从数据库按型号名称模糊查询
+func (r *ModelRepository) ListByModelFromDB(ctx context.Context, modelName string) ([]model.Model, error) {
+	const query = `SELECT id, brand_name, name, form, rig, source, eq_key, create_at FROM model WHERE name LIKE ? ORDER BY name ASC`
+
+	rows, err := r.db.QueryContext(ctx, query, "%"+modelName+"%")
+	if err != nil {
+		return nil, fmt.Errorf("query model: %w", err)
+	}
+	defer rows.Close()
+
+	return scanModels(rows)
+}
+
+// filterModels 在应用层做模糊过滤
+func filterModels(list []model.Model, modelName string) []model.Model {
+	filtered := make([]model.Model, 0)
+	for _, m := range list {
+		if strings.Contains(
+			strings.ToLower(m.Name),
+			strings.ToLower(modelName),
+		) {
+			filtered = append(filtered, m)
+		}
+	}
+	return filtered
+}
+
+func scanModels(rows *sql.Rows) ([]model.Model, error) {
 	list := make([]model.Model, 0)
 	for rows.Next() {
 		m, err := scanModel(rows)
@@ -56,7 +143,6 @@ func (r *ModelRepository) List(ctx context.Context, brandName, modelName string)
 	if err := rows.Err(); err != nil {
 		return nil, fmt.Errorf("iterate model: %w", err)
 	}
-
 	return list, nil
 }