修改-企业标准化程序

data_monitoring/listen_data/src/main.go

@@ -87,34 +87,34 @@ func main()  {
 	//}
 	//python_mgo.InitPool()
 
+	save_mgo = &MongodbSim{
+		MongodbAddr: "172.17.4.85:27080",
+		DbName:      "qfw",
+		Size:        20,
+		UserName: "",
+		Password: "",
+	}
+	save_mgo.InitPool()
+
 	//save_mgo = &MongodbSim{
-	//	MongodbAddr: "172.17.4.85:27080",
-	//	DbName:      "qfw",
-	//	Size:        20,
+	//	MongodbAddr: "172.17.4.87:27080",
+	//	DbName:      "datamark",
+	//	Size:        10,
 	//	UserName: "",
 	//	Password: "",
 	//}
 	//save_mgo.InitPool()
 
 	//save_mgo = &MongodbSim{
-	//	MongodbAddr: "172.17.4.87:27080",
-	//	DbName:      "datamark",
+	//	MongodbAddr: "127.0.0.1:27017",
+	//	DbName:      "zhengkun",
 	//	Size:        10,
 	//	UserName: "",
 	//	Password: "",
 	//}
 	//save_mgo.InitPool()
 
-	save_mgo = &MongodbSim{
-		MongodbAddr: "127.0.0.1:27017",
-		DbName:      "zhengkun",
-		Size:        10,
-		UserName: "",
-		Password: "",
-	}
-	save_mgo.InitPool()
-
-	exportErrQuanGuoData()
+	filterDataBuyerWinnerLength()
 
 	return
 

data_monitoring/listen_data/src/zkmethod.go

@@ -106,6 +106,29 @@ func encodeJyUrl()  {
 	log.Debug(Encode)
 }
 
+func filterDataBuyerWinnerLength()  {
+	reg := regexp.MustCompile(`^.{2}([大|小|中|学][学|院]|公司)$`)
+	sess := save_mgo.GetMgoConn()
+	defer save_mgo.DestoryMongoConn(sess)
+	q,total,isok:=map[string]interface{}{},0,0
+	it := sess.DB(save_mgo.DbName).C("zktest_buyer_stand_data").Find(&q).Iter()
+	for tmp := make(map[string]interface{}); it.Next(&tmp);total++{
+		if total%1000==0 {
+			log.Debug("current index",total,isok,tmp["_id"])
+		}
+		buyer := qu.ObjToString(tmp["buyer"])
+		winner := qu.ObjToString(tmp["winner"])
+		if (reg.MatchString(buyer) && utf8.RuneCountInString(buyer)==4) ||
+			(reg.MatchString(winner) && utf8.RuneCountInString(winner)==4){
+			//符合
+			isok++
+			save_mgo.Save("zktest_buyerstand_data_repair",tmp)
+		}
+		tmp = make(map[string]interface{})
+	}
+	log.Debug("export unit is over",total,isok)
+}
+
 //遍历es 导出异常数据
 func exportErrQuanGuoData()  {
 	elastic.InitElasticSize("http://127.0.0.1:12003",10)
@@ -959,6 +982,21 @@ func exportErrQuanGuoData()  {
 		{"key": "绥化市","count": 1},
 	}
 
+	arr = []map[string]interface{}{
+		{"key": "贵州省","aaabbb":"2"},
+		{"key": "河北省","aaabbb":"2"},
+		{"key": "广东省","aaabbb":"2"},
+		{"key": "江苏省","aaabbb":"2"},
+		{"key": "海南省","aaabbb":"2"},
+		{"key": "黑龙江省","aaabbb":"2"},
+		{"key": "哈尔滨市"},
+		{"key": "绥化市"},
+		{"key": "安徽省","aaabbb":"1"},
+		{"key": "山东省","aaabbb":"1"},
+		{"key": "河南省","aaabbb":"1"},
+		{"key": "湖南省","aaabbb":"1"},
+		{"key": "陕西省","aaabbb":"1"},
+	}
 	all_data := make(map[string]map[string]string,0)
 	data := make(map[string]string,0)
 	area := ""
@@ -979,6 +1017,9 @@ func exportErrQuanGuoData()  {
 			}
 		}
 	}
+
+	log.Debug(all_data)
+	return
 	total := int64(0)
 	for area,cityArr := range all_data{
 		for city,_ :=range cityArr{
@@ -1036,7 +1077,7 @@ func exportErrQuanGuoData()  {
 							wg_es.Done()
 						}()
 						if city!=""||district!="" {
-							save_mgo.Save("zktest_erracd_data", map[string]interface{}{
+							save_mgo.Save("zktest_err_err_data", map[string]interface{}{
 								"_id":StringTOBsonId(tmpid),
 								"area":area,
 								"city":city,
@@ -1126,7 +1167,7 @@ func exportBuyerWinnerLengthData()  {
 	it := sess.DB(save_mgo.DbName).C("result_20210108").Find(&q).Iter()
 	for tmp := make(map[string]interface{}); it.Next(&tmp);total++{
 		if total%10000==0 {
-			log.Debug("current index",total,tmp["_id"])
+			log.Debug("current index",total,isok,tmp["_id"])
 		}
 		repeat := qu.IntAll(tmp["repeat"])
 		if repeat>0 {
@@ -1138,6 +1179,7 @@ func exportBuyerWinnerLengthData()  {
 		if (utf8.RuneCountInString(buyer) < 5 && buyer!="")||
 			(utf8.RuneCountInString(winner)<5 && winner!=""){
 			isok++
+			save_mgo.Save("zktest_buyer_stand_data",tmp)
 		}
 		tmp = make(map[string]interface{})
 	}

standardata/src/config.json

@@ -1,14 +1,17 @@
 {
-  "mgofrom": "192.168.3.207:27092",
+  "mgofrom": "127.0.0.1:27017",
   "mgofromsize":5,
-  "mgofromdb":"qfw",
-  "mgoto": "192.168.3.207:27092",
+  "mgofromdb":"zhengkun",
+
+  "mgoto": "127.0.0.1:27017",
   "mgotosize":5,
   "mgotodb":"mixdata",
-  "mgoent": "192.168.3.207:27092",
+
+  "mgoent": "127.0.0.1:27017",
   "mgoentsize":5,
   "mgoentdb":"mixdata",
-  "extractcoll":"bidding",
+
+  "extractcoll":"aaaaa",
   "extractdb": "extract_v3_new",
   "versioncoll": "tagdetailinfo",
   "extractversion": "V3.1.2",

standardata/src/main.go

@@ -32,7 +32,7 @@ var (
 	//异常表正则匹配处理
 	WinnerRegOk, WinnerRegErr, AgencyRegOk, AgencyRegErr, BuyerRegOk, BuyerRegErr []regexp.Regexp
 )
-
+var LenReg = regexp.MustCompile(`^.{2}([大|小|中|学][学|院]|公司)$`)
 func init() {
 	qu.ReadConfig(&sysconfig)
 	extractcoll = qu.ObjToString(sysconfig["extractcoll"])
@@ -153,7 +153,7 @@ func main() {
 	// query := map[string]interface{}{}
 	// buyerStandarData(mgofromdb, query)
 
-	log.Println("部署...增量")
+	log.Println("部署...增量...")
 	go task_standarData()
 	c := make(chan int, 1)
 	<-c

standardata/src/standaragency.go

@@ -5,20 +5,21 @@ import (
 	"dbutil/mongo"
 	"dbutil/redis"
 	"encoding/json"
-	"log"
+	log "github.com/donnie4w/go-logger/logger"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	"gopkg.in/mgo.v2/bson"
 	qu "qfw/util"
 	"time"
 	"unicode/utf8"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"gopkg.in/mgo.v2/bson"
 )
 
 //增量处理
 func agencyStandarData(db string, query map[string]interface{}) {
 	defer qu.Catch()
+	//sess := MongoFrom.GetMgoConn()
+	//defer MongoFrom.Close()
 	sess := MongoFrom.GetMgoConn()
-	defer MongoFrom.Close()
+	defer MongoFrom.DestoryMongoConn(sess)
 	it := sess.DB(db).C(extractcoll).Find(query).Select(bson.M{"repeat": 1, "agency": 1, "agencytel": 1, "agencyperson": 1, "topscopeclass": 1,
 		"agencyaddr": 1}).Sort("_id").Iter()
 	index := 0
@@ -71,7 +72,9 @@ func agencyStandarData(db string, query map[string]interface{}) {
 					data["mobilephone"] = timesMobilePhone
 					data["institute_type"] = "企业"
 					_id := MongoTo.Save(agencyent, data)
-					redis.PutRedis("agency", agencybd, agency, _id.(primitive.ObjectID).Hex(), -1)
+					if _id!=nil {
+						redis.PutRedis("agency", agencybd, agency, mongo.BsonTOStringId(_id), -1)
+					}
 					savetoerr = false
 				}
 			}
@@ -107,17 +110,17 @@ func agencyStandarData(db string, query map[string]interface{}) {
 			}
 		}
 		tmp = map[string]interface{}{}
-		if index%1000 == 0 {
-			log.Println("agency index", index)
+		if index%10000 == 0 {
+			log.Debug("agency index ", index)
 		}
 	}
-	log.Println("agency ok index", index)
+	log.Debug("agency ok index", index)
 }
 
 //历史数据处理
 func historyagency(db, fromcoll string) {
 	defer qu.Catch()
-	log.Println("history  start")
+	log.Debug("history  start")
 	sess := MongoFrom.GetMgoConn()
 	defer MongoFrom.Close()
 	it := sess.DB(db).C(fromcoll).Find(map[string]interface{}{}).Select(bson.M{"repeat": 1, "agency": 1, "agencytel": 1, "agencyperson": 1, "topscopeclass": 1,
@@ -195,17 +198,17 @@ func historyagency(db, fromcoll string) {
 		}(tmp)
 		tmp = map[string]interface{}{}
 		if index%10000 == 0 {
-			log.Println("index", index, _id)
+			log.Debug("index", index, _id)
 		}
 	}
-	log.Println("history  ok  index", index)
+	log.Debug("history  ok  index", index)
 	agencyStandarHistory(qu.ObjToString(sysconfig["mgotodb"]))
 }
 
 //查询agencyerr标准化历史数据
 func agencyStandarHistory(db string) {
 	defer qu.Catch()
-	log.Println("开始标准化数据--agency", db)
+	log.Debug("开始标准化数据--agency", db)
 	sessto := MongoTo.GetMgoConn()
 	defer MongoTo.Close()
 	it := sessto.DB(db).C(agencyerr).Find(map[string]interface{}{}).Iter()
@@ -237,13 +240,13 @@ func agencyStandarHistory(db string) {
 					MongoTo.UpdateById(agencyerr, err_id, map[string]interface{}{"$set": map[string]interface{}{"check": num}})
 				}
 			} else {
-				log.Println("jsonErr", name, err)
+				log.Debug("jsonErr", name, err)
 			}
 		}(tmp)
 		if index%1000 == 0 {
-			log.Println("标准化历史数据--agency", index, err_id, entnum)
+			log.Debug("标准化历史数据--agency", index, err_id, entnum)
 		}
 		tmp = map[string]interface{}{}
 	}
-	log.Println("标准化数据完成--agency", index, entnum)
+	log.Debug("标准化数据完成--agency", index, entnum)
 }

standardata/src/standarbuyer.go

@@ -5,20 +5,20 @@ import (
 	"dbutil/mongo"
 	"dbutil/redis"
 	"encoding/json"
-	"log"
+	log "github.com/donnie4w/go-logger/logger"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	"gopkg.in/mgo.v2/bson"
 	qu "qfw/util"
 	"time"
 	"unicode/utf8"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"gopkg.in/mgo.v2/bson"
 )
 
 //增量处理
 func buyerStandarData(db string, query map[string]interface{}) {
 	defer qu.Catch()
 	sess := MongoFrom.GetMgoConn()
-	defer MongoFrom.Close()
+	defer MongoFrom.DestoryMongoConn(sess)
+
 	it := sess.DB(db).C(extractcoll).Find(query).Select(bson.M{"repeat": 1, "buyer": 1, "buyertel": 1,
 		"buyerperson": 1, "buyerclass": 1, "topscopeclass": 1}).Sort("_id").Iter()
 	index := 0
@@ -27,8 +27,12 @@ func buyerStandarData(db string, query map[string]interface{}) {
 			continue
 		}
 		buyer := qu.ObjToString(tmp["buyer"])
-		if utf8.RuneCountInString(buyer) < 4 {
-			continue
+		if utf8.RuneCountInString(buyer) < 5 {
+			if LenReg.MatchString(buyer)&&utf8.RuneCountInString(buyer)==4 {
+
+			}else {
+				continue
+			}
 		}
 		infoid := mongo.BsonTOStringId(tmp["_id"])
 		buyerclass := qu.ObjToString(tmp["buyerclass"])
@@ -73,7 +77,9 @@ func buyerStandarData(db string, query map[string]interface{}) {
 					data["mobilephone"] = timesMobilePhone
 					data["institute_type"] = "企业"
 					_id := MongoTo.Save(buyerent, data)
-					redis.PutRedis("buyer", buyerbd, buyer, _id.(primitive.ObjectID).Hex(), -1)
+					if _id!=nil {
+						redis.PutRedis("buyer", buyerbd, buyer, mongo.BsonTOStringId(_id), -1)
+					}
 					savetoerr = false
 				}
 			}
@@ -111,17 +117,17 @@ func buyerStandarData(db string, query map[string]interface{}) {
 			}
 		}
 		tmp = map[string]interface{}{}
-		if index%1000 == 0 {
-			log.Println("buyer index", index)
+		if index%10000 == 0 {
+			log.Debug("buyer index ", index)
 		}
 	}
-	log.Println("buyer ok index", index)
+	log.Debug("buyer ok index", index)
 }
 
 //历史数据处理
 func historybuyer(db, fromcoll string) {
 	defer qu.Catch()
-	log.Println("history  start")
+	log.Debug("history  start")
 	sess := MongoFrom.GetMgoConn()
 	defer MongoFrom.Close()
 	it := sess.DB(db).C(fromcoll).Find(map[string]interface{}{}).Select(bson.M{"repeat": 1, "buyer": 1, "buyertel": 1, "buyerperson": 1, "buyerclass": 1, "topscopeclass": 1}).Sort("_id").Iter()
@@ -148,7 +154,7 @@ func historybuyer(db, fromcoll string) {
 
 			}
 			topscopeclass, _ := tmp["topscopeclass"].(primitive.A)
-			if buyer != "" && utf8.RuneCountInString(buyer) > 3 {
+			if buyer != "" && (utf8.RuneCountInString(buyer) > 4 || (LenReg.MatchString(buyer)&&utf8.RuneCountInString(buyer)==4)) {
 				buyerperson := qu.ObjToString(tmp["buyerperson"])
 				buyertel := qu.ObjToString(tmp["buyertel"])
 				b, _ := redis.ExistRedis("buyer", buyerbd, buyer)
@@ -195,17 +201,17 @@ func historybuyer(db, fromcoll string) {
 		}(tmp)
 		tmp = map[string]interface{}{}
 		if index%10000 == 0 {
-			log.Println("index", index, _id)
+			log.Debug("index", index, _id)
 		}
 	}
-	log.Println("history  ok  index", index)
+	log.Debug("history  ok  index", index)
 	buyerStandarHistory(qu.ObjToString(sysconfig["mgotodb"]))
 }
 
 //查询buyererr标准化历史数据
 func buyerStandarHistory(db string) {
 	defer qu.Catch()
-	log.Println("开始标准化数据--buyer", db)
+	log.Debug("开始标准化数据--buyer", db)
 	sessto := MongoTo.GetMgoConn()
 	defer MongoTo.Close()
 	it := sessto.DB(db).C(buyererr).Find(map[string]interface{}{}).Iter()
@@ -237,15 +243,15 @@ func buyerStandarHistory(db string) {
 					MongoTo.UpdateById(buyererr, err_id, map[string]interface{}{"$set": map[string]interface{}{"check": num}})
 				}
 			} else {
-				log.Println("jsonErr", name, err)
+				log.Debug("jsonErr", name, err)
 			}
 		}(tmp)
 		if index%1000 == 0 {
-			log.Println("标准化历史数据--buyer", index, err_id, entnum)
+			log.Debug("标准化历史数据--buyer", index, err_id, entnum)
 		}
 		tmp = map[string]interface{}{}
 	}
-	log.Println("标准化数据完成--buyer", index, entnum)
+	log.Debug("标准化数据完成--buyer", index, entnum)
 }
 
 //企业数据整合(已有标注信息)
@@ -264,8 +270,12 @@ func buyerMegerBuyerclass(id string, ps map[string]interface{}) map[string]inter
 		data["buyerclass"] = sb
 	}
 	data["updatetime"] = time.Now().Unix()
+
 	//contact
-	contact := tmp["contact"].(primitive.A)
+	contact :=make(primitive.A,0)
+	if tmp["contact"]!=nil {
+		contact = tmp["contact"].(primitive.A)
+	}
 	contact = append(contact, ps)
 	//bid_contact
 	bid_contacts, contacts := bid_contact(contact)
@@ -295,7 +305,7 @@ func putbuyerreids() {
 		redis.PutRedis("buyer", 2, buyer_name, id, -1)
 		tmp = map[string]interface{}{}
 		if index%1000 == 0 {
-			log.Println(id, index)
+			log.Debug(id, index)
 		}
 	}
 }
@@ -310,11 +320,11 @@ func putbuyerreids__s() {
 		ts, _ := MongoTo.Find("buyer_enterprise", map[string]interface{}{"buyer_name": buyer_name}, nil, bson.M{"buyer_name": 1})
 		if len(ts) > 1 {
 			id := mongo.BsonTOStringId(ts[0]["_id"])
-			log.Println(buyer_name, id)
+			log.Debug(buyer_name, id)
 			MongoTo.DeleteById("buyer_enterprise", id)
 		}
 		if index%10000 == 0 {
-			log.Println(index)
+			log.Debug(index)
 		}
 		tmp = map[string]interface{}{}
 	}
@@ -343,7 +353,7 @@ func modifybuyer() {
 					"$set": tmp,
 				})
 				MongoTo.DeleteById("buyer_enterprise", id)
-				log.Println(id)
+				log.Debug(id)
 			}
 		}
 		tmp = map[string]interface{}{}

standardata/src/standarwinner.go

@@ -5,21 +5,21 @@ import (
 	"dbutil/mongo"
 	"dbutil/redis"
 	"encoding/json"
-	"log"
+	log "github.com/donnie4w/go-logger/logger"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	"gopkg.in/mgo.v2/bson"
 	qu "qfw/util"
 	"strings"
 	"time"
 	"unicode/utf8"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"gopkg.in/mgo.v2/bson"
 )
 
 //增量处理
 func winnerStandarData(db string, query map[string]interface{}) {
 	defer qu.Catch()
 	sess := MongoFrom.GetMgoConn()
-	defer MongoFrom.Close()
+	defer MongoFrom.DestoryMongoConn(sess)
+
 	it := sess.DB(db).C(extractcoll).Find(query).Select(bson.M{"repeat": 1, "winner": 1, "winnertel": 1,
 		"winnerperson": 1, "topscopeclass": 1, "package": 1}).Sort("_id").Iter()
 	index := 0
@@ -28,8 +28,12 @@ func winnerStandarData(db string, query map[string]interface{}) {
 			continue
 		}
 		winner := qu.ObjToString(tmp["winner"])
-		if utf8.RuneCountInString(winner) < 4 {
-			continue
+		if utf8.RuneCountInString(winner) < 5  {
+			if LenReg.MatchString(winner)&&utf8.RuneCountInString(winner)==4 {
+
+			}else {
+				continue
+			}
 		}
 		infoid := mongo.BsonTOStringId(tmp["_id"])
 		topscopeclass, _ := tmp["topscopeclass"].(primitive.A)
@@ -70,8 +74,9 @@ func winnerStandarData(db string, query map[string]interface{}) {
 					data["mobilephone"] = timesMobilePhone
 					data["institute_type"] = "企业"
 					_id := MongoTo.Save(winnerent, data)
-					//有问题... ...
-					redis.PutRedis("winner", winnerbd, winner, _id.(primitive.ObjectID).Hex(), -1)
+					if _id != nil {
+						redis.PutRedis("winner", winnerbd, winner, mongo.BsonTOStringId(_id), -1)
+					}
 					savetoerr = false
 				}
 			}
@@ -116,7 +121,9 @@ func winnerStandarData(db string, query map[string]interface{}) {
 					data := comHisMegerNewData(winner, "winner", []map[string]interface{}{contact})
 					if data != nil {
 						_id := MongoTo.Save(winnerent, data)
-						redis.PutRedis("winner", winnerbd, winner, _id.(primitive.ObjectID).Hex(), -1)
+						if _id != nil {
+							redis.PutRedis("winner", winnerbd, winner, mongo.BsonTOStringId(_id), -1)
+						}
 					}
 				} else {
 					data := winMegerIndustry(entid, contact)
@@ -130,17 +137,17 @@ func winnerStandarData(db string, query map[string]interface{}) {
 			}
 		}
 		tmp = map[string]interface{}{}
-		if index%1000 == 0 {
-			log.Println("winner index", index)
+		if index%10000 == 0 {
+			log.Debug("winner index ", index)
 		}
 	}
-	log.Println("winner ok index", index)
+	log.Debug("winner ok index", index)
 }
 
 //历史数据处理
 func historywinner(db, fromcoll string) {
 	defer qu.Catch()
-	log.Println("history  start")
+	log.Debug("history  start")
 	sess := MongoFrom.GetMgoConn()
 	defer MongoFrom.Close()
 	it := sess.DB(db).C(fromcoll).Find(map[string]interface{}{}).Select(bson.M{
@@ -158,7 +165,7 @@ func historywinner(db, fromcoll string) {
 			}()
 			winner := qu.ObjToString(tmp["winner"])
 			topscopeclass, _ := tmp["topscopeclass"].(primitive.A)
-			if winner != "" && utf8.RuneCountInString(winner) > 3 {
+			if winner != "" && (utf8.RuneCountInString(winner) > 4||(LenReg.MatchString(winner)&&utf8.RuneCountInString(winner)==4)) {
 				winnerperson := qu.ObjToString(tmp["winnerperson"])
 				winnertel := qu.ObjToString(tmp["winnertel"])
 				//存在...更新
@@ -205,17 +212,17 @@ func historywinner(db, fromcoll string) {
 		}(tmp)
 		tmp = map[string]interface{}{}
 		if index%10000 == 0 {
-			log.Println("index", index, _id)
+			log.Debug("index", index, _id)
 		}
 	}
-	log.Println("history  ok  index", index)
+	log.Debug("history  ok  index", index)
 	winStandarHistory(qu.ObjToString(sysconfig["mgotodb"]))
 }
 
 //查询winnererr标准化历史数据
 func winStandarHistory(db string) {
 	defer qu.Catch()
-	log.Println("开始标准化数据--winner", db)
+	log.Debug("开始标准化数据--winner", db)
 	sessto := MongoTo.GetMgoConn()
 	defer MongoTo.Close()
 	it := sessto.DB(db).C(winnererr).Find(map[string]interface{}{}).Iter()
@@ -247,15 +254,15 @@ func winStandarHistory(db string) {
 					MongoTo.UpdateById(winnererr, err_id, map[string]interface{}{"$set": map[string]interface{}{"check": num}})
 				}
 			} else {
-				log.Println("jsonErr", name, err)
+				log.Debug("jsonErr", name, err)
 			}
 		}(tmp)
 		if index%1000 == 0 {
-			log.Println("标准化历史数据--winner", index, err_id, entnum)
+			log.Debug("标准化历史数据--winner", index, err_id, entnum)
 		}
 		tmp = map[string]interface{}{}
 	}
-	log.Println("标准化数据完成--winner", index, entnum)
+	log.Debug("标准化数据完成--winner", index, entnum)
 }
 
 //企业数据整合(已有标注信息)
@@ -286,7 +293,13 @@ func winMegerIndustry(id string, ps map[string]interface{}) map[string]interface
 	}
 	data["updatetime"] = time.Now().Unix()
 	//contact
-	contact := tmp["contact"].(primitive.A)
+	//contact := tmp["contact"].(primitive.A)
+	contact :=make(primitive.A,0)
+	if tmp["contact"]!=nil {
+		contact = tmp["contact"].(primitive.A)
+	}
+
+
 	contact = append(contact, ps)
 	//bid_contact - 去重
 	bid_contacts, contacts := bid_contact(contact)

standardata/src/task.go

@@ -2,11 +2,10 @@
 package main
 
 import (
+	"github.com/cron"
 	"log"
 	qu "qfw/util"
 	"time"
-
-	"github.com/cron"
 )
 
 func task_standarData() {
@@ -23,17 +22,19 @@ func task_standarData() {
 			},
 		}
 		log.Println(mgofromdb, query)
-		go winnerStandarData(mgofromdb, query)
-		time.Sleep(1 * time.Minute)
 		go buyerStandarData(mgofromdb, query)
-		time.Sleep(1 * time.Minute)
+		time.Sleep(10 * time.Second)
+		go winnerStandarData(mgofromdb, query)
+		time.Sleep(10 * time.Second)
 		go agencyStandarData(mgofromdb, query)
 	})
 	c.Start()
-
+	//立即执行一次
+	runOnce()
 }
 
 func runOnce()  {
+	log.Println("立即执行一次......")
 	mgofromdb := qu.ObjToString(sysconfig["mgofromdb"])
 	t := time.Now()
 	pici := time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, time.Local).Unix()
@@ -43,11 +44,12 @@ func runOnce()  {
 			"$lte": pici,
 		},
 	}
+	//query  = map[string]interface{}{}
 	log.Println(mgofromdb, query)
-	go winnerStandarData(mgofromdb, query)
-	time.Sleep(1 * time.Minute)
 	go buyerStandarData(mgofromdb, query)
-	time.Sleep(1 * time.Minute)
+	time.Sleep(10 * time.Second)
+	go winnerStandarData(mgofromdb, query)
+	time.Sleep(10 * time.Second)
 	go agencyStandarData(mgofromdb, query)
 }
 

udp_datacheck/src/check_city.go

@@ -137,7 +137,7 @@ func cityMarshal(data map[string]interface{}) map[string]string {
 func standardCheckCity(area string,city string,district string) map[string]string{
 
 	rdata := make(map[string]string,0)
-	if area=="香港"||area=="澳门"||area=="台湾" || (area=="全国"&&(city==""||district=="")) {
+	if area=="香港"||area=="澳门"||area=="台湾" || (area=="全国"&&(city==""&&district=="")) {
 		return rdata
 	}
 	//第一步：区校验

udp_datacheck/src/main.go

@@ -160,8 +160,8 @@ func mainT()  {
 
 //临时校验
 func main()  {
-	sid := "1fffffffffffffffffffffff"
-	eid := "618aef9745a326c6c3eb7e50"
+	sid := "618aef9745a326c6c3eb7e50"
+	eid := "618b3d6745a326c6c3ec6d4e"
 	startCheckData(sid,eid)
 	time.Sleep(99999 * time.Hour)
 }
@@ -186,7 +186,7 @@ func startCheckData(sid, eid string) {
 	it := sess.DB(data_mgo.DbName).C(coll_name).Find(&q).Iter()
 	total,isRepair := 0,0
 	for tmp := make(map[string]interface{}); it.Next(&tmp); total++ {
-		if total%50000 == 0 {
+		if total%10000 == 0 {
 			log.Println("当前数量:", total,isRepair,tmp["_id"])
 		}
 		update_id := map[string]interface{}{"_id":tmp["_id"]}