xg

customerdata/src/task.go

@@ -2,17 +2,15 @@ package main
 
 import (
 	"encoding/json"
-	"fmt"
 	"log"
 	. "model"
 	qu "qfw/util"
 	"sync"
 	"sync/atomic"
 
-	//"sync"
 	"time"
 
-	"github.com/cron"
+	//"github.com/cron"
 	bson "gopkg.in/mgo.v2/bson"
 	es "gopkg.in/olivere/elastic.v1"
 )
@@ -27,21 +25,21 @@ type Customer struct {
 }
 
 func TimeTask() {
-	go StartTask()
-	c := cron.New()
-	cronstr := "0 */" + fmt.Sprint(TaskTime) + " * * * ?"
-	//cronstr := "0 0 */" + fmt.Sprint(TaskTime) + " * * ?"//每TaskTime小时执行一次
-	qu.Debug("cronstr:", cronstr)
-	//c.AddFunc(cronstr, func() { StartTask() })
-	c.Start()
+	StartTask()
+	// c := cron.New()
+	// cronstr := "0 */" + fmt.Sprint(TaskTime) + " * * * ?"
+	// //cronstr := "0 0 */" + fmt.Sprint(TaskTime) + " * * ?"//每TaskTime小时执行一次
+	// qu.Debug("cronstr:", cronstr)
+	// //c.AddFunc(cronstr, func() { StartTask() })
+	// c.Start()
 }
 func StartTask() {
-	InitCustomer()
+	//InitCustomer()
 	GetCustomerData()
 }
 
 //加载客户
-func InitCustomer() {
+func GetCustomerData() {
 	qu.Debug("Init Customer...")
 	tmpRange := GetIdRange() //获取id区间
 	qu.Debug(tmpRange)
@@ -50,20 +48,22 @@ func InitCustomer() {
 		customer := qu.ObjToString(c["s_customername"])
 		esArr := GetCustomerEs(customer, tmpRange)
 		if len(esArr) > 0 {
-			csr := &Customer{}
-			csr.EsQuery = esArr
-			CustomerArr = append(CustomerArr, csr)
+			csr := &Customer{
+				EsQuery: esArr,
+			}
+			csr.GetData() //获取某个用户数据
+			//CustomerArr = append(CustomerArr, csr)
 		}
 	}
 }
 
 //获取数据
-func GetCustomerData() {
-	for _, customer := range CustomerArr {
-		customer.GetData()
-	}
-	CustomerArr = []*Customer{} //置空
-}
+// func GetCustomerData() {
+// 	for _, customer := range CustomerArr {
+// 		customer.GetData()
+// 	}
+// 	CustomerArr = []*Customer{} //置空
+// }
 
 func (c *Customer) GetData() {
 	client := Es.GetEsConn()
@@ -126,7 +126,6 @@ func (c *Customer) GetData() {
 			}
 			wg.Wait()
 			client.ClearScroll().ScrollId(scrollId).Do() //清理游标
-			log.Println("Result Data Count：", numDocs)
 			log.Println("Result Data Count：", numDocs, "	Tags Data Count：", numTags)
 		}
 	}