Merge branch 'hotfix/bug8100_eia_steo' of eta_server/eta_task into master

models/data_manage/base_from_trade_guangzhou.go

@@ -160,6 +160,12 @@ func GetAllBaseFromTradeGuangzhouDataList(startDate string) (list []*BaseFromTra
 	return
 }
 
+// 设置after find函数
+func (m *BaseFromTradeGuangzhouData) AfterFind(db *gorm.DB) (err error) {
+	m.DataTime = utils.GormDateStrToDateStr(m.DataTime)
+	return
+}
+
 type BaseFromTradeGuangzhouDataResp struct {
 	Ret     int
 	Msg     string

models/data_manage/base_from_usda_fas.go

@@ -17,8 +17,8 @@ type BaseFromUsdaFasIndex struct {
 	Frequency              string
 	Unit                   string
 	Sort                   int
-	StartDate              string `description:"开始日期"`
-	EndDate                string `description:"结束日期"`
+	StartDate              time.Time `description:"开始日期"`
+	EndDate                time.Time `description:"结束日期"`
 	EndValue               float64
 	Country                string `description:"国家"`
 	Commodity              string `description:"属性"`
@@ -26,11 +26,11 @@ type BaseFromUsdaFasIndex struct {
 	ModifyTime             time.Time
 }
 
-func (m *BaseFromUsdaFasIndex) AfterFind(db *gorm.DB) (err error) {
-	m.StartDate = utils.GormDateStrToDateStr(m.StartDate)
-	m.EndDate = utils.GormDateStrToDateStr(m.EndDate)
-	return
-}
+// func (m *BaseFromUsdaFasIndex) AfterFind(db *gorm.DB) (err error) {
+// 	m.StartDate = utils.GormDateStrToDateStr(m.StartDate)
+// 	m.EndDate = utils.GormDateStrToDateStr(m.EndDate)
+// 	return
+// }
 
 // BaseFromUsdaFasClassify UsdaFas原始数据分类表
 type BaseFromUsdaFasClassify struct {

services/changes_visitors_covid.go

@@ -24,8 +24,8 @@ func SyncChangesVisitorsCovid() (err error) {
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
 	result, err := HttpPost("SyncChangesVisitorsCovid", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
+	//utils.FileLog.Info(result)
+	//fmt.Println(result)
 
 	respObj := new(data_manage.ChangesVisitorsCovidIndexResp)
 	err = json.Unmarshal([]byte(result), &respObj)

services/com_trade.go

@@ -124,8 +124,8 @@ func SyncComTradeData() (err error) {
 
 		var result string
 		result, err = HttpPost("SyncComTradeData", method, data)
-		utils.FileLog.Info(result)
-		fmt.Println(result)
+		//utils.FileLog.Info(result)
+		//fmt.Println(result)
 
 		respObj := new(data_manage.ComTradeIndexDataResp)
 		err = json.Unmarshal([]byte(result), &respObj)

services/eia_steo.go

@@ -92,8 +92,8 @@ func SyncEiaSteoIndexData() (err error) {
 			utils.FileLog.Info("HttpPost err:", err)
 			return
 		}
-		utils.FileLog.Info(result)
-		fmt.Println(result)
+		//utils.FileLog.Info(result)
+		//fmt.Println(result)
 
 		respObj := new(data_manage.EiaSteoIndexDataResp)
 		err = json.Unmarshal([]byte(result), &respObj)

services/eic.go

@@ -24,8 +24,8 @@ func SyncRankingFromEic() (err error) {
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
 	result, err := HttpPost("SyncRankingFromEic", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
+	//utils.FileLog.Info(result)
+	//fmt.Println(result)
 
 	respObj := new(data_manage.EicIndexResp)
 	err = json.Unmarshal([]byte(result), &respObj)

services/gpr_risk.go

@@ -25,8 +25,8 @@ func SyncBaseFromGprRisk() (err error) {
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
 	result, err := HttpPost("SyncRankingFromGprRisk", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
+	//utils.FileLog.Info(result)
+	//fmt.Println(result)
 
 	respObj := new(data_manage.GprRiskIndexResp)
 	err = json.Unmarshal([]byte(result), &respObj)
@@ -57,8 +57,8 @@ func SyncBaseFromGprRiskClassify() (err error) {
 	if err != nil {
 		fmt.Println("SyncBaseFromGprRiskClassify HttpPost Err:", err.Error())
 	}
-	utils.FileLog.Info(result)
-	fmt.Println("SyncBaseFromGprRiskClassify result:", result)
+	//utils.FileLog.Info(result)
+	//fmt.Println("SyncBaseFromGprRiskClassify result:", result)
 
 	respObj := new(data_manage.GprRiskClassifyResp)
 	err = json.Unmarshal([]byte(result), &respObj)
@@ -124,8 +124,8 @@ func SyncBaseFromGprRiskData() (err error) {
 
 		var result string
 		result, err = HttpPost("SyncBaseFromGprRiskData", method, data)
-		utils.FileLog.Info(result)
-		fmt.Println(result)
+		//utils.FileLog.Info(result)
+		//fmt.Println(result)
 
 		respObj := new(data_manage.BaseFromGprRiskDataResp)
 		err = json.Unmarshal([]byte(result), &respObj)

services/icpi.go

@@ -25,8 +25,8 @@ func SyncBaseFromIcpi() (err error) {
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
 	result, err := HttpPost("SyncRankingFromIcpi", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
+	//utils.FileLog.Info(result)
+	//fmt.Println(result)
 
 	respObj := new(data_manage.IcpiIndexResp)
 	err = json.Unmarshal([]byte(result), &respObj)

services/sync_hz_data.go

@@ -46,135 +46,172 @@ func SyncHzDataIndex(cont context.Context) (err error) {
 	//}
 
 	//欧洲天然气
-	err = SyncRankingFromEic()
-	if err != nil {
-		fmt.Println("SyncRankingFromEic 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
+		}
+	}()
 
 	//谷歌出行数据
-	err = SyncChangesVisitorsCovid()
-	if err != nil {
-		fmt.Println("SyncChangesVisitorsCovid Err:" + err.Error())
-		return
-	}
+	go func() {
+		err = SyncChangesVisitorsCovid()
+		if err != nil {
+			utils.FileLog.Info("SyncChangesVisitorsCovid Err:" + err.Error())
+			fmt.Println("SyncChangesVisitorsCovid Err:" + err.Error())
+			return
+		}
+	}()
 
 	// EiaSteo
-	err = SyncEiaSteoClassify()
-	if err != nil {
-		fmt.Println("SyncEiaSteoClassify Err:" + err.Error())
-		return
-	}
-	err = SyncEiaSteoIndex()
-	if err != nil {
-		fmt.Println("SyncEiaSteoIndex Err:" + err.Error())
-		return
-	}
+	go func() {
+		err = SyncEiaSteoClassify()
+		if err != nil {
+			utils.FileLog.Info("SyncEiaSteoClassify Err:" + err.Error())
+			fmt.Println("SyncEiaSteoClassify Err:" + err.Error())
+			//return
+		}
+		err = SyncEiaSteoIndex()
+		if err != nil {
+			utils.FileLog.Info("SyncEiaSteoIndex Err:" + err.Error())
+			fmt.Println("SyncEiaSteoIndex Err:" + err.Error())
+			//return
+		}
+
+		//EiaSteo
+		err = SyncEiaSteoIndexDataV2()
+		if err != nil {
+			utils.FileLog.Info("SyncEiaSteoIndexDataV2 Err:" + err.Error())
+			fmt.Println("SyncEiaSteoIndexDataV2 Err:" + err.Error())
+			return
+		}
+	}()
 
 	// UN联合国数据
-	err = SyncComTradeIndex()
-	if err != nil {
-		fmt.Println("SyncComTradeIndexAndData Err:" + err.Error())
-		return
-	}
+	go func() {
+		err = SyncComTradeIndex()
+		if err != nil {
+			utils.FileLog.Info("SyncComTradeIndexAndData Err:" + err.Error())
+			fmt.Println("SyncComTradeIndexAndData Err:" + err.Error())
+			return
+		}
+	}()
 
 	// 美联储加息概率
-	err = SyncMeetingProbabilities()
-	if err != nil {
-		fmt.Println("SyncMeetingProbabilities Err:" + err.Error())
-		return
-	}
+	go func() {
+		err = SyncMeetingProbabilities()
+		if err != nil {
+			utils.FileLog.Info("SyncMeetingProbabilities Err:" + err.Error())
+			fmt.Println("SyncMeetingProbabilities Err:" + err.Error())
+			return
+		}
+	}()
 
 	//广期所
-	{
+	go func() {
 		//分类信息
 		err = SyncFromGuangzhouClassify()
 		if err != nil {
+			utils.FileLog.Info("SyncFromGuangzhouClassify Err:" + err.Error())
 			fmt.Println("SyncFromGuangzhouClassify Err:" + err.Error())
-			return
+			//return
 		}
 		//合约信息
 		err = SyncFromGuangzhouContract()
 		if err != nil {
+			utils.FileLog.Info("SyncFromGuangzhouContract Err:" + err.Error())
 			fmt.Println("SyncFromGuangzhouContract Err:" + err.Error())
-			return
+			//return
 		}
 		//指标信息
 		err = SyncFromGuangzhouIndex()
 		if err != nil {
+			utils.FileLog.Info("SyncFromGuangzhouIndex Err:" + err.Error())
 			fmt.Println("SyncFromGuangzhouIndex Err:" + err.Error())
-			return
+			//return
 		}
 		//数据
 		err = SyncFromGuangzhouTradeData()
 		if err != nil {
+			utils.FileLog.Info("SyncFromGuangzhouTradeData Err:" + err.Error())
 			fmt.Println("SyncFromGuangzhouTradeData Err:" + err.Error())
 			return
 		}
-	}
+	}()
 
 	//ICPI
-	{
+	go func() {
 		//分类信息
 		err = SyncBaseFromIcpiClassify()
 		if err != nil {
+			utils.FileLog.Info("SyncBaseFromIcpiClassify Err:" + err.Error())
 			fmt.Println("SyncBaseFromIcpiClassify Err:" + err.Error())
-			return
+			//return
 		}
 		//指标信息
 		err = SyncBaseFromIcpi()
 		if err != nil {
+			utils.FileLog.Info("SyncBaseFromIcpi Err:" + err.Error())
 			fmt.Println("SyncBaseFromIcpi Err:" + err.Error())
-			return
+			//return
 		}
 		err = SyncBaseFromIcpiData()
 		if err != nil {
+			utils.FileLog.Info("SyncBaseFromIcpiData Err:" + err.Error())
 			fmt.Println("SyncBaseFromIcpiData Err:" + err.Error())
 			return
 		}
-	}
+	}()
 
 	//美国农业部
-	{
+	go func() {
 		//分类信息
 		err = SyncBaseFromUsdaFasClassify()
 		if err != nil {
+			utils.FileLog.Info("SyncBaseFromUsdaFasClassify Err:" + err.Error())
 			fmt.Println("SyncBaseFromUsdaFasClassify Err:" + err.Error())
-			return
+			//return
 		}
 		//指标信息
 		err = SyncBaseFromUsdaFas()
 		if err != nil {
+			utils.FileLog.Info("SyncBaseFromUsdaFas Err:" + err.Error())
 			fmt.Println("SyncBaseFromUsdaFas Err:" + err.Error())
-			return
+			//return
 		}
 		err = SyncBaseFromUsdaFasData()
 		if err != nil {
+			utils.FileLog.Info("SyncBaseFromUsdaFasData Err:" + err.Error())
 			fmt.Println("SyncBaseFromUsdaFasData Err:" + err.Error())
-			return
+			//return
 		}
-	}
+	}()
 
 	//GPR地缘风险指数
-	{
+	go func() {
 		//分类信息
 		err = SyncBaseFromGprRiskClassify()
 		if err != nil {
+			utils.FileLog.Info("SyncBaseFromGprRiskClassify Err:" + err.Error())
 			fmt.Println("SyncBaseFromGprRiskClassify Err:" + err.Error())
-			return
+			//return
 		}
 		//指标信息
 		err = SyncBaseFromGprRisk()
 		if err != nil {
+			utils.FileLog.Info("SyncBaseFromGprRisk Err:" + err.Error())
 			fmt.Println("SyncBaseFromGprRisk Err:" + err.Error())
-			return
+			//return
 		}
 		err = SyncBaseFromGprRiskData()
 		if err != nil {
+			utils.FileLog.Info("SyncBaseFromGprRiskData Err:" + err.Error())
 			fmt.Println("SyncBaseFromGprRiskData Err:" + err.Error())
-			return
+			//return
 		}
-	}
+	}()
 
 	// 同步指标数据
 	SyncHzDataIndexData()
@@ -186,21 +223,13 @@ func SyncHzDataIndex(cont context.Context) (err error) {
 // SyncHzDataIndexData 同步指标数据
 func SyncHzDataIndexData() {
 	var err error
-	//EiaSteo
-	err = SyncEiaSteoIndexDataV2()
-	if err != nil {
-		fmt.Println("SyncEiaSteoIndexDataV2 Err:" + err.Error())
-		utils.FileLog.Info("SyncEiaSteoIndexDataV2 Err:" + err.Error())
-		return
-	}
-
 	// 同步un数据
 	err = SyncComTradeData()
 	if err != nil {
+		utils.FileLog.Info("SyncComTradeData Err:" + err.Error())
 		fmt.Println("SyncComTradeData Err:" + err.Error())
 		return
 	}
-
 	//
 	fmt.Println(err)
 }

services/trade_cffex.go

@@ -24,8 +24,8 @@ func SyncRankingFromCffex() (err error) {
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
 	result, err := HttpPost("SyncRankingFromCffex", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
+	//utils.FileLog.Info(result)
+	//fmt.Println(result)
 
 	respObj := new(data_manage.CffexIndexResp)
 	err = json.Unmarshal([]byte(result), &respObj)

services/trade_guangzhou.go

@@ -19,8 +19,8 @@ func SyncFromGuangzhouClassify() (err error) {
 		fmt.Println("SyncFromGuangzhouClassify HttpPost Err:", err.Error())
 		return err
 	}
-	utils.FileLog.Info("SyncFromGuangzhouClassify:" + result)
-	fmt.Println("SyncFromGuangzhouClassify result:", result)
+	//utils.FileLog.Info("SyncFromGuangzhouClassify:" + result)
+	//fmt.Println("SyncFromGuangzhouClassify result:", result)
 
 	respObj := new(data_manage.GuangzhouClassifyResp)
 	err = json.Unmarshal([]byte(result), &respObj)
@@ -59,8 +59,8 @@ func SyncFromGuangzhouIndex() (err error) {
 	if err != nil {
 		fmt.Println("SyncFromGuangzhou HttpPost Err:", err.Error())
 	}
-	utils.FileLog.Info(result)
-	fmt.Println("SyncFromGuangzhouIndex result:", result)
+	//utils.FileLog.Info(result)
+	//fmt.Println("SyncFromGuangzhouIndex result:", result)
 
 	respObj := new(data_manage.GuangzhouIndexResp)
 	err = json.Unmarshal([]byte(result), &respObj)
@@ -100,8 +100,8 @@ func SyncFromGuangzhouContract() (err error) {
 	if err != nil {
 		fmt.Println("SyncFromGuangzhouContract HttpPost Err:", err.Error())
 	}
-	utils.FileLog.Info(result)
-	fmt.Println("SyncFromGuangzhouContract result:", result)
+	//utils.FileLog.Info(result)
+	//fmt.Println("SyncFromGuangzhouContract result:", result)
 
 	respObj := new(data_manage.GuangzhouContractResp)
 	err = json.Unmarshal([]byte(result), &respObj)
@@ -154,6 +154,7 @@ func SyncFromGuangzhouTradeData() (err error) {
 	}
 	for _, dv := range allData {
 		tmpKey := dv.IndexCode + "_" + dv.DataTime
+		//fmt.Println("GetAllBaseFromTradeGuangzhouDataList tmpKey:", tmpKey)
 		existDataMap[tmpKey] = dv
 	}
 
@@ -169,8 +170,8 @@ func SyncFromGuangzhouTradeData() (err error) {
 
 		var result string
 		result, err = HttpPost("SyncFromGuangzhouTradeData", method, data)
-		utils.FileLog.Info(result)
-		fmt.Println(result)
+		//utils.FileLog.Info(result)
+		//fmt.Println(result)
 
 		respObj := new(data_manage.BaseFromTradeGuangzhouDataResp)
 		err = json.Unmarshal([]byte(result), &respObj)
@@ -189,6 +190,7 @@ func SyncFromGuangzhouTradeData() (err error) {
 		if respObj.Data.List != nil && len(respObj.Data.List) > 0 {
 			for _, dv := range respObj.Data.List {
 				tmpKey := dv.IndexCode + "_" + dv.DataTime
+				//fmt.Println("SyncFromGuangzhouTradeData2 tmpKey:", tmpKey)
 				if _, ok := existDataMap[tmpKey]; !ok {
 					addDataList = append(addDataList, dv)
 					existDataMap[tmpKey] = dv

services/trade_shanghai.go

@@ -24,8 +24,8 @@ func SyncRankingFromShanghai() (err error) {
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
 	result, err := HttpPost("SyncRankingFromShanghai", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
+	//utils.FileLog.Info(result)
+	//fmt.Println(result)
 
 	respObj := new(data_manage.ShanghaiIndexResp)
 	err = json.Unmarshal([]byte(result), &respObj)

services/usda_fas.go

@@ -25,8 +25,8 @@ func SyncBaseFromUsdaFas() (err error) {
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
 	result, err := HttpPost("SyncRankingFromUsdaFas", method, data)
-	utils.FileLog.Info(result)
-	fmt.Println(result)
+	//utils.FileLog.Info(result)
+	//fmt.Println(result)
 
 	respObj := new(data_manage.UsdaFasIndexResp)
 	err = json.Unmarshal([]byte(result), &respObj)
@@ -39,11 +39,11 @@ func SyncBaseFromUsdaFas() (err error) {
 	UsdaFasObj := new(data_manage.BaseFromUsdaFasIndex)
 
 	for _, zv := range respObj.Data {
-		newID, err := UsdaFasObj.InsertOrUpdateBaseFromUsdaFasIndex(zv)
+		_, err := UsdaFasObj.InsertOrUpdateBaseFromUsdaFasIndex(zv)
 		if err != nil {
 			fmt.Println("InsertOrUpdateBaseFromUsdaFasIndex error:", err)
 		}
-		fmt.Println("InsertOrUpdateBaseFromUsdaFasIndex new indexID:", newID)
+		//fmt.Println("InsertOrUpdateBaseFromUsdaFasIndex new indexID:", newID)
 	}
 	return err
 }
@@ -124,8 +124,8 @@ func SyncBaseFromUsdaFasData() (err error) {
 
 		var result string
 		result, err = HttpPost("SyncBaseFromUsdaFasData", method, data)
-		utils.FileLog.Info(result)
-		fmt.Println(result)
+		//utils.FileLog.Info(result)
+		//fmt.Println(result)
 
 		respObj := new(data_manage.BaseFromUsdaFasDataResp)
 		err = json.Unmarshal([]byte(result), &respObj)