定时任务更新

udpfilterdup/src/main.go

@@ -107,6 +107,7 @@ func init() {
 }
 
 func main() {
+
 	go checkMapJob()
 	updport := Sysconfig["udpport"].(string)
 	udpclient = mu.UdpClient{Local: updport, BufSize: 1024}
@@ -135,8 +136,8 @@ func mainT() {
 		5e933b1a50b5ea296ef0e839
 		*/
 		//IdType = true
-		sid = "5ece4b1b9e628c59915eb257"
-		eid = "5ed55b6d9e628c599161977c"
+		sid = "5ee1d3d59e628c599167adf1"
+		eid = "5eea4291801f744d045c3169"
 		log.Println("正常判重测试开始")
 		log.Println(sid, "---", eid)
 		mapinfo := map[string]interface{}{}
@@ -481,15 +482,15 @@ func task(data []byte, mapInfo map[string]interface{}) {
 func timedTaskDay() {
 	log.Println("部署定时任务")
 	c := cron.New()
-	c.AddFunc("0 0 1 * * ?", func() { movedata() })      //每天凌晨1点执行一次
-	c.AddFunc("0 0 */4 * * ?", func() { timedTaskOnce() }) //每天凌晨2点执行一次
+	//c.AddFunc("0 0 */4 * * ?", func() { movedata() })
+	c.AddFunc("0 0 */4 * * ?", func() { timedTaskOnce() })
 	c.Start()
-	//timedTaskOnce()
 }
 func timedTaskOnce() {
-
-	log.Println("开始一次定时任务")
 	defer util.Catch()
+	log.Println("开始一次迁移任务")
+	movedata()
+	log.Println("开始一次任务判重")
 	//当前时间-8   -4 小时
 	now := time.Now()
 	log.Println(now)
@@ -621,9 +622,6 @@ func timedTaskOnce() {
 		//当前组的第一个发布时间
 		first_pt :=util.Int64All(v[0]["publishtime"])
 		coll :=extract_back
-		if isTaskTimeCycle(first_pt) {
-			coll  = extract
-		}
 		DM = TimedTaskDatamap(dupdays, first_pt,coll)
 		log.Println("开始遍历判重第",k,"组  共计数量：",len(v))
 		n = n+len(v)
@@ -1072,9 +1070,11 @@ func movedata() {
 	sess := mgo.GetMgoConn()
 	defer mgo.DestoryMongoConn(sess)
 	year, month, day := time.Now().Date()
+	now:=time.Now()
+	move_time := time.Date(now.Year(), now.Month(), now.Day(), now.Hour()-8, 0, 0, 0, time.Local).Unix()
 	q := map[string]interface{}{
 		"comeintime": map[string]interface{}{
-			"$lt": time.Date(year, month, day, 0, 0, 0, 0, time.Local).Add(-time.Duration(dupdays) * 24 * time.Hour).Unix(),
+			"$lt": move_time,
 		},
 	}
 	log.Println(q)