Browse Source

fix:eia指标同步

zqbao 6 months ago
parent
commit
00981fae9a
2 changed files with 21 additions and 5 deletions
  1. 7 0
      models/data_manage/base_from_eia_steo.go
  2. 14 5
      services/eia_steo.go

+ 7 - 0
models/data_manage/base_from_eia_steo.go

@@ -199,3 +199,10 @@ func GetBaseFromEiaSteoIndexMaxDate() (max_date time.Time, err error) {
 	err = o.Raw(sql).QueryRow(&max_date)
 	return
 }
+
+func GetBaseFromEiaSteoIndexMaxCreateDate() (max_date time.Time, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT max(a.create_time)as max_date FROM base_from_eia_steo_index as a `
+	err = o.Raw(sql).QueryRow(&max_date)
+	return
+}

+ 14 - 5
services/eia_steo.go

@@ -11,7 +11,7 @@ import (
 // SyncEiaSteoIndex EIA STEO报告 指标
 func SyncEiaSteoIndex() (err error) {
 	var startDate string
-	maxDate, err := data_manage.GetBaseFromEiaSteoIndexMaxDate()
+	maxDate, err := data_manage.GetBaseFromEiaSteoIndexMaxCreateDate()
 	if err != nil || maxDate.IsZero() {
 		startDate = time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
 	} else {
@@ -24,6 +24,11 @@ func SyncEiaSteoIndex() (err error) {
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
 	result, err := HttpPost("SyncEiaSteoIndex", method, data)
+	if err != nil {
+		fmt.Println("HttpPost err:", err)
+		utils.FileLog.Info("HttpPost err:", err)
+		return
+	}
 	utils.FileLog.Info(result)
 	fmt.Println(result)
 
@@ -78,6 +83,11 @@ func SyncEiaSteoIndexData() (err error) {
 
 		var result string
 		result, err = HttpPost("SyncEiaSteoIndexData", method, data)
+		if err != nil {
+			fmt.Println("HttpPost err:", err)
+			utils.FileLog.Info("HttpPost err:", err)
+			return
+		}
 		utils.FileLog.Info(result)
 		fmt.Println(result)
 
@@ -188,7 +198,7 @@ func SyncEiaSteoClassify() (err error) {
 }
 
 func SyncEiaSteoIndexDataV2() (err error) {
-	startDate := time.Now().Format(utils.FormatDate) + " 00:00:00"
+	startDate := time.Now().AddDate(0, 0, -1).Format(utils.FormatDate) + " 00:00:00"
 
 	method := `index/data/list`
 
@@ -201,7 +211,6 @@ func SyncEiaSteoIndexDataV2() (err error) {
 	}
 
 	for _, indexCode := range allIndexCode {
-
 		data := make(map[string]interface{})
 		data["Source"] = utils.DATA_SOURCE_EIA_STEO
 		data["StartDate"] = startDate
@@ -245,12 +254,12 @@ func SyncEiaSteoIndexDataV2() (err error) {
 				upDateCols := make([]string, 0)
 				if !v.DataTime.Equal(dv.DataTime) {
 					v.DataTime = dv.DataTime
-					upDateCols = append(upDateCols, "DataTime")
+					upDateCols = append(upDateCols, "data_time")
 				}
 				if v.Value != dv.Value {
 					v.Value = dv.Value
 					v.ModifyTime = dv.ModifyTime
-					upDateCols = append(upDateCols, []string{"Value", "ModifyTime"}...)
+					upDateCols = append(upDateCols, []string{"value", "modify_time"}...)
 				}
 				if len(upDateCols) > 0 {
 					err = v.Update(upDateCols)