zhengkun 2 ani în urmă
părinte
comite
9d90649d6d

+ 1 - 1
sensitive/src/config.json

@@ -24,7 +24,7 @@
   "client_es": "http://ela.spdata.jianyu360.com",
   "es_type": "unique_qy",
   "es_index": "unique_qy",
-  "qyxy_client_es":"http://127.0.0.1:13002",
+  "qyxy_client_es":"http://127.0.0.1:13003",
   "qyxy_es_type":"qyxy",
   "qyxy_es_index":"qyxy"
 }

+ 2 - 3
sensitive/src/main.go

@@ -10,9 +10,8 @@ func init() {
 	ul.InitC()
 }
 func main() {
-	go ul.AddTaskSensitiveWordsData() //增量-新增
-	//ul.SentiveUdp()                   //数据流程-增量
-
+	//go ul.AddTaskSensitiveWordsData() //增量-新增
+	//ul.SentiveUdp() //数据流程-增量
 	//ul.TestData() //临时测试数据
 
 	lock := make(chan bool)

+ 1 - 1
sensitive/src/util/increasedata.go

@@ -11,7 +11,7 @@ import (
 //定时增量数据处理
 func AddTaskSensitiveWordsData() {
 	log.Println("部署定时新增...")
-	//runStartOnce()
+	runStartOnce()
 	for {
 		tick := time.Tick(time.Hour * 24 * 7) //查询七天前
 		ctime := <-tick

+ 0 - 1
sensitive/src/util/init.go

@@ -48,7 +48,6 @@ func InitC() {
 
 	//初始化Es qyxy
 	//Qyxy_Client_Es, _ = elastic.NewClient(http.DefaultClient, Sysconfig["qyxy_client_es"].(string))
-
 	es7.InitElasticSize(Sysconfig["qyxy_client_es"].(string), 10, "es_all", "TopJkO2E_d1x")
 	Qyxy_Es_type, Qyxy_Es_index = Sysconfig["qyxy_es_type"].(string), Sysconfig["qyxy_es_index"].(string)
 

+ 2 - 2
sensitive/src/util/test.go

@@ -9,7 +9,7 @@ import (
 //测试方法
 func TestData() {
 	termQuery("唐双发")
-
+	return
 	sess := Save_Mgo.GetMgoConn()
 	defer Save_Mgo.DestoryMongoConn(sess)
 	q := map[string]interface{}{
@@ -43,4 +43,4 @@ func TestData() {
 		tmp = map[string]interface{}{}
 	}
 	log.Println("is over ", total, isok)
-}
+}

+ 24 - 19
sensitive/src/util/udpdata.go

@@ -2,7 +2,6 @@
 package util
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -180,26 +179,32 @@ func cheakname(name string) (up bool, log, rname string) {
 	return false, "", name
 }
 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
 }
 func handleData(datas []string) string {