From defb599ecac288fe1c6cf50b7ec640333364761c Mon Sep 17 00:00:00 2001
From: satori <huan0016@gmail.com>
Date: Sun, 17 Nov 2024 22:02:56 +0800
Subject: [PATCH] =?UTF-8?q?OCR=20=E6=90=9C=E7=B4=A2=E6=8C=89=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/gorse.go   |  8 +++-----
 api/graphql.go | 11 ++++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/api/gorse.go b/api/gorse.go
index 9d5c26c..51bdc92 100644
--- a/api/gorse.go
+++ b/api/gorse.go
@@ -90,19 +90,17 @@ func PutPraises(page int) error {
 // 同步收藏数据
 
 // 获取推荐ID
-func GetRecommend(user_id int, category string) ([]int, error) {
+func GetRecommend(user_id int, categorys []string) ([]int, error) {
 	var ctx context.Context = context.Background()
 	var ids []int
-
-	data, err := gorse.GetItemLatestWithCategory(ctx, fmt.Sprintf("%d", user_id), category, 100, 0)
+	data, err := gorse.GetItemRecommend(ctx, fmt.Sprintf("%d", user_id), categorys, "read", "0", 100, 0)
 	if err != nil {
 		fmt.Println("获取推荐失败", err)
 		return ids, err
 	}
 	for _, item := range data {
-		id, _ := strconv.Atoi(item.Id)
+		id, _ := strconv.Atoi(item)
 		ids = append(ids, id)
 	}
-
 	return ids, nil
 }
diff --git a/api/graphql.go b/api/graphql.go
index b53440d..80fddf0 100644
--- a/api/graphql.go
+++ b/api/graphql.go
@@ -583,7 +583,6 @@ func NewSchema(config Config) (graphql.Schema, error) {
 							"bool": map[string]interface{}{
 								"must": []map[string]interface{}{
 									{
-										//"query_string": map[string]string{"query": "text:" + args.Text},
 										"match_phrase": map[string]string{"text": args.Text},
 									},
 								},
@@ -592,8 +591,7 @@ func NewSchema(config Config) (graphql.Schema, error) {
 						"sort": []string{
 							"_score",
 						},
-						//"from": 0,
-						"size": 1000,
+						"size": 2000,
 					})
 
 					if err != nil {
@@ -613,7 +611,8 @@ func NewSchema(config Config) (graphql.Schema, error) {
 					}
 
 					query = query.Where(goqu.Ex{"web_images.id": goqu.Op{"in": item}}).Select("web_images.id", goqu.L(
-						fmt.Sprintf("ROW_NUMBER() OVER(ORDER BY FIELD(%s, %s))", "web_images.id", regexp.MustCompile(`[\[\]]`).ReplaceAllString(strings.Join(strings.Fields(fmt.Sprint(item)), ", "), "")),
+						//fmt.Sprintf("ROW_NUMBER() OVER(ORDER BY FIELD(%s, %s))", "web_images.id", regexp.MustCompile(`[\[\]]`).ReplaceAllString(strings.Join(strings.Fields(fmt.Sprint(item)), ", "), "")),
+						fmt.Sprintf("ROW_NUMBER() OVER(ORDER BY %s %s)", "web_images.id", "DESC"),
 					).As("row_num"))
 				}
 
@@ -637,7 +636,9 @@ func NewSchema(config Config) (graphql.Schema, error) {
 				if p.Args["interest"] != nil {
 					fmt.Println("interest:", p.Args["interest"])
 					user_id := p.Args["interest"].(int)
-					list, err := GetRecommend(user_id, "image")
+					fmt.Println("interest1:", user_id)
+					list, err := GetRecommend(user_id, []string{})
+					fmt.Println("interest2:", list, err)
 					if err != nil {
 						fmt.Println("GetRecommend 获取兴趣推荐失败", err)
 						return map[string]interface{}{"list": []Image{}, "total": 0}, nil