|
@@ -4,6 +4,7 @@ import (
|
|
|
"eta/eta_index_lib/global"
|
|
|
"eta/eta_index_lib/utils"
|
|
|
"fmt"
|
|
|
+ "gorm.io/gorm"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
@@ -12,10 +13,17 @@ import (
|
|
|
//钢联
|
|
|
|
|
|
type EiaSteoData struct {
|
|
|
- InputValue float64 `orm:"column(value)" description:"值"`
|
|
|
+ InputValue float64 `gorm:"column(value)" description:"值"`
|
|
|
DataTime string `orm:"column(data_time)" description:"日期"`
|
|
|
}
|
|
|
|
|
|
+// AfterFind 在该模型上设置钩子函数,把日期转成正确的string,所以查询函数只能用Find函数,First或者Scan是不会触发该函数的来获取数据
|
|
|
+func (m *EiaSteoData) AfterFind(db *gorm.DB) (err error) {
|
|
|
+ m.DataTime = utils.GormDateStrToDateStr(m.DataTime)
|
|
|
+
|
|
|
+ return
|
|
|
+}
|
|
|
+
|
|
|
func GetEiaSteoDataByCondition(condition string, pars []interface{}) (item []*EiaSteoData, err error) {
|
|
|
sql1 := ` SELECT * FROM base_from_eia_steo_data WHERE 1=1 `
|
|
|
//o := orm.NewOrm()
|
|
@@ -51,6 +59,7 @@ func AddEdbDataFromEiaSteo(edbCode string) (err error) {
|
|
|
if dataLen > 0 {
|
|
|
var isAdd bool
|
|
|
addSql := ` INSERT INTO edb_data_eia_steo (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
|
|
|
+ addSql = utils.ReplaceDriverKeywords("", addSql)
|
|
|
for i := 0; i < dataLen; i++ {
|
|
|
item := EiaSteoDataList[i]
|
|
|
eDate := item.DataTime
|
|
@@ -145,6 +154,7 @@ func RefreshEdbDataFromEiaSteo(edbInfoId int, edbCode, startDate string) (err er
|
|
|
}
|
|
|
|
|
|
addSql := ` INSERT INTO edb_data_eia_steo(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
|
|
|
+ addSql = utils.ReplaceDriverKeywords("", addSql)
|
|
|
var isAdd bool
|
|
|
addMap := make(map[string]string)
|
|
|
for _, v := range EiaSteoDataList {
|