修改bug

udp_winner/config.json

@@ -1,30 +1,30 @@
 {
-  "elasticsearch": "http://127.0.0.1:9800",
-  "elasticsearch_index": "localhost_winner",
-  "elasticsearch_type": "mytestwinner",
-  "elasticsearch_buyer_index": "localhost_buyer",
-  "elasticsearch_buyer_type": "mytestbuyer",
-  "elasticsearch_agency_index": "localhost_agency",
-  "elasticsearch_agency_type": "mytestagency",
-  "udpport": "127.0.0.1:12311",
-  "port": "12311",
+  "elasticsearch": "http://172.17.145.170:9800",
+  "elasticsearch_index": "winner_enterprise",
+  "elasticsearch_type": "winnerent",
+  "elasticsearch_buyer_index": "buyer_enterprise",
+  "elasticsearch_buyer_type": "buyerent",
+  "elasticsearch_agency_index": "agency_enterprise",
+  "elasticsearch_agency_type": "agencyent",
+  "udpport": "127.0.0.1:12678",
+  "port": "12678",
   "pool_size": "10",
-  "mgoinit": "127.0.0.1:27017",
-  "mgodb_bidding": "qfw",
-  "mgodb_mgoinit_c": "bidding",
+  "mgoinit": "172.17.145.163:27082",
+  "mgodb_bidding": "extract_v3",
+  "mgodb_mgoinit_c": "buyer",
   "mgodb_enterprise": "enterprise",
   "mgodb_enterprise_c": "qyxy",
   "mgourl2": "192.168.3.207:27092",
-  "mgourl": "127.0.0.1:27017",
-  "mgodb_extract_kf": "extract_kf",
-  "mgo_qyk_c": "enterprise_qyxy",
-  "mgo_qyk_buyer": "buyer_qyxy",
-  "mgo_qyk_agency": "agency_qyxy",
+  "mgourl": "172.17.145.163:27082",
+  "mgodb_extract_kf": "extract_v3",
+  "mgo_qyk_c": "winner_enterprise",
+  "mgo_qyk_buyer": "buyer_enterprise",
+  "mgo_qyk_agency": "agency_enterprise",
   "mgo_qyk_reg": "rc_rule",
-  "redis": "127.0.0.1:6379",
+  "redis": "172.17.148.44:1479",
   "redis_winner_db": "1",
   "redis_buyer_db": "2",
   "redis_agency_db": "3",
   "chan_pool_num": "10",
-  "his_redis": "127.0.0.1:6380"
+  "his_redis": "172.17.148.44:2579"
 }

udp_winner/text.md

@@ -13,6 +13,73 @@
   "redis": "172.17.148.44:1479"
 }
 
+//本地
+{
+  "elasticsearch": "http://127.0.0.1:9800",
+  "elasticsearch_index": "localhost_winner",
+  "elasticsearch_type": "mytestwinner",
+  "elasticsearch_buyer_index": "localhost_buyer",
+  "elasticsearch_buyer_type": "mytestbuyer",
+  "elasticsearch_agency_index": "localhost_agency",
+  "elasticsearch_agency_type": "mytestagency",
+  "udpport": "127.0.0.1:12311",
+  "port": "12311",
+  "pool_size": "10",
+  "mgoinit": "127.0.0.1:27017",
+  "mgodb_bidding": "qfw",
+  "mgodb_mgoinit_c": "bidding",
+  "mgodb_enterprise": "enterprise",
+  "mgodb_enterprise_c": "qyxy",
+  "mgourl2": "192.168.3.207:27092",
+  "mgourl": "127.0.0.1:27017",
+  "mgodb_extract_kf": "extract_kf",
+  "mgo_qyk_c": "enterprise_qyxy",
+  "mgo_qyk_buyer": "buyer_qyxy",
+  "mgo_qyk_agency": "agency_qyxy",
+  "mgo_qyk_reg": "rc_rule",
+  "redis": "127.0.0.1:6379",
+  "redis_winner_db": "1",
+  "redis_buyer_db": "2",
+  "redis_agency_db": "3",
+  "chan_pool_num": "10",
+  "his_redis": "127.0.0.1:6380"
+}
+
+
+//线上
+{
+  "elasticsearch": "http://172.17.145.170:9800",
+  "elasticsearch_index": "winner_enterprise",
+  "elasticsearch_type": "winnerent",
+  "elasticsearch_buyer_index": "localhost_buyer",
+  "elasticsearch_buyer_type": "mytestbuyer",
+  "elasticsearch_agency_index": "localhost_agency",
+  "elasticsearch_agency_type": "mytestagency",
+  "udpport": "127.0.0.1:1486",
+  "port": "12311",
+  "pool_size": "10",
+  "mgoinit": "10.30.94.175:27081,10.81.232.246:27082,10.172.242.243:27080",
+  "mgodb_bidding": "qfw",
+  "mgodb_mgoinit_c": "bidding",
+  "mgodb_enterprise": "enterprise",
+  "mgodb_enterprise_c": "qyxy",
+  "mgourl2": "192.168.3.207:27092",
+  "mgourl": "172.17.145.163:27082",
+  "mgodb_extract_kf": "extract_v3",
+  "mgo_qyk_c": "winner_enterprise",
+  "mgo_qyk_buyer": "buyer_enterprise",
+  "mgo_qyk_agency": "agency_enterprise",
+  "mgo_qyk_reg": "rc_rule",
+  "redis": "172.17.148.44:1479",
+  "redis_winner_db": "1",
+  "redis_buyer_db": "2",
+  "redis_agency_db": "3",
+  "chan_pool_num": "10",
+  "his_redis": "127.0.0.1:6380"
+}
+
+
+
 中标单位企业库
 /file/udpwinnerent_1486
 172.17.145.163 

udp_winner/timedTaskAgency.go

@@ -124,7 +124,7 @@ func TaskAgency(mapinfo *map[string]interface{}) {
 					//拿到合并后的qyk
 					FClient.DbName = Config["mgodb_extract_kf"]
 					oldTmp, b := FClient.FindById(Config["mgo_qyk_agency"], reply, nil)
-					if !b || oldTmp == nil {
+					if !b || (*oldTmp) == nil|| reply==""||(*oldTmp)["_id"]==nil{
 						log.Println(redisCName, "存量 redis id 不存在", reply)
 						continue
 					}
@@ -236,7 +236,7 @@ func TaskAgency(mapinfo *map[string]interface{}) {
 				//拿到合并后的qyk
 				FClient.DbName = Config["mgodb_extract_kf"]
 				oldTmp, b := FClient.FindById(Config["mgo_qyk_agency"], reply, bson.M{})
-				if !b || oldTmp == nil {
+				if !b || (*oldTmp) == nil|| reply==""||(*oldTmp)["_id"]==nil{
 					log.Println("redis id 不存在")
 					continue
 				}
@@ -338,7 +338,7 @@ func TimedTaskAgency() {
 			if !iter.Next(&tmpLast) {
 				//临时表无数据
 				log.Println("临时表无数据:")
-				t2.Reset(time.Second * 15)
+				t2.Reset(time.Minute * 5)
 				FClient.DestoryMongoConn(Fcconn)
 				continue
 			} else {
@@ -611,6 +611,7 @@ func TimedTaskAgency() {
 					}
 				}
 				FClient.DestoryMongoConn(fconn)
+				log.Println("buyer_new,遍历完成")
 			}
 		}
 		FClient.DestoryMongoConn(Fcconn)

udp_winner/timedTaskBuyer.go

@@ -124,8 +124,8 @@ func TaskBuyer(mapinfo *map[string]interface{}) {
 					//拿到合并后的qyk
 					FClient.DbName = Config["mgodb_extract_kf"]
 					oldTmp, b := FClient.FindById(Config["mgo_qyk_buyer"], reply, nil)
-					if !b || oldTmp == nil {
-						log.Println(redisCName, "存量 redis id 不存在", reply)
+					if !b || (*oldTmp) == nil|| reply==""||(*oldTmp)["_id"]==nil{
+						log.Println(redisCName, "存量 redis id 不存在", reply,"数据：",oldTmp)
 						continue
 					}
 					tmpTopscopeclass := []string{}
@@ -254,7 +254,7 @@ func TaskBuyer(mapinfo *map[string]interface{}) {
 				//拿到合并后的qyk
 				FClient.DbName = Config["mgodb_extract_kf"]
 				oldTmp, b := FClient.FindById(Config["mgo_qyk_buyer"], reply, bson.M{})
-				if !b || oldTmp == nil {
+				if !b || (*oldTmp) == nil|| reply==""||(*oldTmp)["_id"]==nil{
 					log.Println("redis id 不存在")
 					continue
 				}
@@ -375,7 +375,7 @@ func TimedTaskBuyer() {
 			if !iter.Next(&tmpLast) {
 				//临时表无数据
 				log.Println("临时表无数据:")
-				t2.Reset(time.Second * 15)
+				t2.Reset(time.Minute * 5)
 				FClient.DestoryMongoConn(Fcconn)
 				continue
 			} else {
@@ -388,7 +388,7 @@ func TimedTaskBuyer() {
 				}).Sort("_id").Iter()
 				if cursor == nil {
 					log.Println("查询失败")
-					t2.Reset(time.Second * 15)
+					t2.Reset(time.Second * 5)
 					FClient.DestoryMongoConn(fconn)
 					continue
 				}
@@ -461,7 +461,7 @@ func TimedTaskBuyer() {
 						continue
 					} else {
 						//log.Println(123)
-						//匹配到原始库,新增 resulttmp
+						//匹配到原始库,新增 resulttmp    buyer
 						if (*resulttmp)["credit_no"] != nil {
 							if credit_no, ok := (*resulttmp)["credit_no"].(string); ok && strings.TrimSpace(credit_no) != "" &&
 								len(strings.TrimSpace(credit_no)) > 8 {
@@ -593,10 +593,18 @@ func TimedTaskBuyer() {
 									savetmp[sk] = (*resulttmp)["company_address"]
 								}
 								continue
+							}else if sk == "buyerclass" {
+								if tmp["buyerclass"]==nil {
+									savetmp[sk] = ""
+								}else {
+									savetmp[sk] = tmp["buyerclass"]
+								}
+								continue
 							}
 
+
 							if (*resulttmp)[sk] == nil && sk != "history_name" && sk != "wechat_accounts" &&
-								sk != "buyer_name" && sk != "address" &&
+								sk != "buyer_name" && sk != "address" && sk != "buyerclass"&&
 								sk != "contact" && sk != "report_websites" {
 								savetmp[sk] = ""
 							} else {
@@ -648,6 +656,7 @@ func TimedTaskBuyer() {
 
 				}
 				FClient.DestoryMongoConn(fconn)
+				log.Println("buyer_new,遍历完成")
 			}
 		}
 		FClient.DestoryMongoConn(Fcconn)

udp_winner/timedTaskWinner.go

@@ -125,7 +125,7 @@ func TaskWinner(mapinfo *map[string]interface{}) {
 					//拿到合并后的qyk
 					FClient.DbName = Config["mgodb_extract_kf"]
 					oldTmp, b := FClient.FindById(Config["mgo_qyk_c"], reply, nil)
-					if !b || oldTmp == nil {
+					if !b || (*oldTmp) == nil|| reply==""||(*oldTmp)["_id"]==nil{
 						log.Println(redisCName, "存量 redis id 不存在", reply)
 						continue
 					}
@@ -246,7 +246,7 @@ func TaskWinner(mapinfo *map[string]interface{}) {
 				//拿到合并后的qyk
 				FClient.DbName = Config["mgodb_extract_kf"]
 				oldTmp, b := FClient.FindById(Config["mgo_qyk_c"], reply, bson.M{})
-				if !b || oldTmp == nil {
+				if !b || (*oldTmp) == nil|| reply==""||(*oldTmp)["_id"]==nil{
 					log.Println("redis id 不存在")
 					continue
 				}
@@ -651,6 +651,7 @@ func TimedTaskWinner() {
 					}
 				}
 				FClient.DestoryMongoConn(fconn)
+				log.Println("winner_new,遍历完成")
 			}
 		}
 		FClient.DestoryMongoConn(Fcconn)