按 text 筛选支持自由排序
This commit is contained in:
@@ -908,7 +908,7 @@ func NewSchema(config Config) (graphql.Schema, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 筛选:提取文字
|
// 筛选:提取文字
|
||||||
if args.Text != "" {
|
if p.Args["text"] != nil {
|
||||||
resp, err := models.ZincSearch(map[string]interface{}{
|
resp, err := models.ZincSearch(map[string]interface{}{
|
||||||
"query": map[string]interface{}{
|
"query": map[string]interface{}{
|
||||||
"bool": map[string]interface{}{
|
"bool": map[string]interface{}{
|
||||||
@@ -940,9 +940,9 @@ func NewSchema(config Config) (graphql.Schema, error) {
|
|||||||
return map[string]interface{}{"list": []Image{}, "total": 0}, nil
|
return map[string]interface{}{"list": []Image{}, "total": 0}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
query = query.Where(goqu.Ex{"web_images.id": goqu.Op{"in": item}}).Select("web_images.id", goqu.L(
|
//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 %s %s)", "web_images.id", "DESC"),
|
// fmt.Sprintf("ROW_NUMBER() OVER(ORDER BY %s %s)", "web_images.id", "DESC"),
|
||||||
).As("row_num"))
|
//).As("row_num"))
|
||||||
}
|
}
|
||||||
|
|
||||||
// 筛选:相似图像
|
// 筛选:相似图像
|
||||||
@@ -1208,18 +1208,17 @@ func NewSchema(config Config) (graphql.Schema, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 如果没有外部排序则使用指定排序(正则sort只能是字母数字下划下)
|
// 如果没有外部排序则使用指定排序(正则sort只能是字母数字下划下)
|
||||||
if p.Args["text"] == nil && p.Args["similar"] == nil && p.Args["interest"] == nil && p.Args["praise"] == nil {
|
if p.Args["similar"] == nil && p.Args["interest"] == nil && p.Args["praise"] == nil {
|
||||||
sort := regexp.MustCompile(`[^a-zA-Z0-9_]`).ReplaceAllString(p.Args["sort"].(string), "")
|
sort := regexp.MustCompile(`[^a-zA-Z0-9_]`).ReplaceAllString(p.Args["sort"].(string), "")
|
||||||
order := regexp.MustCompile(`[^a-zA-Z0-9_]`).ReplaceAllString(p.Args["order"].(string), "")
|
|
||||||
query = query.Select("web_images.id", goqu.L(
|
query = query.Select("web_images.id", goqu.L(
|
||||||
fmt.Sprintf("ROW_NUMBER() OVER(ORDER BY web_images.%s %s)", sort, order),
|
fmt.Sprintf("ROW_NUMBER() OVER(ORDER BY web_images.%s %s)", sort, p.Args["order"].(string)),
|
||||||
).As("row_num"))
|
).As("row_num"))
|
||||||
}
|
}
|
||||||
|
|
||||||
// 图像按点赞顺序排序
|
// 图像按点赞顺序排序 p.Args["sort"].(string) == "praise_time"
|
||||||
if p.Args["praise"] != nil {
|
if p.Args["praise"] != nil {
|
||||||
query = query.Select("web_images.id", goqu.L(
|
query = query.Select("web_images.id", goqu.L(
|
||||||
fmt.Sprintf("ROW_NUMBER() OVER(ORDER BY web_images.%s %s)", "create_time", "DESC"),
|
fmt.Sprintf("ROW_NUMBER() OVER(ORDER BY web_images.%s %s)", "create_time", p.Args["order"].(string)),
|
||||||
).As("row_num"))
|
).As("row_num"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user