Merge branch 'dev/v1.0.3_rjj' of SocialPlatform/knowledgeBase into feature/v1.0.3

rpc/knowledge/internal/service/commonPhrasesService.go

@@ -195,7 +195,7 @@ func (c *CommonPhrasesService) CommonPhraseQuery(param *knowledgeclient.CommonPh
 		keyWords = param.Query
 	}
 	//logx.Info("entId:", SE.Decode4Hex(param.RobotEntId))
-	var query = util.DSL4SearchByKwsOrid(keyWords, strconv.Itoa(int(param.EntId)))
+	var query = util.DSL4SearchByKwsOrid(keyWords, strconv.Itoa(int(param.EntId)), 1)
 	res := elastic.GetAllByNgram(INDEX, TYPE, query, "", "", searchField, 0, findCount, 0, false)
 	if res != nil && len(*res) > 0 {
 		for _, val := range *res {

rpc/knowledge/internal/service/knowledgeService.go

@@ -245,7 +245,7 @@ func (k *KnowledgeService) RecommendAnswer(param *knowledgeclient.FindAnswerReq,
 		keyWords = param.Question
 	}
 	//logx.Info("entId:", SE.Decode4Hex(param.RobotEntId))
-	var query = util.DSL4SearchByKwsOrid(keyWords, param.RobotEntId)
+	var query = util.DSL4SearchByKwsOrid(keyWords, param.RobotEntId, 0)
 	limit := 3
 	if param.ReqSource == 1 {
 		limit = recommendQuestionCount

rpc/knowledge/util/elasticsearch_dsl.go

@@ -49,14 +49,18 @@ func DSL4SmartResponse(question string, entId string, msgType int, addr, index,
 	return ""
 }
 
-func DSL4SearchByKwsOrid(keyWords string, entId string) string {
+func DSL4SearchByKwsOrid(keyWords string, entId string, mark int) string {
 
 	var (
 		sql        = `{"query": {"bool": {"must": [%s%s]}}}`
 		queryMatch = `{"match":{"keywords":{"query":"%s","minimum_should_match":"%s"}}}`
 		ridTerms   = `,{"term":{"entId":%s}}`
 	)
-	queryMatch = fmt.Sprintf(queryMatch, keyWords, "20%")
+	if mark == 1 {
+		queryMatch = fmt.Sprintf(queryMatch, keyWords, "30%")
+	} else {
+		queryMatch = fmt.Sprintf(queryMatch, keyWords, "20%")
+	}
 	ridTerms = fmt.Sprintf(ridTerms, entId)
 	sql = fmt.Sprintf(sql, queryMatch, ridTerms)
 	//log.Println("sql", sql)