From 45ba7ea00328058963ffe33a0aa7a85892edef07 Mon Sep 17 00:00:00 2001
From: Havoc412 <2993167370@qq.com>
Date: Thu, 14 Nov 2024 21:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20finish=20es=20highlight?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/global/consts/style.go               |  6 ++++++
 app/model_es/animal.go                   |  7 ++++---
 app/model_es/encounter.go                | 11 ++++++++---
 app/model_es/knowledge.go                |  7 ++++---
 app/service/animals/curd/animals_curd.go |  2 +-
 5 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 app/global/consts/style.go

diff --git a/app/global/consts/style.go b/app/global/consts/style.go
new file mode 100644
index 0000000..705216a
--- /dev/null
+++ b/app/global/consts/style.go
@@ -0,0 +1,6 @@
+package consts
+
+const (
+	PreTags  string = `<span style=\"color: #0062FF;\">`
+	PostTags string = "</span>"
+)
diff --git a/app/model_es/animal.go b/app/model_es/animal.go
index f5e1e7f..72e12aa 100644
--- a/app/model_es/animal.go
+++ b/app/model_es/animal.go
@@ -2,6 +2,7 @@ package model_es
 
 import (
 	"bytes"
+	"catface/app/global/consts"
 	"catface/app/global/variable"
 	"catface/app/model"
 	"catface/app/utils/data_bind"
@@ -89,8 +90,8 @@ func (a *Animal) QueryDocumentsMatchAll(query string, num int) ([]Animal, error)
     }
   },
   "highlight": {
-    "pre_tags": ["<em>"],
-    "post_tags": ["</em>"],
+	"pre_tags": ["%v"],
+	"post_tags": ["%v"],
     "fields": {
       "name": {},
       "nick_names": {
@@ -102,7 +103,7 @@ func (a *Animal) QueryDocumentsMatchAll(query string, num int) ([]Animal, error)
       }
     }
   }
-}`, num, query, query, query)
+}`, num, query, query, query, consts.PreTags, consts.PostTags)
 
 	hits, err := model_handler.SearchRequest(body, a.IndexName())
 	if err != nil {
diff --git a/app/model_es/encounter.go b/app/model_es/encounter.go
index 895e639..5eaf09e 100644
--- a/app/model_es/encounter.go
+++ b/app/model_es/encounter.go
@@ -2,6 +2,7 @@ package model_es
 
 import (
 	"bytes"
+	"catface/app/global/consts"
 	"catface/app/global/variable"
 	"catface/app/model"
 	"catface/app/utils/data_bind"
@@ -144,8 +145,8 @@ func (e *Encounter) QueryDocumentsMatchAll(query string, num int) ([]Encounter,
     }
   },
   "highlight": {
-    "pre_tags": ["<em>"],
-    "post_tags": ["</em>"],
+    "pre_tags": ["%v"],
+    "post_tags": ["%v"],
     "fields": {
       "title": {},
       "content": {
@@ -157,7 +158,7 @@ func (e *Encounter) QueryDocumentsMatchAll(query string, num int) ([]Encounter,
       }
     }
   }
-}`, num, query, query, query)
+}`, num, query, query, query, consts.PreTags, consts.PostTags)
 
 	hits, err := model_handler.SearchRequest(body, e.IndexName())
 	if err != nil {
@@ -173,6 +174,10 @@ func (e *Encounter) QueryDocumentsMatchAll(query string, num int) ([]Encounter,
 			continue
 		}
 
+		if len(encounter.Content) > 15*3 {
+			encounter.Content = encounter.Content[:15*3] + "..."
+		}
+
 		encounters = append(encounters, encounter)
 	}
 
diff --git a/app/model_es/knowledge.go b/app/model_es/knowledge.go
index 24700a9..f961072 100644
--- a/app/model_es/knowledge.go
+++ b/app/model_es/knowledge.go
@@ -2,6 +2,7 @@ package model_es
 
 import (
 	"bytes"
+	"catface/app/global/consts"
 	"catface/app/global/variable"
 	"catface/app/utils/data_bind"
 	"catface/app/utils/model_handler"
@@ -165,8 +166,8 @@ func (k *Knowledge) QueryDocumentsMatchAll(query string, num int) ([]Knowledge,
     }
   },
  "highlight": {
-    "pre_tags": ["<em>"],
-    "post_tags": ["</em>"],
+    "pre_tags": ["%v"],
+    "post_tags": ["%v"],
     "fields": {
       "title": {},
       "content": {
@@ -174,7 +175,7 @@ func (k *Knowledge) QueryDocumentsMatchAll(query string, num int) ([]Knowledge,
       }
     }
   }
-}`, num, query, query) // TODO dirs 我还没想好如何处理
+}`, num, query, query, consts.PreTags, consts.PostTags) // TODO dirs 我还没想好如何处理
 	// 创建请求
 	req := esapi.SearchRequest{
 		Index: []string{k.IndexName()},
diff --git a/app/service/animals/curd/animals_curd.go b/app/service/animals/curd/animals_curd.go
index 78c0586..1010fa9 100644
--- a/app/service/animals/curd/animals_curd.go
+++ b/app/service/animals/curd/animals_curd.go
@@ -138,7 +138,7 @@ func (a *AnimalsCurd) MatchAll(query string, num int) (tmp []model.Animal) {
 	}
 
 	// STAGE 2. MySQL 补充信息
-	animalsFromSQL := model.CreateAnimalFactory("").ShowByIDs(ids, "id", "avatar")
+	animalsFromSQL := model.CreateAnimalFactory("").ShowByIDs(ids, "id", "avatar", "status", "department")
 
 	// 3. 合并信息
 	for _, animalFromES := range animalsFromES {