no message

fullproject/src_v1/config.json

@@ -15,6 +15,11 @@
         "to": "wangjianghan@topnet.net.cn",
         "api": "http://172.17.145.179:19281/_send/_mail"
     },
+    "bidding": {
+        "addr": "192.168.3.207:27092",
+        "dbname": "qfw",
+        "dbsize": 5
+    },
     "es": {
         "addr": "http://192.168.3.128:9800",
         "index": "projectset",
@@ -30,7 +35,7 @@
         },
         {
             "addr": "127.0.0.1",
-            "port": 1483,
+            "port": 17833,
             "memo": "修改项目创建new"
         }
     ],

fullproject/src_v1/init.go

@@ -13,18 +13,13 @@ import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
-const (
-	ProjectCache = "info" //存放每条项目信息，key为项目ID
-)
-
 var (
 	Sysconfig                                      map[string]interface{} //读取配置文件
-	MongoTool                                      *MongodbSim            //mongodb连接
+	MongoTool, MgoBidding                          *MongodbSim            //mongodb连接
 	ExtractColl, ProjectColl, BackupColl, SiteColl string                 //抽取表、项目表、项目快照表、站点表
 	Thread                                         int                    //配置项线程数
-	//NextNode                 []interface{}
-	BlackList    								   []interface{}
-	BlaskListMap								   map[string]bool
+	BlackList                                      []interface{}
+	BlaskListMap                                   map[string]bool
 )
 
 var (
@@ -62,6 +57,13 @@ func init() {
 		DbName:      Sysconfig["mongodbName"].(string),
 	}
 	MongoTool.InitPool()
+	bidding, _ := Sysconfig["bidding"].(map[string]interface{})
+	MgoBidding = &MongodbSim{
+		MongodbAddr: bidding["addr"].(string),
+		Size:        util.IntAll(bidding["dbsize"]),
+		DbName:      bidding["dbname"].(string),
+	}
+	MgoBidding.InitPool()
 
 	ExtractColl = Sysconfig["extractColl"].(string)
 	ProjectColl = Sysconfig["projectColl"].(string)
@@ -416,7 +418,6 @@ func CosineSimilar(srcWords1, dstWords1 string) float64 {
 	return v1
 }
 
-
 func initWinnerRegexp() {
 	winRegMap := Sysconfig["winner"].(map[string]interface{})
 	preRegexps := winRegMap["pre_regexp"].([]interface{})
@@ -458,7 +459,6 @@ func initWinnerRegexp() {
 	BlackRegexp["winner"] = winBlackRegexps
 }
 
-
 func initBuyerRegexp() {
 	buyRegMap := Sysconfig["buyer"].(map[string]interface{})
 	preRegexps := buyRegMap["pre_regexp"].([]interface{})
@@ -540,4 +540,3 @@ func initAgencyRegexp() {
 	}
 	BlackRegexp["agency"] = winBlackRegexps
 }
-

fullproject/src_v1/task.go

@@ -339,7 +339,7 @@ func (p *ProjectTask) taskZl(udpInfo map[string]interface{}) {
 func (p *ProjectTask) taskUpdateInfo(udpInfo map[string]interface{}) {
 	defer util.Catch()
 	infoid := udpInfo["infoid"].(string)
-	infoMap := MongoTool.FindById(ExtractColl, infoid)
+	infoMap := MgoBidding.FindById(util.ObjToString(udpInfo["coll"]), infoid)
 	if infoMap["modifyinfo"] == nil {
 		util.Debug("does not exist modifyinfo ---,", infoid)
 		return
@@ -490,7 +490,6 @@ func (p *ProjectTask) enter(db, coll string, q map[string]interface{}) {
 						p.CommonMerge(tmp, info)
 					} else {
 						//信息错误,进行更新
-						util.Debug(tmp["_id"])
 						countRepeat++
 					}
 				}(tmp)

qyxy/src/task.go

@@ -371,31 +371,31 @@ func QyxyStandard() bool {
 
 			}
 			//es数据过滤
-			//EsSaveFlag := true
-			//company_name := qu.ObjToString(esMap["company_name"])
-			//if len([]rune(company_name)) < 8 {
-			//	EsSaveFlag = false
-			//}
-			//if EsSaveFlag {
-			//	company_type := qu.ObjToString(esMap["company_type"])
-			//	if company_type == "" || company_type == "个体工商户" {
-			//		EsSaveFlag = false
-			//	}
-			//}
-			//if EsSaveFlag {
-			//	credit_no := strings.TrimSpace(qu.ObjToString(esMap["credit_no"]))
-			//	company_code := strings.TrimSpace(qu.ObjToString(esMap["company_code"]))
-			//	if credit_no == "" && company_code == "" {
-			//		EsSaveFlag = false
-			//	}
-			//}
-			////qu.Debug("esMap---", esMap)
-			//// qu.Debug("mgoMap---", mgoMap)
-			//// return
+			EsSaveFlag := true
+			company_name := qu.ObjToString(esMap["company_name"])
+			if len([]rune(company_name)) < 8 {
+				EsSaveFlag = false
+			}
+			if EsSaveFlag {
+				company_type := qu.ObjToString(esMap["company_type"])
+				if company_type == "" || company_type == "个体工商户" {
+					EsSaveFlag = false
+				}
+			}
+			if EsSaveFlag {
+				credit_no := strings.TrimSpace(qu.ObjToString(esMap["credit_no"]))
+				company_code := strings.TrimSpace(qu.ObjToString(esMap["company_code"]))
+				if credit_no == "" && company_code == "" {
+					EsSaveFlag = false
+				}
+			}
+			//qu.Debug("esMap---", esMap)
+			// qu.Debug("mgoMap---", mgoMap)
+			// return
 			lock.Lock()
-			//if EsSaveFlag {
-			//	EsSaveCache <- esMap //过滤后数据保存
-			//}
+			if EsSaveFlag {
+				EsSaveCache <- esMap //过滤后数据保存
+			}
 			EsSaveAllCache <- esMap //所有数据保存
 			update = append(update, map[string]interface{}{"$set": mgoMap})
 			if len(update) == 2 {