规则-注释清理-正式提交

udpdataclear/udpSensitiveWords/main.go

@@ -1,28 +1,14 @@
 package main
 
 import (
-	"log"
 	"sensitiveWords.udp/util"
-	"time"
 )
 
 func init() {
-	return
 	util.InitC()
 }
 func main() {
-
-	//go util.AddTaskSensitiveWordsData() //增量
-	start := int(time.Now().Unix())
-
-	util.TemporaryDataQYXY()
-	util.TemporaryReadyEsData()
-	util.TemporaryTest()
-	util.TemporaryTestNewData()
-
-	log.Println("全部结束-耗时：",int(time.Now().Unix())-start,"秒")
-
-	return
+	go util.AddTaskSensitiveWordsData() //增量
 	// 主函数中添加
 	util.ExtractUdp() //udp通知抽取
 	lock := make(chan bool)

udpdataclear/udpSensitiveWords/util/udpdata.go

@@ -273,19 +273,11 @@ func AddTaskSensitiveWordsData() {
 			err := findByupdate.Decode(&tmp)
 			if err == nil {
 				if company_name, ok := tmp["company_name"].(string); ok {
-					if reglen.MatchString(company_name) || strReg.MatchString(company_name) ||
-						!uncon_strReg.MatchString(company_name) || !unstart_strReg.MatchString(company_name) ||
-						start_strReg.MatchString(company_name) || end_strReg.MatchString(company_name) ||
+
+					if strReg.MatchString(company_name) || !unstart_strReg.MatchString(company_name) ||
 						con_strReg.MatchString(company_name) {
-						continue
-					}
-					if strings.Contains(ObjToString(tmp["company_type"]), "个人") ||
-						strings.Contains(ObjToString(tmp["company_type"]), "个体") ||
-						strings.Contains(ObjToString(tmp["company_type_old"]), "个人") ||
-						strings.Contains(ObjToString(tmp["company_type_old"]), "个体") {
-						continue
+						return
 					}
-
 					//存mgo
 					new_tmp ,err:= con.Database("mixdata").Collection("unique_qyxy").InsertOne(nil, bson.M{
 						"qy_name": company_name,
@@ -293,10 +285,7 @@ func AddTaskSensitiveWordsData() {
 					if err==nil {
 						dealWithEsData(company_name, BsonTOStringId(new_tmp.InsertedID))
 					}
-					//存敏感词
-
 
-					//存es=判断+新增
 
 				}
 			}
@@ -321,7 +310,6 @@ func dealWithEsData(name string, tmpid string) {
 			}
 		}
 		if len(data) == 0 {
-			//log.Println("无数据-新增")
 			_, err := Client_Es.Index().Index(es_index).Type(es_type).Id(tmpid).BodyJson(map[string]interface{}{
 				"name":      name,
 				"name_word": name,

udpdataclear/udpSensitiveWords/util/words.go

@@ -96,7 +96,7 @@ func dealWithNameScoreRules(name string) (string, bool, float64 , []map[string]i
 }
 
 func dealWithPreRule(name string , new_name string) bool {
-	log.Println("规则时：",name,new_name)
+	//log.Println("规则时：",name,new_name)
 	endstr := endWordReg.FindString(new_name)
 	if endstr !="" {
 		new_name = strings.ReplaceAll(new_name,endstr,"")
@@ -175,7 +175,7 @@ func dealWithPreRule(name string , new_name string) bool {
 
 
 
-	log.Println("最终清理后-",name,new_name)
+	//log.Println("最终清理后-",name,new_name)
 	if name==new_name {
 		return true
 	}