Roc 2 周之前
父节点
当前提交
a9f013a3d2
共有 3 个文件被更改,包括 17 次插入8 次删除
  1. 1 1
      services/sync_hz_data.go
  2. 15 6
      services/trade_shanghai.go
  3. 1 1
      services/trade_zhengzhou.go

+ 1 - 1
services/sync_hz_data.go

@@ -13,7 +13,7 @@ func SyncHzDataIndex(cont context.Context) (err error) {
 	fmt.Println("郑州交易所 start:", time.Now().Format(utils.FormatDateTime))
 	fmt.Println("郑州交易所 start:", time.Now().Format(utils.FormatDateTime))
 	//郑州交易所
 	//郑州交易所
 	SyncRankingFromZhengzhou()
 	SyncRankingFromZhengzhou()
-	return
+
 	//if err != nil {
 	//if err != nil {
 	//	fmt.Println("SyncRankingFromZhengzhou Err:" + err.Error())
 	//	fmt.Println("SyncRankingFromZhengzhou Err:" + err.Error())
 	//	return
 	//	return

+ 15 - 6
services/trade_shanghai.go

@@ -10,20 +10,29 @@ import (
 
 
 // 上海商品交易所持单排名
 // 上海商品交易所持单排名
 func SyncRankingFromShanghai() (err error) {
 func SyncRankingFromShanghai() (err error) {
-	var startDate string
 	maxDate, err := data_manage.GetBaseFromTradeShangHaiIndexMaxDate()
 	maxDate, err := data_manage.GetBaseFromTradeShangHaiIndexMaxDate()
 	if err != nil || maxDate.IsZero() {
 	if err != nil || maxDate.IsZero() {
-		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
-		startDate = `1900-01-01 00:00:00`
-	} else {
-		startDate = maxDate.Format(utils.FormatDate) + " 00:00:00"
+		maxDate = time.Date(1900, 1, 1, 0, 0, 0, 0, time.Local)
 	}
 	}
 
 
+	for tmpDate := maxDate; !tmpDate.After(time.Now()); tmpDate = tmpDate.AddDate(0, 0, 1) {
+		endDate := tmpDate.AddDate(0, 0, 1)
+		err = syncRankingFromShanghai(tmpDate.Format(utils.FormatDateTime), endDate.Format(utils.FormatDateTime))
+		if err != nil {
+			fmt.Println(tmpDate.Format(utils.FormatDate), "执行异常,err:", err)
+		}
+		time.Sleep(10 * time.Second)
+	}
+	return err
+}
+
+func syncRankingFromShanghai(startDate, endDate string) (err error) {
+
 	method := `index/list`
 	method := `index/list`
 	data := make(map[string]interface{})
 	data := make(map[string]interface{})
 	data["Source"] = utils.DATA_SOURCE_SH
 	data["Source"] = utils.DATA_SOURCE_SH
 	data["StartDate"] = startDate
 	data["StartDate"] = startDate
-	//data["EndDate"] = endDate
+	data["EndDate"] = endDate
 	result, err := HttpPost("SyncRankingFromShanghai", method, data)
 	result, err := HttpPost("SyncRankingFromShanghai", method, data)
 	//utils.FileLog.Info(result)
 	//utils.FileLog.Info(result)
 	//fmt.Println(result)
 	//fmt.Println(result)

+ 1 - 1
services/trade_zhengzhou.go

@@ -25,7 +25,7 @@ func SyncRankingFromZhengzhou() (err error) {
 		if err != nil {
 		if err != nil {
 			fmt.Println(tmpDate.Format(utils.FormatDate), "执行异常,err:", err)
 			fmt.Println(tmpDate.Format(utils.FormatDate), "执行异常,err:", err)
 		}
 		}
-		time.Sleep(10 * time.Second)
+		time.Sleep(2 * time.Second)
 	}
 	}
 
 
 	return
 	return