|
|
@@ -289,6 +289,10 @@ func EsMatchFunctionScoreQuery(indexName, keyWord string, startSize, pageSize in
|
|
|
//matchArr = append(matchArr, matchq2)
|
|
|
n := 0
|
|
|
keyWordLen := len(keyWordArr)
|
|
|
+ if keyWordLen<=0{
|
|
|
+ keyWordArr=append(keyWordArr,keyWord)
|
|
|
+ keyWordLen = len(keyWordArr)
|
|
|
+ }
|
|
|
keyWordWeight := GetWeight(keyWordLen)
|
|
|
for k, v := range keyWordArr {
|
|
|
if v != "" {
|
|
|
@@ -372,20 +376,12 @@ func EsMatchFunctionScoreQuery(indexName, keyWord string, startSize, pageSize in
|
|
|
func EsMultiMatchFunctionScoreQuery(indexName, keyWord string, startSize, pageSize int) (result []*models.SearchItem, total int64, err error) {
|
|
|
client, err := NewClient()
|
|
|
keyWordArr, err := GetIndustryMapNameSliceV2(keyWord)
|
|
|
- fmt.Println(keyWordArr)
|
|
|
+
|
|
|
keyWordArr = RemoveDuplicatesAndEmpty(keyWordArr)
|
|
|
- fmt.Println("-------------------------------")
|
|
|
- fmt.Println(keyWordArr)
|
|
|
-
|
|
|
searchMap := make(map[int]int)
|
|
|
boolquery := elastic.NewBoolQuery()
|
|
|
matchArr := make([]elastic.Query, 0)
|
|
|
- //
|
|
|
- //matchq1 := elastic.NewMatchQuery("Title", keyWord).Boost(n + 1).Analyzer("ik_smart")
|
|
|
- //matchq2 := elastic.NewMatchQuery("BodyText", keyWord).Boost(n + 1).Analyzer("ik_smart")
|
|
|
- //
|
|
|
- //matchArr = append(matchArr, matchq1)
|
|
|
- //matchArr = append(matchArr, matchq2)
|
|
|
+
|
|
|
n := 0
|
|
|
keyWordLen := len(keyWordArr)
|
|
|
keyWordWeight := GetWeight(keyWordLen)
|
|
|
@@ -465,7 +461,6 @@ func GetWeight(length int) []int {
|
|
|
maxVal := utils.GetRandInt(min, min+steep)
|
|
|
intArr = append(intArr, maxVal)
|
|
|
}
|
|
|
- fmt.Println("intArr:", intArr)
|
|
|
}
|
|
|
//数组排序
|
|
|
sort.Slice(intArr, func(i, j int) bool {
|
