hongze vor 1 Jahr
Ursprung
Commit
975ef6c797
2 geänderte Dateien mit 9 neuen und 69 gelöschten Zeilen
  1. 4 4
      services/icpi.go
  2. 5 65
      services/task.go

+ 4 - 4
services/icpi.go

@@ -292,8 +292,8 @@ func CrawlerIcpiMaxClassifyIndex(cookieStr string) (err error) {
 					return err
 					return err
 				}
 				}
 			} else {
 			} else {
-				if dataVal != v.Today {
-					err = icpiIndexObj.ModifyData(indexCode, yesterday, v.Today)
+				if dataVal != v.Yesterday {
+					err = icpiIndexObj.ModifyData(indexCode, yesterday, v.Yesterday)
 					if err != nil {
 					if err != nil {
 						fmt.Println("icpiIndexObj ModifyData Err:" + err.Error())
 						fmt.Println("icpiIndexObj ModifyData Err:" + err.Error())
 						return err
 						return err
@@ -508,8 +508,8 @@ func CrawlerIcpiMiddleClassifyIndex(cookieStr string) (err error) {
 					return err
 					return err
 				}
 				}
 			} else {
 			} else {
-				if dataVal != v.Today {
-					err = icpiIndexObj.ModifyData(indexCode, yesterday, v.Today)
+				if dataVal != v.Yesterday {
+					err = icpiIndexObj.ModifyData(indexCode, yesterday, v.Yesterday)
 					if err != nil {
 					if err != nil {
 						fmt.Println("icpiIndexObj ModifyData Err:" + err.Error())
 						fmt.Println("icpiIndexObj ModifyData Err:" + err.Error())
 						return err
 						return err

+ 5 - 65
services/task.go

@@ -43,7 +43,7 @@ func Task() {
 	task.AddTask("中国煤炭网爬取", refreshCoal)
 	task.AddTask("中国煤炭网爬取", refreshCoal)
 	task.AddTask("美联储加息概率爬取", refreshMeeting)
 	task.AddTask("美联储加息概率爬取", refreshMeeting)
 	//task.AddTask("谷歌出行指数爬取", refreshVisitors)
 	//task.AddTask("谷歌出行指数爬取", refreshVisitors)
-	task.AddTask("eia steo报告", syncEiaSteoData)     //每天22点爬一次
+	task.AddTask("eia steo报告", syncEiaSteoData)   //每天22点爬一次
 	task.AddTask("UN年度数据", syncYearComTrade)      //每年一月一号的3点同步
 	task.AddTask("UN年度数据", syncYearComTrade)      //每年一月一号的3点同步
 	task.AddTask("UN月度数据", syncYearMonthComTrade) //每月1号的3点同步
 	task.AddTask("UN月度数据", syncYearMonthComTrade) //每月1号的3点同步
 
 
@@ -170,68 +170,8 @@ func RefreshChangesVisitorsCovid(cont context.Context) (err error) {
 //}
 //}
 
 
 func Task123() {
 func Task123() {
-	fmt.Println("task start")
-	//日成交持仓排名
-	n := 3
-	//广州交易所期货-日行情
-	for i := n; i >= 0; i-- {
-		date := time.Now().AddDate(0, 0, -i)
-		if date.Weekday() == time.Saturday || date.Weekday() == time.Sunday {
-			continue
-		}
-		CrawlerFromGuangzhouDayQuotes(date)
-		rn := utils.RangeRand(10, 60)
-		fmt.Println("i:"+strconv.Itoa(i)+" date:", date.Format(utils.FormatDate)+";sleep:", strconv.Itoa(int(rn)))
-		time.Sleep(time.Duration(rn) * time.Second)
-	}
-	//合约
-	for i := n; i >= 0; i-- {
-		date := time.Now().AddDate(0, 0, -i)
-		if date.Weekday() == time.Saturday || date.Weekday() == time.Sunday {
-			continue
-		}
-		fmt.Println("date:", date.Format(utils.FormatDate))
-		CrawlerFromGuangzhouContract(date)
-		rn := utils.RangeRand(3, 15)
-		fmt.Println("i:"+strconv.Itoa(i)+" date:", date.Format(utils.FormatDate)+";sleep:", strconv.Itoa(int(rn)))
-		time.Sleep(time.Duration(rn) * time.Second)
-	}
-
-	//日成交持仓排名
-	for i := n; i >= 0; i-- {
-		date := time.Now().AddDate(0, 0, -i)
-		if date.Weekday() == time.Saturday || date.Weekday() == time.Sunday {
-			continue
-		}
-		fmt.Println("date:", date.Format(utils.FormatDate))
-		CrawlerFromGuangzhouDealPosiQuotes(date)
-		rn := utils.RangeRand(3, 15)
-		fmt.Println("i:"+strconv.Itoa(i)+" date:", date.Format(utils.FormatDate)+";sleep:", strconv.Itoa(int(rn)))
-		time.Sleep(time.Duration(rn) * time.Second)
-	}
-	//广州交易所期货-仓单日报->开始日期:2023-06-20
-	for i := n; i >= 0; i-- {
-		date := time.Now().AddDate(0, 0, -i)
-		if date.Weekday() == time.Saturday || date.Weekday() == time.Sunday {
-			continue
-		}
-		fmt.Println("date:", date.Format(utils.FormatDate))
-		CrawlerFromGuangzhouWbillWeeklyQuotes(date)
-		rn := utils.RangeRand(3, 15)
-		fmt.Println("i:"+strconv.Itoa(i)+" date:", date.Format(utils.FormatDate)+";sleep:", strconv.Itoa(int(rn)))
-		time.Sleep(time.Duration(rn) * time.Second)
-	}
-
-	//一次性交割卖方仓单查询
-	for i := n; i >= 0; i-- {
-		date := time.Now().AddDate(0, -i, 0)
-		fmt.Println("date:", date.Format(utils.FormatDate))
-		CrawlerFromGuangzhouCongregateDeliveryQuotes(date)
-		rn := utils.RangeRand(3, 15)
-		fmt.Println("i:"+strconv.Itoa(i)+" date:", date.Format(utils.FormatDate)+";sleep:", strconv.Itoa(int(rn)))
-		time.Sleep(time.Duration(rn) * time.Second)
-	}
-	//更新指标日期
-	CrawlerFromGuangzhouIndexMinAndMaxDate()
-	fmt.Println("task end")
+	fmt.Println("start")
+	ctx := new(context.Context)
+	CrawlerIcpi(*ctx)
+	fmt.Println("end")
 }
 }