Merge branch 'dev3.4.2' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.4.2

udpdataclear/udpSensitiveWords/util/udpdata.go

@@ -46,7 +46,7 @@ func QuerySensitiveWords(sid, eid string) {
 		log.Println("转换eid err", err)
 		return
 	}
-	var num int64
+	var num, unum int64
 	mgoSess := QfwMgo85.GetMgoConn()
 	defer QfwMgo85.DestoryMongoConn(mgoSess)
 	iter := mgoSess.DB(QfwMgo85.DbName).C(Collection).Find(map[string]interface{}{
@@ -59,41 +59,41 @@ func QuerySensitiveWords(sid, eid string) {
 	for tmp := map[string]interface{}{}; iter.Next(&tmp); tmp = map[string]interface{}{} {
 		up := make(map[string]string)
 		if win, isok := tmp["winner"].(string); isok {
-			if fok, flog, fname := cheakname(win); fok && flog != "" {
+			if fok, flog, fname := cheakname(win); fok && flog != "" && flog != "tremQuery" {
 				tmp["winner"] = fname
 				up["winner"] = fmt.Sprintf("%s_%s", flog, win)
 			}
 		}
 		if win, isok := tmp["s_winner"].(string); isok {
-			if fok, flog, fname := cheakname(win); fok && flog != "" {
+			if fok, flog, fname := cheakname(win); fok && flog != "" && flog != "tremQuery" {
 				tmp["s_winner"] = fname
 				up["s_winner"] = fmt.Sprintf("%s_%s", flog, win)
 			}
 		}
 
 		if agency, isok := tmp["agency"].(string); isok {
-			if fok, flog, fname := cheakname(agency); fok && flog != "" {
+			if fok, flog, fname := cheakname(agency); fok && flog != "" && flog != "tremQuery" {
 				tmp["agency"] = fname
 				up["agency"] = fmt.Sprintf("%s_%s", flog, agency)
 			}
 		}
 
 		if buyer, isok := tmp["buyer"].(string); isok {
-			if fok, flog, fname := cheakname(buyer); fok && flog != "" {
+			if fok, flog, fname := cheakname(buyer); fok && flog != "" && flog != "tremQuery" {
 				tmp["buyer"] = fname
 				up["buyer"] = fmt.Sprintf("%s_%s", flog, buyer)
 			}
 		}
 		if len(up) > 0 {
+			unum++
 			tmp["log"] = up
-			//todo update
 			id := tmp["_id"].(primitive.ObjectID).Hex()
 			log.Println(tmp)
-			QfwMgo85.UpdateById(Collection,id,tmp)
+			QfwMgo85.UpdateById(Collection, id, map[string]interface{}{"$set":tmp})
 		}
 		num++
 	}
-	log.Println(sid, eid, "处理完成:", num)
+	log.Printf("%s--->%s 处理完成:%d,更新数:%d\n",sid, eid,  num, unum)
 }
 
 func cheakname(name string) (up bool, log, rname string) {