zhangjinkun 5 anos atrás
pai
commit
27049f69f8

+ 5 - 6
standardata/src/config.json

@@ -1,5 +1,4 @@
 {
-  "port": "1235",
   "mgofrom": "172.17.4.187:27083",
   "mgofromsize":5,
   "mgofromdb":"qfw",
@@ -12,18 +11,18 @@
   "extractcoll":"result_20200116",
   "standardata":{
 	"winner":{
-		"standarent":"winner_ent",
-		"standarerr":"winner_err",
+		"standarent":"winner_enterprisenew",
+		"standarerr":"winner_errnew",
 		"redisdb":1
 	},
     "buyer":{
-      "standarent":"buyer_ent",
+      "standarent":"buyer_agency_enterprise",
       "standarerr":"buyer_err",
       "redisdb":2
     },
     "agency":{
-      "standarent":"agency_data_ent",
-      "standarerr":"agency_data_err",
+      "standarent":"agency_enterprise",
+      "standarerr":"agency_err",
       "redisdb":3
     }
   },

+ 14 - 17
standardata/src/main.go

@@ -15,18 +15,18 @@ import (
 
 var (
 	MongoFrom /*抽取原*/, MongoTo /*保存库*/, MongoEnt/*企业库*/ *mongo.MongodbSim
-	sysconfig            map[string]interface{}
-	extractcoll          string
-	winnerent, winnererr string
-	buyerent, buyererr   string
-	agencyent, agencyerr   string
-	winnerbd, buyerbd, agencybd    int
-	Addrs                = make(map[string]interface{}, 0) //省市县
-	winchanbool          = make(chan bool, 3)
-	buyerchanbool        = make(chan bool, 3)
-	agencychanbool        = make(chan bool, 3)
-	gochan               = make(chan bool, 3)
-	udpclient            mu.UdpClient
+	sysconfig                   map[string]interface{}
+	extractcoll                 string
+	winnerent, winnererr        string
+	buyerent, buyererr          string
+	agencyent, agencyerr        string
+	winnerbd, buyerbd, agencybd int
+	Addrs                       = make(map[string]interface{}, 0) //省市县
+	winchanbool                 = make(chan bool, 3)
+	buyerchanbool               = make(chan bool, 3)
+	agencychanbool              = make(chan bool, 3)
+	gochan                      = make(chan bool, 3)
+	udpclient                   mu.UdpClient
 	//异常表正则匹配处理
 	WinnerRegOk, WinnerRegErr, AgencyRegOk, AgencyRegErr, BuyerRegOk, BuyerRegErr []regexp.Regexp
 )
@@ -129,12 +129,9 @@ func initReg() {
 func main() {
 	//go historywinner(qu.ObjToString(sysconfig["mgofromdb"]), extractcoll)
 	//go historybuyer(qu.ObjToString(sysconfig["mgofromdb"]), extractcoll)
-	go historyagency(qu.ObjToString(sysconfig["mgofromdb"]), extractcoll)
-	//go winStandarHistory(qu.ObjToString(sysconfig["mgotodb"]))
-	//go buyerStandarHistory(qu.ObjToString(sysconfig["mgotodb"]))
+	//go historyagency(qu.ObjToString(sysconfig["mgofromdb"]), extractcoll)
 
-
-	//go task_standarData()
+	go task_standarData()
 	c := make(chan int, 1)
 	<-c
 }

+ 0 - 32
standardata/src/standarwinner.go

@@ -466,35 +466,3 @@ func comRepTopscopeclass(tops []interface{}) []interface{} {
 	}
 	return data
 }
-
-//
-func comUpdateErr(coll, name string, tclass []interface{}) {
-	if len(tclass) < 1 {
-		return
-	}
-	tmp := MongoTo.FindOne(coll, map[string]interface{}{"name": name})
-	topscopeclass := tmp["topscopeclass"].(primitive.A)
-	tmpclass := map[string]bool{}
-	for _, tc := range topscopeclass {
-		tmpclass[qu.ObjToString(tc)] = true
-	}
-	oldlen := len(tmpclass)
-	for _, tc := range tclass {
-		tmpclass[qu.ObjToString(tc)] = true
-	}
-	newlen := len(tmpclass)
-	if oldlen == newlen {
-		return
-	}
-	newclass := []interface{}{}
-	for _, v := range tmpclass {
-		newclass = append(newclass, v)
-	}
-	MongoTo.Update(coll, map[string]interface{}{"name": name}, map[string]interface{}{
-		"$set": map[string]interface{}{
-			"name":          name,
-			"topscopeclass": newclass,
-			"updatetime":    time.Now().Unix(),
-		},
-	})
-}

+ 6 - 4
standardata/src/task.go

@@ -12,19 +12,21 @@ import (
 func task_standarData() {
 	mgofromdb := qu.ObjToString(sysconfig["mgofromdb"])
 	c := cron.New()
-	_ = c.AddFunc("0/5 * * * * *", func() {
+	_ = c.AddFunc("0 30 4 * * *", func() {
 		t := time.Now()
 		pici := time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, time.Local).Unix()
 		query := map[string]interface{}{
 			"comeintime": map[string]interface{}{
-				"$gt":  -pici - 86400,
+				"$gt":  pici - 86400,
 				"$lte": pici,
 			},
 		}
 		log.Println(mgofromdb, query)
-		//go winnerStandarData(mgofromdb, query)
+		go winnerStandarData(mgofromdb, query)
+		time.Sleep(1 * time.Minute)
 		go buyerStandarData(mgofromdb, query)
-		//go agencyStandarData(mgofromdb, query)
+		time.Sleep(1 * time.Minute)
+		go agencyStandarData(mgofromdb, query)
 	})
 	c.Start()
 }