|
|
@@ -361,14 +361,8 @@ func EsAddOrEditComprehensiveData(indexName string, item *ElasticComprehensiveDe
|
|
|
func EsComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*SearchComprehensiveItem, total int64, err error) {
|
|
|
indexName := utils.IndexNameComprehensive
|
|
|
client := utils.Client
|
|
|
- keyWordArr, err := GetIndustryMapNameSliceV3(keyWord)
|
|
|
- keyWordArr = RemoveDuplicatesAndEmpty(keyWordArr)
|
|
|
- keyWordLen := len(keyWordArr)
|
|
|
- if keyWordLen <= 0 {
|
|
|
- keyWordArr = append(keyWordArr, keyWord)
|
|
|
- keyWordLen = len(keyWordArr)
|
|
|
- }
|
|
|
- fmt.Println(keyWordArr)
|
|
|
+ var keyWordArr []string
|
|
|
+ keyWordArr = append(keyWordArr, keyWord)
|
|
|
|
|
|
//Es 的高级查询有 自定义排序 文档一时半会儿撸不懂，先做多次查询手动过滤 2023.2.2
|
|
|
//ikType 查询方式 ，0：查所有 、 1:查询键入词 、 2：查询除了查询键入词之外的联想词
|
|
|
@@ -379,8 +373,6 @@ func EsComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*S
|
|
|
mustNotMap := make([]interface{}, 0)
|
|
|
shouldNotMap := make(map[string]interface{}, 0)
|
|
|
shouldNotMapquery := make([]interface{}, 0)
|
|
|
- // @Param OrderColumn query int true "排序字段 ，Comprehensive综合 ，Matching匹配度 ，PublishDate 发布时间 "
|
|
|
- //keyWordWeight := GetWeight(keyWordLen)
|
|
|
var boost int
|
|
|
//lenkeyWordArr := len(keyWordArr)
|
|
|
for k, v := range keyWordArr {
|
xingzai