商品价格曲线

models/data_manage/future_good/future_good_edb_info.go

@@ -3,9 +3,8 @@ package future_good
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
-	"gorm.io/gorm"
 	"time"
+	"gorm.io/gorm"
 )
 
 // FutureGoodEdbInfo 期货指标表
@@ -61,10 +60,16 @@ func GetFutureGoodEdbInfo(edbInfoId int) (item *FutureGoodEdbInfo, err error) {
 
 // GetFutureGoodEdbInfoByCode 根据期货code获取 期货指标信息
 func GetFutureGoodEdbInfoByCode(futureGoodEdbCode string) (item *FutureGoodEdbInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM future_good_edb_info WHERE future_good_edb_code = ? `
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	err = o.Raw(sql, futureGoodEdbCode).QueryRow(&item)
+	err = o.Raw(sql, futureGoodEdbCode).First(&item).Error
+	if err != nil {
+		return
+	}
+	if item != nil {
+		item.ConvertTimeStr()
+	}
 	return
 }
 
@@ -75,7 +80,7 @@ func GetFutureGoodEdbInfoList(condition string, pars []interface{}) (list []*Fut
 		sql += condition
 	}
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Scan(&list).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&list).Error
 
 	return
 }
@@ -83,7 +88,7 @@ func GetFutureGoodEdbInfoList(condition string, pars []interface{}) (list []*Fut
 // GetAllFutureGoodEdbInfoList 获取指标数据列表
 func GetAllFutureGoodEdbInfoList() (list []*FutureGoodEdbInfo, err error) {
 	sql := `SELECT * FROM future_good_edb_info  ORDER BY future_good_edb_info_id DESC `
-	err = global.DbMap[utils.DbNameIndex].Raw(sql).Scan(&list).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sql).Find(&list).Error
 
 	return
 }
@@ -91,7 +96,7 @@ func GetAllFutureGoodEdbInfoList() (list []*FutureGoodEdbInfo, err error) {
 // GetFutureGoodEdbInfoListByParentId 根据父级ID获取指标数据列表
 func GetFutureGoodEdbInfoListByParentId(parentId int) (list []*FutureGoodEdbInfo, err error) {
 	sql := `SELECT * FROM future_good_edb_info WHERE parent_id = ? or  future_good_edb_info_id = ? ORDER BY future_good_edb_info_id ASC `
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, parentId, parentId).Scan(&list).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, parentId, parentId).Find(&list).Error
 
 	return
 }
@@ -99,7 +104,7 @@ func GetFutureGoodEdbInfoListByParentId(parentId int) (list []*FutureGoodEdbInfo
 // GetChildFutureGoodEdbInfoListByParentId 根据父级ID获取下面所有的指标数据列表
 func GetChildFutureGoodEdbInfoListByParentId(parentId int) (list []*FutureGoodEdbInfo, err error) {
 	sql := `SELECT * FROM future_good_edb_info WHERE parent_id = ? ORDER BY future_good_edb_info_id ASC `
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, parentId).Scan(&list).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, parentId).Find(&list).Error
 	return
 }
 
@@ -131,7 +136,7 @@ func GetFutureGoodEdbInfoGroupList(condition string, pars []interface{}) (list [
 		sql += condition
 	}
 	sql += ` ORDER BY future_good_edb_info_id DESC `
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Scan(&list).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&list).Error
 
 	return
 }
@@ -149,7 +154,7 @@ func GetFutureGoodEdbExchangeList(condition string, pars []interface{}) (list []
 	}
 	sql += ` GROUP BY exchange `
 	sql = utils.ReplaceDriverKeywords("", sql)
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Scan(&list).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&list).Error
 	return
 }