|
|
@@ -1,17 +1,17 @@
|
|
|
package models
|
|
|
|
|
|
import (
|
|
|
+ "eta/eta_index_lib/global"
|
|
|
"eta/eta_index_lib/utils"
|
|
|
"fmt"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
|
-
|
|
|
- "github.com/beego/beego/v2/client/orm"
|
|
|
)
|
|
|
|
|
|
type BaseFromSmmData struct {
|
|
|
- SmmDataId int `orm:"column(smm_data_id);pk"`
|
|
|
+ SmmDataId int `gorm:"column:smm_data_id;primaryKey"`
|
|
|
+ //SmmDataId int `orm:"column(smm_data_id);pk"`
|
|
|
BaseFromSmmIndexId int
|
|
|
IndexCode string
|
|
|
DataTime string
|
|
|
@@ -22,41 +22,61 @@ type BaseFromSmmData struct {
|
|
|
}
|
|
|
|
|
|
func (s *BaseFromSmmData) Update(cols []string) (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
- _, err = o.Update(s, cols...)
|
|
|
+ //o := orm.NewOrm()
|
|
|
+ //_, err = o.Update(s, cols...)
|
|
|
+ err = global.DEFAULT_DB.Model(&s).Select(cols).Updates(&s).Error
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func AddBaseFromSmmData(item []*BaseFromSmmData) (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
- _, err = o.InsertMulti(500, item)
|
|
|
+ //o := orm.NewOrm()
|
|
|
+ //_, err = o.InsertMulti(500, item)
|
|
|
+ err = global.DEFAULT_DB.CreateInBatches(item, 500).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func GetBaseFromSmmDataByCondition(condition string, pars []interface{}) (list []*BaseFromSmmData, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
sql := `SELECT * FROM base_from_smm_data WHERE 1=1 `
|
|
|
if condition != "" {
|
|
|
sql += condition
|
|
|
}
|
|
|
- _, err = o.Raw(sql, pars).QueryRows(&list)
|
|
|
+ //_, err = o.Raw(sql, pars).QueryRows(&list)
|
|
|
+ err = global.DEFAULT_DB.Raw(sql, pars...).Find(&list).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func UpdateBaseFromSmmDataListByIndexCode(items []*BaseFromSmmData) (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
+ to := global.DEFAULT_DB.Begin()
|
|
|
+ defer func() {
|
|
|
+ if err != nil {
|
|
|
+ _ = to.Rollback()
|
|
|
+ } else {
|
|
|
+ _ = to.Commit()
|
|
|
+ }
|
|
|
+ }()
|
|
|
+
|
|
|
sql := `UPDATE base_from_smm_data SET value=? WHERE index_code=? AND data_time=? `
|
|
|
- stmt, err := o.Raw(sql).Prepare()
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
- }
|
|
|
- defer stmt.Close()
|
|
|
for _, item := range items {
|
|
|
- _, err = stmt.Exec(item.Value, item.IndexCode, item.DataTime)
|
|
|
+ err = to.Exec(sql, item.Value, item.IndexCode, item.DataTime).Error
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
+ //stmt, err := o.Raw(sql).Prepare()
|
|
|
+ //if err != nil {
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //defer stmt.Close()
|
|
|
+ //for _, item := range items {
|
|
|
+ // _, err = stmt.Exec(item.Value, item.IndexCode, item.DataTime)
|
|
|
+ // if err != nil {
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -64,22 +84,25 @@ func GetBaseFromSmmDataByIds(smmDataIds []int) (list []*BaseFromSmmData, err err
|
|
|
if len(smmDataIds) == 0 {
|
|
|
return
|
|
|
}
|
|
|
- o := orm.NewOrm()
|
|
|
- sql := `SELECT * FROM base_from_smm_data WHERE 1=1 AND base_from_smm_index_id in (` + utils.GetOrmInReplace(len(smmDataIds)) + `)`
|
|
|
- _, err = o.Raw(sql, smmDataIds).QueryRows(&list)
|
|
|
+ //o := orm.NewOrm()
|
|
|
+ //sql := `SELECT * FROM base_from_smm_data WHERE 1=1 AND base_from_smm_index_id in (` + utils.GetOrmInReplace(len(smmDataIds)) + `)`
|
|
|
+ sql := `SELECT * FROM base_from_smm_data WHERE 1=1 AND base_from_smm_index_id in ?`
|
|
|
+ //_, err = o.Raw(sql, smmDataIds).QueryRows(&list)
|
|
|
+ err = global.DEFAULT_DB.Raw(sql, smmDataIds).Find(&list).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func GetBaseFromSmmDataByCodeAndDate(indexCode string, dataTime string) (item *BaseFromSmmData, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
sql := `SELECT * FROM base_from_smm_data WHERE 1=1 AND index_code=? AND data_time=? `
|
|
|
- err = o.Raw(sql, indexCode, dataTime).QueryRow(&item)
|
|
|
+ //err = o.Raw(sql, indexCode, dataTime).QueryRow(&item)
|
|
|
+ err = global.DEFAULT_DB.Raw(sql, indexCode, dataTime).First(&item).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
// 新增有色指标数据
|
|
|
func AddEdbDataFromSmm(edbCode string, smmBaseDataAll []*BaseFromSmmData) (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
var isAdd bool
|
|
|
addSql := ` INSERT INTO edb_data_ys(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
|
|
|
existMap := make(map[string]string)
|
|
|
@@ -100,7 +123,8 @@ func AddEdbDataFromSmm(edbCode string, smmBaseDataAll []*BaseFromSmmData) (err e
|
|
|
if isAdd {
|
|
|
addSql = strings.TrimRight(addSql, ",")
|
|
|
utils.FileLog.Info("addSql:" + addSql)
|
|
|
- _, err = o.Raw(addSql).Exec()
|
|
|
+ //_, err = o.Raw(addSql).Exec()
|
|
|
+ err = global.DEFAULT_DB.Exec(addSql).Error
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
@@ -113,7 +137,7 @@ func RefreshEdbDataFromSmm(edbInfoId int, edbCode, startDate string) (err error)
|
|
|
source := utils.DATA_SOURCE_YS
|
|
|
subSource := utils.DATA_SUB_SOURCE_EDB
|
|
|
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
@@ -211,7 +235,8 @@ func RefreshEdbDataFromSmm(edbInfoId int, edbCode, startDate string) (err error)
|
|
|
|
|
|
if isAdd {
|
|
|
addSql = strings.TrimRight(addSql, ",")
|
|
|
- _, err = o.Raw(addSql).Exec()
|
|
|
+ err = global.DEFAULT_DB.Exec(addSql).Error
|
|
|
+ //_, err = o.Raw(addSql).Exec()
|
|
|
if err != nil {
|
|
|
fmt.Println("RefreshEdbDataFromSmm add Err", err.Error())
|
|
|
return
|
|
|
@@ -221,72 +246,84 @@ func RefreshEdbDataFromSmm(edbInfoId int, edbCode, startDate string) (err error)
|
|
|
}
|
|
|
|
|
|
type BaseFromSmmIndex struct {
|
|
|
- BaseFromSmmIndexId int64 `orm:"column(base_from_smm_index_id);pk"`
|
|
|
- ClassifyId int
|
|
|
- Interface string
|
|
|
- Name string
|
|
|
- IndexCode string
|
|
|
- IndexName string
|
|
|
- Type1 string `orm:"column(type_1)"`
|
|
|
- Type2 string `orm:"column(type_2)"`
|
|
|
- Type3 string `orm:"column(type_3)"`
|
|
|
- Frequency string
|
|
|
- Unit string
|
|
|
- ApiStartTime string
|
|
|
- ApiUpdateTime string
|
|
|
- StartTime string
|
|
|
- FinishTime string
|
|
|
- BaseFileName string
|
|
|
- RenameFileName string
|
|
|
- StartDate string
|
|
|
- EndDate string
|
|
|
- TerminalCode string `description:"编码"`
|
|
|
- CreateTime time.Time
|
|
|
- ModifyTime time.Time
|
|
|
- DataState string
|
|
|
- ReleaseTime string
|
|
|
+ BaseFromSmmIndexId int64 `gorm:"column:base_from_smm_index_id;primaryKey"`
|
|
|
+ //BaseFromSmmIndexId int64 `orm:"column(base_from_smm_index_id);pk"`
|
|
|
+ ClassifyId int
|
|
|
+ Interface string
|
|
|
+ Name string
|
|
|
+ IndexCode string
|
|
|
+ IndexName string
|
|
|
+ Type1 string `orm:"column(type_1)"`
|
|
|
+ Type2 string `orm:"column(type_2)"`
|
|
|
+ Type3 string `orm:"column(type_3)"`
|
|
|
+ Frequency string
|
|
|
+ Unit string
|
|
|
+ ApiStartTime string
|
|
|
+ ApiUpdateTime string
|
|
|
+ StartTime string
|
|
|
+ FinishTime string
|
|
|
+ BaseFileName string
|
|
|
+ RenameFileName string
|
|
|
+ StartDate string
|
|
|
+ EndDate string
|
|
|
+ TerminalCode string `description:"编码"`
|
|
|
+ CreateTime time.Time
|
|
|
+ ModifyTime time.Time
|
|
|
+ DataState string
|
|
|
+ ReleaseTime string
|
|
|
}
|
|
|
|
|
|
func (d *BaseFromSmmIndex) AddBaseFromSmmIndex() (lastId int64, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
- lastId, err = o.Insert(d)
|
|
|
+ //o := orm.NewOrm()
|
|
|
+ //lastId, err = o.Insert(d)
|
|
|
+ err = global.DEFAULT_DB.Create(&d).Error
|
|
|
+ if err != nil {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ lastId = d.BaseFromSmmIndexId
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func (d *BaseFromSmmIndex) GetSmmIndexItem(indexCode string) (item *BaseFromSmmIndex, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
sql := ` SELECT * FROM base_from_smm_index WHERE index_code=? `
|
|
|
|
|
|
- fmt.Println(sql, indexCode)
|
|
|
- err = o.Raw(sql, indexCode).QueryRow(&item)
|
|
|
+ //fmt.Println(sql, indexCode)
|
|
|
+ //err = o.Raw(sql, indexCode).QueryRow(&item)
|
|
|
+ err = global.DEFAULT_DB.Raw(sql, indexCode).First(&item).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
// Add 新增
|
|
|
func (m *BaseFromSmmIndex) Add() (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
- _, err = o.Insert(m)
|
|
|
+ //o := orm.NewOrm()
|
|
|
+ //_, err = o.Insert(m)
|
|
|
+ err = global.DEFAULT_DB.Create(&m).Error
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func GetBaseFromSmmDataBySmmCode(smmCode string) (list []*BaseFromSmmData, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
sql := ` SELECT * FROM base_from_smm_data WHERE index_code=? `
|
|
|
- _, err = o.Raw(sql, smmCode).QueryRows(&list)
|
|
|
+ //_, err = o.Raw(sql, smmCode).QueryRows(&list)
|
|
|
+ err = global.DEFAULT_DB.Raw(sql, smmCode).Find(&list).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func ModifySmmIndexSort(baseFromSmmIndexId int64) (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
sql := ` UPDATE base_from_smm_index SET sort=? WHERE base_from_smm_index_id=? `
|
|
|
- _, err = o.Raw(sql, baseFromSmmIndexId, baseFromSmmIndexId).Exec()
|
|
|
+ //_, err = o.Raw(sql, baseFromSmmIndexId, baseFromSmmIndexId).Exec()
|
|
|
+ err = global.DEFAULT_DB.Exec(sql, baseFromSmmIndexId, baseFromSmmIndexId).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func GetSmmIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date,MIN(value) AS min_value,MAX(value) AS max_value FROM base_from_smm_data WHERE index_code=? `
|
|
|
- err = o.Raw(sql, indexCode).QueryRow(&item)
|
|
|
+ //err = o.Raw(sql, indexCode).QueryRow(&item)
|
|
|
+ err = global.DEFAULT_DB.Raw(sql, indexCode).First(&item).Error
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
@@ -294,7 +331,8 @@ func GetSmmIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInfo,
|
|
|
// 获取最新值
|
|
|
var latest_value float64
|
|
|
sql = ` SELECT value AS latest_value FROM base_from_smm_data WHERE index_code=? ORDER BY data_time DESC LIMIT 1 `
|
|
|
- err = o.Raw(sql, indexCode).QueryRow(&latest_value)
|
|
|
+ //err = o.Raw(sql, indexCode).QueryRow(&latest_value)
|
|
|
+ err = global.DEFAULT_DB.Raw(sql, indexCode).Scan(&latest_value).Error
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
@@ -304,9 +342,10 @@ func GetSmmIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInfo,
|
|
|
}
|
|
|
|
|
|
func ModifySmmIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
sql := ` UPDATE base_from_smm_index SET start_date=?,end_date=?,end_value=?,modify_time=NOW() WHERE index_code=? `
|
|
|
- _, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Exec()
|
|
|
+ //_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Exec()
|
|
|
+ err = global.DEFAULT_DB.Exec(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -329,24 +368,42 @@ func MultiUpdateBaseFromSmmDataValue(items []*BaseFromSmmData) (err error) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- o := orm.NewOrm()
|
|
|
- sql := `UPDATE base_from_smm_data SET value = ?, modify_time = NOW() WHERE index_code = ? AND data_time = ? LIMIT 1`
|
|
|
- p, err := o.Raw(sql).Prepare()
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
- }
|
|
|
+ //o := orm.NewOrm()
|
|
|
+ to := global.DEFAULT_DB.Begin()
|
|
|
defer func() {
|
|
|
- _ = p.Close()
|
|
|
+ if err != nil {
|
|
|
+ _ = to.Rollback()
|
|
|
+ } else {
|
|
|
+ _ = to.Commit()
|
|
|
+ }
|
|
|
}()
|
|
|
+ sql := `UPDATE base_from_smm_data SET value = ?, modify_time = NOW() WHERE index_code = ? AND data_time = ? LIMIT 1`
|
|
|
for _, v := range items {
|
|
|
if v.IndexCode == "" || v.DataTime == "" {
|
|
|
continue
|
|
|
}
|
|
|
- _, err = p.Exec(v.Value, v.IndexCode, v.DataTime)
|
|
|
+ //_, err = o.Raw(sql, v.Value, v.IndexCode, v.DataTime).Exec()
|
|
|
+ err = to.Exec(sql, v.Value, v.IndexCode, v.DataTime).Error
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
+ //p, err := o.Raw(sql).Prepare()
|
|
|
+ //if err != nil {
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //defer func() {
|
|
|
+ // _ = p.Close()
|
|
|
+ //}()
|
|
|
+ //for _, v := range items {
|
|
|
+ // if v.IndexCode == "" || v.DataTime == "" {
|
|
|
+ // continue
|
|
|
+ // }
|
|
|
+ // _, err = p.Exec(v.Value, v.IndexCode, v.DataTime)
|
|
|
+ // if err != nil {
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ //}
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -358,22 +415,35 @@ type AddSmmIndexToDataSourceResp struct {
|
|
|
}
|
|
|
|
|
|
func (m *BaseFromSmmIndex) GetIndexItem(indexCode string) (item *BaseFromSmmIndex, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
sql := `SELECT * FROM base_from_smm_index WHERE index_code = ? `
|
|
|
- err = o.Raw(sql, indexCode).QueryRow(&item)
|
|
|
+ //err = o.Raw(sql, indexCode).QueryRow(&item)
|
|
|
+ err = global.DEFAULT_DB.Raw(sql, indexCode).First(&item).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
// 修改
|
|
|
func (m *BaseFromSmmIndex) Update(updateParams, whereParam map[string]interface{}) (err error) {
|
|
|
- to := orm.NewOrm()
|
|
|
- ptrStructOrTableName := "base_from_smm_index"
|
|
|
+ //to := orm.NewOrm()
|
|
|
+ tx := global.DEFAULT_DB.Model(&BaseFromSmmIndex{})
|
|
|
|
|
|
- qs := to.QueryTable(ptrStructOrTableName)
|
|
|
+ //ptrStructOrTableName := "base_from_smm_index"
|
|
|
+
|
|
|
+ //qs := to.QueryTable(ptrStructOrTableName)
|
|
|
+ //for expr, exprV := range whereParam {
|
|
|
+ // qs = qs.Filter(expr, exprV)
|
|
|
+ //}
|
|
|
for expr, exprV := range whereParam {
|
|
|
- qs = qs.Filter(expr, exprV)
|
|
|
+ tx = tx.Where(expr, exprV)
|
|
|
+ }
|
|
|
+ //_, err = qs.Update(updateParams)
|
|
|
+ // 执行更新操作
|
|
|
+ result := tx.Updates(updateParams)
|
|
|
+ if result.Error != nil {
|
|
|
+ err = fmt.Errorf("update err: %s", result.Error.Error())
|
|
|
+ return
|
|
|
}
|
|
|
- _, err = qs.Update(updateParams)
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -455,8 +525,9 @@ type SmmListResp struct {
|
|
|
}
|
|
|
|
|
|
func AddBaseFromSmmIndex(list []*BaseFromSmmIndex) (lastId int64, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
- _, err = o.InsertMulti(len(list), list)
|
|
|
+ //o := orm.NewOrm()
|
|
|
+ //_, err = o.InsertMulti(len(list), list)
|
|
|
+ err = global.DEFAULT_DB.CreateInBatches(list, len(list)).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -467,29 +538,33 @@ type BridgeZhongJiIndexLatestDataParams struct {
|
|
|
}
|
|
|
|
|
|
func GetBaseFromSmmIndex() (list []*BaseFromSmmIndex, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
sql := ` SELECT * FROM base_from_smm_index`
|
|
|
- _, err = o.Raw(sql).QueryRows(&list)
|
|
|
+ //_, err = o.Raw(sql).QueryRows(&list)
|
|
|
+ err = global.DEFAULT_DB.Raw(sql).Find(&list).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func ModifyBaseFromSmmIndex(item *BaseFromSmmIndex) (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
sql := ` UPDATE base_from_smm_index SET end_date = ?, modify_time=NOW(), data_state= ? `
|
|
|
- _, err = o.Raw(sql, item.EndDate, item.DataState).Exec()
|
|
|
+ //_, err = o.Raw(sql, item.EndDate, item.DataState).Exec()
|
|
|
+ err = global.DEFAULT_DB.Exec(sql, item.EndDate, item.DataState).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func (m *BaseFromSmmIndex) UpdateCols(cols []string) (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
- _, err = o.Update(m, cols...)
|
|
|
+ //o := orm.NewOrm()
|
|
|
+ //_, err = o.Update(m, cols...)
|
|
|
+ err = global.DEFAULT_DB.Model(&m).Select(cols).Updates(&m).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func ModifyBaseFromSmmIndexDate(item *BaseFromSmmIndex) (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
sql := ` UPDATE base_from_smm_index SET end_date = ?, modify_time=NOW(), data_state= ? WHERE base_from_smm_index_id=?`
|
|
|
- _, err = o.Raw(sql, item.EndDate, item.DataState, item.BaseFromSmmIndexId).Exec()
|
|
|
+ //_, err = o.Raw(sql, item.EndDate, item.DataState, item.BaseFromSmmIndexId).Exec()
|
|
|
+ err = global.DEFAULT_DB.Exec(sql, item.EndDate, item.DataState, item.BaseFromSmmIndexId).Error
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -524,7 +599,7 @@ func RefreshEdbDataFromSmmToEdb(edbInfoId int, edbCode, startDate string, smmDat
|
|
|
source := utils.DATA_SOURCE_YS
|
|
|
subSource := utils.DATA_SUB_SOURCE_EDB
|
|
|
|
|
|
- o := orm.NewOrm()
|
|
|
+ //o := orm.NewOrm()
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
@@ -617,7 +692,8 @@ func RefreshEdbDataFromSmmToEdb(edbInfoId int, edbCode, startDate string, smmDat
|
|
|
|
|
|
if isAdd {
|
|
|
addSql = strings.TrimRight(addSql, ",")
|
|
|
- _, err = o.Raw(addSql).Exec()
|
|
|
+ //_, err = o.Raw(addSql).Exec()
|
|
|
+ err = global.DEFAULT_DB.Exec(addSql).Error
|
|
|
if err != nil {
|
|
|
fmt.Println("RefreshEdbDataFromSmm add Err", err.Error())
|
|
|
return
|
|
|
@@ -636,7 +712,8 @@ type BaseFromSmmRecord struct {
|
|
|
}
|
|
|
|
|
|
func AddBaseFromSmmRecord(item *BaseFromSmmRecord) (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
- _, err = o.Insert(item)
|
|
|
+ //o := orm.NewOrm()
|
|
|
+ //_, err = o.Insert(item)
|
|
|
+ err = global.DEFAULT_DB.Create(&item).Error
|
|
|
return
|
|
|
}
|
kobe6258