|
@@ -2,7 +2,6 @@
|
|
package util
|
|
package util
|
|
|
|
|
|
import (
|
|
import (
|
|
- "context"
|
|
|
|
"encoding/json"
|
|
"encoding/json"
|
|
"fmt"
|
|
"fmt"
|
|
"go.mongodb.org/mongo-driver/bson/primitive"
|
|
"go.mongodb.org/mongo-driver/bson/primitive"
|
|
@@ -180,26 +179,32 @@ func cheakname(name string) (up bool, log, rname string) {
|
|
return false, "", name
|
|
return false, "", name
|
|
}
|
|
}
|
|
func termQuery(name string) bool {
|
|
func termQuery(name string) bool {
|
|
- query := `{"query":{"bool":{"must":[{"term":{"company_name":"` + name + `"}}],"must_not":[],"should":[]}},"from":0,"size":1,"sort":[],"facets":{}}`
|
|
|
|
- tmp := make(map[string]interface{})
|
|
|
|
- json.Unmarshal([]byte(query), &tmp)
|
|
|
|
- Qyxy_Client_Es := es7.GetEsConn()
|
|
|
|
- defer es7.DestoryEsConn(Qyxy_Client_Es)
|
|
|
|
- searchResult, err := Qyxy_Client_Es.Search().Index(Qyxy_Es_index).Type(Qyxy_Es_type).Source(tmp).Do(context.TODO())
|
|
|
|
- if err != nil {
|
|
|
|
- log.Println("从ES查询出错", err.Error(), name)
|
|
|
|
- return false
|
|
|
|
- } else {
|
|
|
|
- data := make(map[string]interface{}, 1)
|
|
|
|
- if searchResult.Hits != nil {
|
|
|
|
- for _, hit := range searchResult.Hits.Hits {
|
|
|
|
- json.Unmarshal(hit.Source, &data)
|
|
|
|
- if data["name"].(string) == name {
|
|
|
|
- return true
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ query := `{"query":{"bool":{"must":[{"term":{"company_name":"` + name + `"}}],"must_not":[],"should":[]}},"from":0,"size":1,"sort":[],"aggs":{}}`
|
|
|
|
+ res := es7.Get(Qyxy_Es_index, query)
|
|
|
|
+ if res != nil {
|
|
|
|
+ if len(*res) > 0 {
|
|
|
|
+ return true
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ //tmp := make(map[string]interface{})
|
|
|
|
+ //json.Unmarshal([]byte(query), &tmp)
|
|
|
|
+ //Qyxy_Client_Es := es7.GetEsConn()
|
|
|
|
+ //defer es7.DestoryEsConn(Qyxy_Client_Es)
|
|
|
|
+ //searchResult, err := Qyxy_Client_Es.Search().Index(Qyxy_Es_index).Type(Qyxy_Es_type).Source(tmp).Do(context.TODO())
|
|
|
|
+ //if err != nil {
|
|
|
|
+ // log.Println("从ES查询出错", err.Error(), name)
|
|
|
|
+ // return false
|
|
|
|
+ //} else {
|
|
|
|
+ // data := make(map[string]interface{}, 1)
|
|
|
|
+ // if searchResult.Hits != nil {
|
|
|
|
+ // for _, hit := range searchResult.Hits.Hits {
|
|
|
|
+ // json.Unmarshal(hit.Source, &data)
|
|
|
|
+ // if data["name"].(string) == name {
|
|
|
|
+ // return true
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
|
|
+ //}
|
|
return false
|
|
return false
|
|
}
|
|
}
|
|
func handleData(datas []string) string {
|
|
func handleData(datas []string) string {
|