Jelajahi Sumber

项目名称标题

zhangjinkun 6 tahun lalu
induk
melakukan
60d47d5099
3 mengubah file dengan 10 tambahan dan 20 penghapusan
  1. 2 4
      src/jy/extract/exportask.go
  2. 2 4
      src/jy/extract/extract.go
  3. 6 12
      src/jy/extract/extractudp.go

+ 2 - 4
src/jy/extract/exportask.go

@@ -59,10 +59,8 @@ func extractAndExport(v string, t map[string]interface{}) {
 	limit := qu.IntAll(t["limit"])
 	list, _ := e.TaskInfo.FDB.Find(e.TaskInfo.FromColl, query, nil, Fields, false, 0, limit)
 	for _, v := range *list {
-		if v["check_sensitive2"] != nil { //去除含敏感词数据
-			if v["check_sensitive2"].(string) != "" {
-				continue
-			}
+		if qu.ObjToString(v["check_sensitive2"]) != "" { //去除含敏感词数据
+			continue
 		}
 		j := PreInfo(v)
 		e.TaskInfo.ProcessPool <- true

+ 2 - 4
src/jy/extract/extract.go

@@ -148,10 +148,8 @@ func RunExtractTask(taskId string) {
 		log.Printf("page=%d,query=%v", i+1, query)
 		list, _ := ext.TaskInfo.FDB.Find(ext.TaskInfo.FromColl, query, nil, Fields, false, 0, limit)
 		for _, v := range *list {
-			if v["check_sensitive2"] != nil { //去除含敏感词数据
-				if v["check_sensitive2"].(string) != "" {
-					continue
-				}
+			if qu.ObjToString(v["check_sensitive2"]) != "" { //去除含敏感词数据
+				continue
 			}
 			//log.Println(v["_id"])
 			if !ext.IsRun {

+ 6 - 12
src/jy/extract/extractudp.go

@@ -136,10 +136,8 @@ func ExtractByUdp(sid, eid string, instanceId ...string) {
 			if ext.TaskInfo.FDB.Count(ext.TaskInfo.FromColl, query) > 0 {
 				list, _ := ext.TaskInfo.FDB.Find(ext.TaskInfo.FromColl, query, nil, Fields, false, 0, limit)
 				for _, v := range *list {
-					if v["check_sensitive2"] != nil { //去除含敏感词数据
-						if v["check_sensitive2"].(string) != "" {
-							continue
-						}
+					if qu.ObjToString(v["check_sensitive2"]) != "" { //去除含敏感词数据
+						continue
 					}
 					//log.Println(v["_id"])
 					j := PreInfo(v)
@@ -157,10 +155,8 @@ func ExtractByUdp(sid, eid string, instanceId ...string) {
 			if ext.TaskInfo.FDB.Count(ext.TaskInfo.FromColl+"_back", queryback) > 0 {
 				list2, _ := ext.TaskInfo.FDB.Find(ext.TaskInfo.FromColl+"_back", queryback, nil, Fields, false, 0, limit)
 				for _, v := range *list2 {
-					if v["check_sensitive2"] != nil { //去除含敏感词数据
-						if v["check_sensitive2"].(string) != "" {
-							continue
-						}
+					if qu.ObjToString(v["check_sensitive2"]) != "" { //去除含敏感词数据
+						continue
 					}
 					//log.Println(v["_id"])
 					j := PreInfo(v)
@@ -192,10 +188,8 @@ func ExtractByUdp(sid, eid string, instanceId ...string) {
 			log.Printf("page=%d,query=%v", i+1, query)
 			list, _ := ext.TaskInfo.FDB.Find(ext.TaskInfo.FromColl, query, nil, Fields, false, 0, limit)
 			for _, v := range *list {
-				if v["check_sensitive2"] != nil { //去除含敏感词数据
-					if v["check_sensitive2"].(string) != "" {
-						continue
-					}
+				if qu.ObjToString(v["check_sensitive2"]) != "" { //去除含敏感词数据
+					continue
 				}
 				//log.Println(v["_id"])
 				j := PreInfo(v)