fix

services/changes_visitors_covid.go

@@ -14,6 +14,7 @@ func SyncChangesVisitorsCovid() (err error) {
 	maxDate, err := data_manage.GetChangesVisitorsCovidMaxDate()
 	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.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
 	}

services/com_trade.go

@@ -15,6 +15,7 @@ func SyncComTradeIndex() (err error) {
 	maxDate, err := data_manage.GetBaseFromComTradeMaxDate()
 	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.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
 	}
@@ -95,6 +96,7 @@ func SyncComTradeData() (err error) {
 	maxDate, err := data_manage.GetBaseFromComTradeMaxDate()
 	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.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
 	}

services/eia_steo.go

@@ -2,9 +2,9 @@ package services
 
 import (
 	"encoding/json"
+	"errors"
 	"eta/eta_task/models/data_manage"
 	"eta/eta_task/utils"
-	"errors"
 	"fmt"
 	"time"
 )
@@ -207,20 +207,21 @@ func SyncEiaSteoIndexDataV2() (err error) {
 	maxDate, err := data_manage.GetBaseFromEiaSteoDataMaxModifyDate()
 	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.FormatDateTime)
 	}
 
 	existDataMap := make(map[string]*data_manage.BaseFromEiaSteoData)
-    allData, err1 := data_manage.GetAllBaseFromEiaSteoDataList(startDate)
-    if err1 != nil {
-        fmt.Println("get GetAllBaseFromEiaSteoDataList err:" + err1.Error())
-        return
-    }
-    for _, dv := range allData {
-        tmpKey := dv.IndexCode + "_" + dv.DataTime.Format(utils.FormatDate)
-        existDataMap[tmpKey] = dv
-    }
+	allData, err1 := data_manage.GetAllBaseFromEiaSteoDataList(startDate)
+	if err1 != nil {
+		fmt.Println("get GetAllBaseFromEiaSteoDataList err:" + err1.Error())
+		return
+	}
+	for _, dv := range allData {
+		tmpKey := dv.IndexCode + "_" + dv.DataTime.Format(utils.FormatDate)
+		existDataMap[tmpKey] = dv
+	}
 
 	method := `index/data/list_page`
 
@@ -256,31 +257,30 @@ func SyncEiaSteoIndexDataV2() (err error) {
 		// 总页码数
 		maxPage = respObj.Data.Paging.Pages
 
-	
 		addDataList := make([]*data_manage.BaseFromEiaSteoData, 0)
-        if respObj.Data.List != nil && len(respObj.Data.List) > 0 {
-            for _, dv := range respObj.Data.List {
-                tmpKey := dv.IndexCode + "_" + dv.DataTime.Format(utils.FormatDate)
-                if oldVal, ok := existDataMap[tmpKey]; !ok {
-                    addDataList = append(addDataList, dv)
-                    existDataMap[tmpKey] = dv
-                }else if dv.Value != oldVal.Value {
+		if respObj.Data.List != nil && len(respObj.Data.List) > 0 {
+			for _, dv := range respObj.Data.List {
+				tmpKey := dv.IndexCode + "_" + dv.DataTime.Format(utils.FormatDate)
+				if oldVal, ok := existDataMap[tmpKey]; !ok {
+					addDataList = append(addDataList, dv)
+					existDataMap[tmpKey] = dv
+				} else if dv.Value != oldVal.Value {
 					// 更新指标数据
 					err = data_manage.UpdateBaseFromEiaSteoData(dv)
 					if err != nil {
-						utils.FileLog.Info("UpdateBaseFromEiaSteoData error:"+err.Error())
+						utils.FileLog.Info("UpdateBaseFromEiaSteoData error:" + err.Error())
 					}
 				}
-            }
-        }
+			}
+		}
 
-        // 最后如果还有数据未插入，那么继续插入吧
-        if len(addDataList) > 0 {
-            _, err = data_manage.MultiAddBaseFromEiaSteoDataIndex(addDataList)
-            if err != nil {
-                utils.FileLog.Info("MultiAddBaseFromEiaSteoDataIndex error:"+err.Error())
-            }
-        }
+		// 最后如果还有数据未插入，那么继续插入吧
+		if len(addDataList) > 0 {
+			_, err = data_manage.MultiAddBaseFromEiaSteoDataIndex(addDataList)
+			if err != nil {
+				utils.FileLog.Info("MultiAddBaseFromEiaSteoDataIndex error:" + err.Error())
+			}
+		}
 	}
 
 	return err

services/eic.go

@@ -14,6 +14,7 @@ func SyncRankingFromEic() (err error) {
 	maxDate, err := data_manage.GetBaseFromEicIndexMaxDate()
 	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.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
 	}
@@ -54,4 +55,3 @@ func SyncRankingFromEic() (err error) {
 	}
 	return err
 }
-

services/gpr_risk.go

@@ -95,6 +95,7 @@ func SyncBaseFromGprRiskData() (err error) {
 	maxDate, err := data_manage.GetBaseFromGprRiskMaxDate()
 	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.FormatDateTime)
 	}

services/icpi.go

@@ -105,6 +105,7 @@ func SyncBaseFromIcpiData() (err error) {
 	maxDate, err := data_manage.GetBaseFromIcpiMaxDate()
 	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.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
 	}

services/meeting_probabilities.go

@@ -15,6 +15,7 @@ func SyncMeetingProbabilities() (err error) {
 	maxDate, err := data_manage.GetMeetingProbabilitiesMaxDate()
 	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.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
 	}
@@ -57,4 +58,4 @@ func SyncMeetingProbabilities() (err error) {
 		}
 	}
 	return err
-}
+}

services/sync_hz_data.go

@@ -10,8 +10,9 @@ import (
 // 同步指标
 func SyncHzDataIndex(cont context.Context) (err error) {
 	fmt.Println("SyncHzDataIndex start:", time.Now().Format(utils.FormatDateTime))
+	fmt.Println("郑州交易所 start:", time.Now().Format(utils.FormatDateTime))
 	//郑州交易所
-	go SyncRankingFromZhengzhou()
+	SyncRankingFromZhengzhou()
 	//if err != nil {
 	//	fmt.Println("SyncRankingFromZhengzhou Err:" + err.Error())
 	//	return
@@ -25,48 +26,48 @@ func SyncHzDataIndex(cont context.Context) (err error) {
 	//}
 
 	//上期所
-	go SyncRankingFromShanghai()
+	fmt.Println("上期所 start:", time.Now().Format(utils.FormatDateTime))
+	SyncRankingFromShanghai()
 	//if err != nil {
 	//	fmt.Println("SyncRankingFromDalian Err:" + err.Error())
 	//	return
 	//}
 
 	//中金所
-	go SyncRankingFromCffex()
+	fmt.Println("中金所 start:", time.Now().Format(utils.FormatDateTime))
+	SyncRankingFromCffex()
 	//if err != nil {
 	//	fmt.Println("SyncRankingFromCffex Err:" + err.Error())
 	//	return
 	//}
 
 	//上期能源
-	go SyncRankingFromIne()
+	fmt.Println("上期能源 start:", time.Now().Format(utils.FormatDateTime))
+	SyncRankingFromIne()
 	//if err != nil {
 	//	fmt.Println("SyncRankingFromIne Err:" + err.Error())
 	//	return
 	//}
 
 	//欧洲天然气
-	go func() {
-		err = SyncRankingFromEic()
-		if err != nil {
-			utils.FileLog.Info("SyncRankingFromEic Err:" + err.Error())
-			fmt.Println("SyncRankingFromEic Err:" + err.Error())
-			return
-		}
-	}()
+	fmt.Println("欧洲天然气 start:", time.Now().Format(utils.FormatDateTime))
+	err = SyncRankingFromEic()
+	if err != nil {
+		utils.FileLog.Info("SyncRankingFromEic Err:" + err.Error())
+		fmt.Println("SyncRankingFromEic Err:" + err.Error())
+	}
 
 	//谷歌出行数据
-	go func() {
-		err = SyncChangesVisitorsCovid()
-		if err != nil {
-			utils.FileLog.Info("SyncChangesVisitorsCovid Err:" + err.Error())
-			fmt.Println("SyncChangesVisitorsCovid Err:" + err.Error())
-			return
-		}
-	}()
+	fmt.Println("谷歌出行数据 start:", time.Now().Format(utils.FormatDateTime))
+	err = SyncChangesVisitorsCovid()
+	if err != nil {
+		utils.FileLog.Info("SyncChangesVisitorsCovid Err:" + err.Error())
+		fmt.Println("SyncChangesVisitorsCovid Err:" + err.Error())
+	}
 
 	// EiaSteo
-	go func() {
+	fmt.Println("EiaSteo start:", time.Now().Format(utils.FormatDateTime))
+	{
 		err = SyncEiaSteoClassify()
 		if err != nil {
 			utils.FileLog.Info("SyncEiaSteoClassify Err:" + err.Error())
@@ -85,32 +86,32 @@ func SyncHzDataIndex(cont context.Context) (err error) {
 		if err != nil {
 			utils.FileLog.Info("SyncEiaSteoIndexDataV2 Err:" + err.Error())
 			fmt.Println("SyncEiaSteoIndexDataV2 Err:" + err.Error())
-			return
 		}
-	}()
+	}
 
 	// UN联合国数据
-	go func() {
+	fmt.Println("UN联合国数据 start:", time.Now().Format(utils.FormatDateTime))
+	{
 		err = SyncComTradeIndex()
 		if err != nil {
 			utils.FileLog.Info("SyncComTradeIndexAndData Err:" + err.Error())
 			fmt.Println("SyncComTradeIndexAndData Err:" + err.Error())
-			return
 		}
-	}()
+	}
 
 	// 美联储加息概率
-	go func() {
+	fmt.Println("美联储加息概率 start:", time.Now().Format(utils.FormatDateTime))
+	{
 		err = SyncMeetingProbabilities()
 		if err != nil {
 			utils.FileLog.Info("SyncMeetingProbabilities Err:" + err.Error())
 			fmt.Println("SyncMeetingProbabilities Err:" + err.Error())
-			return
 		}
-	}()
+	}
 
 	//广期所
-	go func() {
+	fmt.Println("广期所 start:", time.Now().Format(utils.FormatDateTime))
+	{
 		//分类信息
 		err = SyncFromGuangzhouClassify()
 		if err != nil {
@@ -137,12 +138,12 @@ func SyncHzDataIndex(cont context.Context) (err error) {
 		if err != nil {
 			utils.FileLog.Info("SyncFromGuangzhouTradeData Err:" + err.Error())
 			fmt.Println("SyncFromGuangzhouTradeData Err:" + err.Error())
-			return
 		}
-	}()
+	}
 
 	//ICPI
-	go func() {
+	fmt.Println("ICPI start:", time.Now().Format(utils.FormatDateTime))
+	{
 		//分类信息
 		err = SyncBaseFromIcpiClassify()
 		if err != nil {
@@ -161,12 +162,12 @@ func SyncHzDataIndex(cont context.Context) (err error) {
 		if err != nil {
 			utils.FileLog.Info("SyncBaseFromIcpiData Err:" + err.Error())
 			fmt.Println("SyncBaseFromIcpiData Err:" + err.Error())
-			return
 		}
-	}()
+	}
 
 	//美国农业部
-	go func() {
+	fmt.Println("美国农业部 start:", time.Now().Format(utils.FormatDateTime))
+	{
 		//分类信息
 		err = SyncBaseFromUsdaFasClassify()
 		if err != nil {
@@ -187,10 +188,11 @@ func SyncHzDataIndex(cont context.Context) (err error) {
 			fmt.Println("SyncBaseFromUsdaFasData Err:" + err.Error())
 			//return
 		}
-	}()
+	}
 
 	//GPR地缘风险指数
-	go func() {
+	fmt.Println("GPR地缘风险指数 start:", time.Now().Format(utils.FormatDateTime))
+	{
 		//分类信息
 		err = SyncBaseFromGprRiskClassify()
 		if err != nil {
@@ -211,7 +213,7 @@ func SyncHzDataIndex(cont context.Context) (err error) {
 			fmt.Println("SyncBaseFromGprRiskData Err:" + err.Error())
 			//return
 		}
-	}()
+	}
 
 	// 同步指标数据
 	SyncHzDataIndexData()
@@ -224,11 +226,12 @@ func SyncHzDataIndex(cont context.Context) (err error) {
 func SyncHzDataIndexData() {
 	var err error
 	// 同步un数据
+	fmt.Println("同步un数据 start:", time.Now().Format(utils.FormatDateTime))
 	err = SyncComTradeData()
 	if err != nil {
 		utils.FileLog.Info("SyncComTradeData Err:" + err.Error())
 		fmt.Println("SyncComTradeData Err:" + err.Error())
-		return
+
 	}
 	//
 	fmt.Println(err)

services/task.go

@@ -14,6 +14,12 @@ import (
 )
 
 func Task() {
+	fmt.Println("开始数据同步")
+	SyncHzDataIndex(nil)
+	SyncRankingFromDalian(nil)
+	fmt.Println("结束数据同步")
+	return
+
 	fmt.Println("task start")
 
 	//如果是生产环境，才需要走这些任务
@@ -56,7 +62,6 @@ func releaseTask() {
 	if utils.BusinessCode != utils.BusinessCodeRelease {
 		syncHzDataIndex := task.NewTask("syncHzDataIndex", "0 10,20,40,50 16,18 * * *", SyncHzDataIndex)
 		task.AddTask("syncHzDataIndex", syncHzDataIndex)
-
 		syncRankingFromDalian := task.NewTask("syncRankingFromDalian", "0 30,40,50 16,18 * * *", SyncRankingFromDalian)
 		task.AddTask("syncRankingFromDalian", syncRankingFromDalian)
 	}

services/trade_cffex.go

@@ -14,6 +14,7 @@ func SyncRankingFromCffex() (err error) {
 	maxDate, err := data_manage.GetBaseFromTradeCffexIndexMaxDate()
 	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"
 	}

services/trade_dalian.go

@@ -15,6 +15,7 @@ func SyncRankingFromDalian(cont context.Context) (err error) {
 	maxDate, err := data_manage.GetBaseFromTradeDalianIndexMaxDate()
 	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.AddDate(0, 0, 1).Format(utils.FormatDate) + " 00:00:00"
 	}

services/trade_guangzhou.go

@@ -140,6 +140,7 @@ func SyncFromGuangzhouTradeData() (err error) {
 	maxDate, err := data_manage.GetBaseFromTradeGuangzhouMaxDate()
 	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"
 	}

services/trade_ine.go

@@ -14,6 +14,7 @@ func SyncRankingFromIne() (err error) {
 	maxDate, err := data_manage.GetBaseFromTradeIneIndexMaxDate()
 	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"
 	}

services/trade_shanghai.go

@@ -14,6 +14,7 @@ func SyncRankingFromShanghai() (err error) {
 	maxDate, err := data_manage.GetBaseFromTradeShangHaiIndexMaxDate()
 	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"
 	}

services/trade_zhengzhou.go

@@ -15,6 +15,7 @@ func SyncRankingFromZhengzhou() (err error) {
 	maxDate, err := data_manage.GetBaseFromTradeZhengzhouIndexMaxDate()
 	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"
 	}

services/usda_fas.go

@@ -95,6 +95,7 @@ func SyncBaseFromUsdaFasData() (err error) {
 	maxDate, err := data_manage.GetBaseFromUsdaFasMaxDate()
 	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.FormatDateTime)
 	}