Browse Source

fix:更新时的数据问题

Roc 2 years ago
parent
commit
41a03f08b5
3 changed files with 5 additions and 5 deletions
  1. 1 1
      models/base_from_wind.go
  2. 3 3
      models/edb_data_base.go
  3. 1 1
      services/base_from_wind.go

+ 1 - 1
models/base_from_wind.go

@@ -83,7 +83,7 @@ func RefreshEdbDataFromWind(edbInfoId int, edbCode, startDate string, item *serv
 
 		//如果传入的开始时间是空的,且当前数据日期早于传入的开始日期,那么需要判断下当前日期的数据是否存在
 		if !startDateTime.IsZero() && t.Before(startDateTime) {
-			tmpItem, tmpErr := GetEdbDataByDate(source, dateTime)
+			tmpItem, tmpErr := GetEdbDataByDate(source, edbCode, dateTime)
 			if tmpErr == nil && tmpItem != nil {
 				existMap[tmpItem.DataTime] = tmpItem
 			}

+ 3 - 3
models/edb_data_base.go

@@ -86,12 +86,12 @@ func GetEdbDataByCondition(source int, condition string, pars []interface{}) (it
 }
 
 // GetEdbDataByDate 根据数据日期获取指标数据
-func GetEdbDataByDate(source int, dataTime string) (item *EdbInfoSearchData, err error) {
+func GetEdbDataByDate(source int, edbCode, dataTime string) (item *EdbInfoSearchData, err error) {
 	o := orm.NewOrm()
 	tableName := GetEdbDataTableName(source)
-	sql := ` SELECT * FROM %s WHERE 1=1 and data_time =? ORDER BY data_time DESC `
+	sql := ` SELECT * FROM %s WHERE 1=1 AND edb_code = ? AND data_time =? ORDER BY data_time DESC `
 	sql = fmt.Sprintf(sql, tableName)
-	err = o.Raw(sql, dataTime).QueryRow(&item)
+	err = o.Raw(sql, edbCode, dataTime).QueryRow(&item)
 	return
 }
 

+ 1 - 1
services/base_from_wind.go

@@ -31,7 +31,7 @@ func GetEdbDataFromWind(edbCode, startDate, endDate string) (item *EdbDataFromWi
 	body, err := http.Get(thsUrl)
 	fmt.Println("GetEdbDataByWind body:")
 	fmt.Println(string(body))
-	utils.FileLog.Info(fmt.Sprint("wind result:", string(body)))
+	utils.FileLog.Info(fmt.Sprint("指标编码:", edbCode, ";wind result:", string(body)))
 
 	if err != nil {
 		return