兼容达梦数据库

models/base_from_ly_data.go

@@ -2,17 +2,20 @@
 package models
 
 import (
+	"eta/eta_index_lib/global"
+	"eta/eta_index_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 )
 
 type BaseFromLyData struct {
-	BaseFromLyDataId  int     `orm:"column(base_from_ly_data_id);pk"` // 数据ID
-	CreateTime        string  `orm:"column(create_time)"`             // 创建时间
-	ModifyTime        string  `orm:"column(modify_time)"`             // 修改时间
-	BaseFromLyIndexId int     `orm:"column(base_from_ly_index_id)"`   // 指标id
-	IndexCode         string  `orm:"column(index_code)"`              // 指标编码
-	DataTime          string  `orm:"column(data_time)"`               // 数据日期
-	Value             float64 `orm:"column(value)"`                   // 数据值
+	BaseFromLyDataId int `gorm:"column:base_from_ly_data_id;primaryKey"` // 数据ID
+	//BaseFromLyDataId  int     `orm:"column(base_from_ly_data_id);pk"` // 数据ID
+	CreateTime        string  `orm:"column(create_time)"`           // 创建时间
+	ModifyTime        string  `orm:"column(modify_time)"`           // 修改时间
+	BaseFromLyIndexId int     `orm:"column(base_from_ly_index_id)"` // 指标id
+	IndexCode         string  `orm:"column(index_code)"`            // 指标编码
+	DataTime          string  `orm:"column(data_time)"`             // 数据日期
+	Value             float64 `orm:"column(value)"`                 // 数据值
 }
 
 func init() {
@@ -21,16 +24,18 @@ func init() {
 
 // AddLyDataList 批量插入数据记录列表
 func AddLyDataList(items []BaseFromLyData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(items), items)
+	err = global.DEFAULT_DB.CreateInBatches(items, len(items)).Error
 	return
 }
 
 // GetLyDataByIndexIdAndDataTime 根据指标id和数据日期查询数据
 func GetLyDataByIndexIdAndDataTime(indexId int, dataTime string) (items []BaseFromLyData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ly_data WHERE base_from_ly_index_id=? AND data_time=?`
-	_, err = o.Raw(sql, indexId, dataTime).QueryRows(&items)
+	//_, err = o.Raw(sql, indexId, dataTime).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, indexId, dataTime).Find(&items).Error
 	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
@@ -39,9 +44,10 @@ func GetLyDataByIndexIdAndDataTime(indexId int, dataTime string) (items []BaseFr
 
 // GetLyDataByIndexIdAndDataTimeYM 根据指标id和数据日期的年月查询数据
 func GetLyDataByIndexIdAndDataTimeYM(indexId int, dataTime string) (items []BaseFromLyData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ly_data WHERE base_from_ly_index_id=? AND data_time like ?`
-	_, err = o.Raw(sql, indexId, dataTime+"%").QueryRows(&items)
+	//_, err = o.Raw(sql, indexId, dataTime+"%").QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, indexId, dataTime+"%").Find(&items).Error
 	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
@@ -50,20 +56,22 @@ func GetLyDataByIndexIdAndDataTimeYM(indexId int, dataTime string) (items []Base
 
 // UpdateLyDataById 根据主键id更新数据
 func UpdateLyDataById(dataId int, value float64) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_ly_data SET value=? WHERE base_from_ly_data_id=?`
-	_, err = o.Raw(sql, value, dataId).Exec()
+	//_, err = o.Raw(sql, value, dataId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, value, dataId).Error
 	return
 }
 
 // GetBaseFromLyDataByIndexCode 根据指标编码查询
 func GetBaseFromLyDataByIndexCode(condition string, pars []interface{}) (items []BaseFromLyData, err error) {
 	sql := `SELECT * FROM base_from_ly_data WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	//_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}

models/base_from_ly_index.go

@@ -3,20 +3,23 @@
 package models
 
 import (
+	"eta/eta_index_lib/global"
+	"eta/eta_index_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 type BaseFromLyIndex struct {
-	BaseFromLyIndexId    int    `orm:"column(base_from_ly_index_id);pk"` // 指标ID
-	CreateTime           string `orm:"column(create_time)"`              // 创建时间
-	ModifyTime           string `orm:"column(modify_time)"`              // 修改时间
-	BaseFromLyClassifyId int    `orm:"column(base_from_ly_classify_id)"` // 原始数据指标分类id
-	IndexCode            string `orm:"column(index_code)"`               // 指标编码
-	IndexName            string `orm:"column(index_name)"`               // 指标名称
-	Frequency            string `orm:"column(frequency)"`                // 频度
-	Unit                 string `orm:"column(unit)"`                     // 单位
-	EdbExist             int    `orm:"column(edb_exist)"`                // 指标库是否已添加：0-否；1-是
+	//BaseFromLyIndexId    int    `orm:"column(base_from_ly_index_id);pk"`         // 指标ID
+	BaseFromLyIndexId    int    `gorm:"column:base_from_ly_index_id;primaryKey"` // 指标ID
+	CreateTime           string `orm:"column(create_time)"`                      // 创建时间
+	ModifyTime           string `orm:"column(modify_time)"`                      // 修改时间
+	BaseFromLyClassifyId int    `orm:"column(base_from_ly_classify_id)"`         // 原始数据指标分类id
+	IndexCode            string `orm:"column(index_code)"`                       // 指标编码
+	IndexName            string `orm:"column(index_name)"`                       // 指标名称
+	Frequency            string `orm:"column(frequency)"`                        // 频度
+	Unit                 string `orm:"column(unit)"`                             // 单位
+	EdbExist             int    `orm:"column(edb_exist)"`                        // 指标库是否已添加：0-否；1-是
 }
 
 // 在 init 函数中注册模型
@@ -26,28 +29,31 @@ func init() {
 
 // AddLyIndexList 批量插入指标记录列表
 func AddLyIndexList(items []*BaseFromLyIndex) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(items), items)
+	err = global.DEFAULT_DB.CreateInBatches(items, len(items)).Error
 	return
 }
 
 // AddLyIndex 添加指标
 func AddLyIndex(item *BaseFromLyIndex) (int64, error) {
 	item.CreateTime = time.Now().Format("2006-01-02 15:04:05")
-	o := orm.NewOrm()
-	id, err := o.Insert(item)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(item)
+	err := global.DEFAULT_DB.Create(item).Error
 	if err != nil {
 		return 0, err
 	}
+	id := int64(item.BaseFromLyIndexId)
 	return id, nil
 }
 
 // GetLyIndexByCode 查询指标编码是否存在
 func GetLyIndexByCode(indexCode string) (item *BaseFromLyIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ly_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
 	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}

models/base_from_ly_index_record.go

@@ -3,17 +3,20 @@
 package models
 
 import (
+	"eta/eta_index_lib/global"
+	"eta/eta_index_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 )
 
 type BaseFromLyIndexRecord struct {
-	BaseFromLyIndexRecordId int    `orm:"column(base_from_ly_index_record_id);pk"` // 指标记录ID
-	CreateTime              string `orm:"column(create_time)"`                     // 创建时间
-	ModifyTime              string `orm:"column(modify_time)"`                     // 修改时间
-	Product                 string `orm:"column(product)"`                         // 产品
-	Category                string `orm:"column(category)"`                        // 分类
-	Url                     string `orm:"column(url)"`                             // 指标页面地址
-	DataTime                string `orm:"column(data_time)"`                       // 数据日期
+	BaseFromLyIndexRecordId int `gorm:"column:base_from_ly_index_record_id;primaryKey"` // 指标记录ID
+	//BaseFromLyIndexRecordId int    `orm:"column(base_from_ly_index_record_id);pk"` // 指标记录ID
+	CreateTime string `orm:"column(create_time)"` // 创建时间
+	ModifyTime string `orm:"column(modify_time)"` // 修改时间
+	Product    string `orm:"column(product)"`     // 产品
+	Category   string `orm:"column(category)"`    // 分类
+	Url        string `orm:"column(url)"`         // 指标页面地址
+	DataTime   string `orm:"column(data_time)"`   // 数据日期
 }
 
 // 在 init 函数中注册模型
@@ -23,20 +26,23 @@ func init() {
 
 // AddLyIndexRecord 添加指标记录
 func AddLyIndexRecord(item *BaseFromLyIndexRecord) (int64, error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(item)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(item)
+	err := global.DEFAULT_DB.Create(item).Error
 	if err != nil {
 		return 0, err
 	}
+	id := int64(item.BaseFromLyIndexRecordId)
 	return id, nil
 }
 
 // GetLyIndexRecordByUrl 查询指标记录是否存在
 func GetLyIndexRecordByUrl(url string) (item *BaseFromLyIndexRecord, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ly_index_record WHERE url=?`
-	err = o.Raw(sql, url).QueryRow(&item)
+	//err = o.Raw(sql, url).QueryRow(&item)
 
+	err = global.DEFAULT_DB.Raw(sql, url).First(&item).Error
 	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}

models/base_from_lz.go

@@ -1,9 +1,9 @@
 package models
 
 import (
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -20,18 +20,19 @@ func GetLzSurveyDataFromLz(condition string, pars []interface{}) (item []*lzSurv
 	sql := ` SELECT  a.* FROM longzhong_survey_data AS a
 				INNER JOIN longzhong_survey_product AS b ON a.survey_product_id=b.survey_product_id
 				WHERE 1=1 `
-	o := orm.NewOrmUsingDB("edb")
+	//o := orm.NewOrmUsingDB("edb")
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` GROUP BY data_time ORDER BY a.data_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DbMap[utils.DbNameManualIndex].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // 新增钢联指标数据
 func AddEdbDataFromLz(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -66,7 +67,8 @@ func AddEdbDataFromLz(edbCode string) (err error) {
 		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
 			}
@@ -80,7 +82,7 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
 	source := utils.DATA_SOURCE_LZ
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	// 真实数据的最大日期  ， 插入规则配置的日期
 	var realDataMaxDate, edbDataInsertConfigDate time.Time
@@ -174,7 +176,8 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
 
 	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 {
 			return err
 		}

models/base_from_manual.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/models/mgo"
 	"eta/eta_index_lib/utils"
 	"fmt"
@@ -15,7 +16,8 @@ import (
 //弘则手工数据
 
 type ManualEdbdata struct {
-	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
+	TradeCode string `gorm:"column:TRADE_CODE;primaryKey" description:"指标编码"`
+	//TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
 	Dt         string    `orm:"column(DT)" description:"日期"`
 	Close      string    `orm:"column(CLOSE)" description:"值"`
 	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
@@ -27,8 +29,9 @@ func GetEdbdataManualByCondition(condition string, pars []interface{}) (item []*
 		sql += condition
 	}
 	sql += ` ORDER BY DT DESC `
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//o := orm.NewOrmUsingDB("edb")
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DbMap[utils.DbNameManualIndex].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -74,7 +77,8 @@ func AddEdbDataFromManual(edbCode string) (err error) {
 		}
 		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 {
 				return
 			}
@@ -88,7 +92,7 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	source := utils.DATA_SOURCE_MANUAL
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -208,7 +212,8 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	}
 	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("RefreshAllEdbDataByManual add Err", err.Error())
 			return
@@ -298,9 +303,10 @@ func HandleConfigInsertEdbDataByMongo(realDataMaxDate time.Time, edbDataInsertCo
 			mogDataObj.RemoveManyByColl(coll, bson.M{"_id": item.ID})
 		}
 	} else {
-		o := orm.NewOrm()
+		//o := orm.NewOrm()
 		edbDataInsertConfig.RealDate = realDataMaxDate
-		_, err = o.Update(edbDataInsertConfig, "RealDate")
+		//_, err = o.Update(edbDataInsertConfig, "RealDate")
+		err = global.DEFAULT_DB.Model(&edbDataInsertConfig).Select("RealDate").Updates(&edbDataInsertConfig).Error
 	}
 
 	return

models/base_from_mtjh.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
@@ -10,52 +11,61 @@ import (
 )
 
 type BaseFromMtjhMapping struct {
-	BaseFromMtjhMappingId int       `orm:"column(base_from_Mtjh_mapping_id);pk"`
-	IndexName             string    `description:"持买单量指标名称"`
-	IndexCode             string    `description:"持买单量指标编码"`
-	CreateTime            time.Time `description:"时间"`
-	Area                  string    `description:"区域"`
-	Port                  string    `description:"港口或码头"`
-	Variety               string    `description:"品种"`
-	Unit                  string    `description:"单位"`
-	Frequency             string    `description:"频率"`
+	BaseFromMtjhMappingId int `gorm:"column:base_from_Mtjh_mapping_id;primaryKey"`
+	//BaseFromMtjhMappingId int       `orm:"column(base_from_Mtjh_mapping_id);pk"`
+	IndexName  string    `description:"持买单量指标名称"`
+	IndexCode  string    `description:"持买单量指标编码"`
+	CreateTime time.Time `description:"时间"`
+	Area       string    `description:"区域"`
+	Port       string    `description:"港口或码头"`
+	Variety    string    `description:"品种"`
+	Unit       string    `description:"单位"`
+	Frequency  string    `description:"频率"`
 }
 
 type BaseFromMtjhIndex struct {
-	BaseFromMtjhIndexId int       `orm:"column(base_from_mtjh_index_id);pk"`
-	IndexName           string    `description:"持买单量指标名称"`
-	IndexCode           string    `description:"持买单量指标编码"`
-	DealValue           string    `description:"成交量"`
-	DataTime            string    `description:"数据日期"`
-	Area                string    `description:"区域"`
-	Port                string    `description:"港口或码头"`
-	Variety             string    `description:"品种"`
-	Unit                string    `description:"单位"`
-	Frequency           string    `description:"频率"`
-	CreateTime          time.Time `description:"插入时间"`
-	ModifyTime          time.Time `description:"修改时间"`
+	BaseFromMtjhIndexId int `gorm:"column:base_from_mtjh_index_id;primaryKey"`
+	//BaseFromMtjhIndexId int       `orm:"column(base_from_mtjh_index_id);pk"`
+	IndexName  string    `description:"持买单量指标名称"`
+	IndexCode  string    `description:"持买单量指标编码"`
+	DealValue  string    `description:"成交量"`
+	DataTime   string    `description:"数据日期"`
+	Area       string    `description:"区域"`
+	Port       string    `description:"港口或码头"`
+	Variety    string    `description:"品种"`
+	Unit       string    `description:"单位"`
+	Frequency  string    `description:"频率"`
+	CreateTime time.Time `description:"插入时间"`
+	ModifyTime time.Time `description:"修改时间"`
 }
 
 // 查询指标
 func GetBaseFromMtjhMapping() (items []*BaseFromMtjhMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mtjh_mapping`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
 // 查询指标
 func GetBaseFromMtjhIndex() (items []*BaseFromMtjhIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mtjh_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
 // 添加数据
 func AddBaseFromMtjhIndex(item *BaseFromMtjhIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DB.Create(&item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromMtjhIndexId)
 	return
 }
 
@@ -67,26 +77,33 @@ func AddBaseFromMtjhIndexMuti(items []*BaseFromMtjhIndex) (lastId int64, err err
 
 // 添加指标
 func AddBaseFromMtjhMapping(item *BaseFromMtjhMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(item)
+	err = global.DEFAULT_DB.Create(&item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromMtjhMappingId)
 	return
 }
 
 func AddBaseFromMtjhMappingMuti(items []*BaseFromMtjhMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertMulti(500, items)
+	//o := orm.NewOrm()
+	//lastId, err = o.InsertMulti(500, items)
+	err = global.DEFAULT_DB.CreateInBatches(items, 500).Error
 	return
 }
 
 func UpdateBaseFromMtjhIndex(item *BaseFromMtjhIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_mtjh_index SET deal_value=?  WHERE index_name=?  AND  data_time = ?`
-	_, err = o.Raw(sql, item.DealValue, item.IndexName, item.DataTime).Exec()
+	//_, err = o.Raw(sql, item.DealValue, item.IndexName, item.DataTime).Exec()
+	err = global.DEFAULT_DB.Exec(sql, item.DealValue, item.IndexName, item.DataTime).Error
 	return
 }
 
 func AddEdbDataFromMtjh(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	coalBaseDataAll, err := GetMtjhindexByCode(edbCode)
 	if err != nil && !utils.IsErrNoRow(err) {
@@ -126,7 +143,8 @@ func AddEdbDataFromMtjh(edbCode string) (err error) {
 	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
 		}
@@ -137,7 +155,7 @@ func AddEdbDataFromMtjh(edbCode string) (err error) {
 func RefreshEdbDataFromMtjh(edbInfoId int, edbCode, startDate string) (err error) {
 	source := utils.DATA_SOURCE_MTJH
 	subSource := utils.DATA_SUB_SOURCE_EDB
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -254,7 +272,8 @@ func RefreshEdbDataFromMtjh(edbInfoId int, edbCode, startDate string) (err error
 
 	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 {
 			return err
 		}
@@ -265,20 +284,22 @@ func RefreshEdbDataFromMtjh(edbInfoId int, edbCode, startDate string) (err error
 
 // GetMtjhindexByCode
 func GetMtjhindexByCode(indexCode string) (items []*BaseFromMtjhIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := "SELECT * FROM base_from_mtjh_index WHERE index_code=? "
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).Find(&items).Error
 	return
 }
 
 func GetMtjhDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromMtjhIndex, err error) {
 	sql := ` SELECT * FROM base_from_mtjh_index WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -298,9 +319,10 @@ func (m *BaseFromMtjhMapping) GetMaxAndMinDateByIndexCode(indexCode string) (ite
 
 	tableName := fmt.Sprintf("base_from_coalmine_%s", suffix)
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date,MIN(deal_value) AS min_value,MAX(deal_value) AS max_value FROM %s WHERE index_code=? `, tableName)
-	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
 	}
@@ -308,7 +330,8 @@ func (m *BaseFromMtjhMapping) GetMaxAndMinDateByIndexCode(indexCode string) (ite
 	// 获取最新值
 	var latest_value float64
 	sql = fmt.Sprintf(` SELECT value AS deal_value FROM %s WHERE index_code=? ORDER BY data_time DESC LIMIT 1 `, tableName)
-	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
 	}
@@ -318,8 +341,9 @@ func (m *BaseFromMtjhMapping) GetMaxAndMinDateByIndexCode(indexCode string) (ite
 }
 
 func (m *BaseFromMtjhMapping) ModifyIndexMaxAndMinDate(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_mtjh_mapping SET start_date=?,end_date=?,latest_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
 }

models/base_from_mysteel.go

@@ -1,13 +1,12 @@
 package models
 
 import (
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 //钢联
@@ -20,7 +19,7 @@ type GlData struct {
 func GetGlDataByCondition(condition string, pars []interface{}) (item []*GlData, err error) {
 	condition += " AND IS_DELETE=0 "
 	sql1 := ` SELECT * FROM mb_index_main_data WHERE 1=1 AND DATA_VALUE is not null `
-	o := orm.NewOrmUsingDB("gl")
+	//o := orm.NewOrmUsingDB("gl")
 	if condition != "" {
 		sql1 += condition
 	}
@@ -38,13 +37,14 @@ func GetGlDataByCondition(condition string, pars []interface{}) (item []*GlData,
 	//		) tmp group by DATA_DATE
 	//
 	//		order by PUBLISH_TIME DESC
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // 新增钢联指标数据
 func AddEdbDataFromMysteel(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -86,7 +86,8 @@ func AddEdbDataFromMysteel(edbCode string) (err error) {
 		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
 			}
@@ -100,7 +101,7 @@ func RefreshEdbDataFromMysteel(edbInfoId int, edbCode, startDate string) (err er
 	source := utils.DATA_SOURCE_GL
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -206,7 +207,8 @@ func RefreshEdbDataFromMysteel(edbInfoId int, edbCode, startDate string) (err er
 
 	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 {
 			return err
 		}

models/base_from_mysteel_chemical.go

@@ -1,13 +1,12 @@
 package models
 
 import (
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 //钢联
@@ -19,18 +18,19 @@ type MysteelChemicalData struct {
 
 func GetMysteelChemicalDataByCondition(condition string, pars []interface{}) (item []*MysteelChemicalData, err error) {
 	sql1 := ` SELECT * FROM base_from_mysteel_chemical_data WHERE 1=1  `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql1 += condition
 	}
 	sql := `select * from (` + sql1 + ` having 1 order by modify_time DESC ) tmp GROUP BY data_time ORDER BY data_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // AddEdbDataFromMysteelChemical 新增钢联指标数据
 func AddEdbDataFromMysteelChemical(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -72,7 +72,8 @@ func AddEdbDataFromMysteelChemical(edbCode string) (err error) {
 		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
 			}
@@ -86,7 +87,7 @@ func RefreshEdbDataFromMysteelChemical(edbInfoId int, edbCode, startDate string)
 	source := utils.DATA_SOURCE_MYSTEEL_CHEMICAL
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -192,7 +193,8 @@ func RefreshEdbDataFromMysteelChemical(edbInfoId int, edbCode, startDate string)
 
 	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 {
 			return err
 		}
@@ -202,7 +204,8 @@ func RefreshEdbDataFromMysteelChemical(edbInfoId int, edbCode, startDate string)
 
 // 钢联化工指标数据
 type BaseFromMysteelChemicalIndex struct {
-	BaseFromMysteelChemicalIndexId    int64     `orm:"column(base_from_mysteel_chemical_index_id);pk"`
+	BaseFromMysteelChemicalIndexId int64 `gorm:"column:base_from_mysteel_chemical_index_id;primaryKey"`
+	//BaseFromMysteelChemicalIndexId    int64     `orm:"column(base_from_mysteel_chemical_index_id);pk"`
 	BaseFromMysteelChemicalClassifyId int       `description:"分类id"`
 	IndexCode                         string    `description:"指标编码"`
 	IndexName                         string    `description:"指标名称"`
@@ -236,16 +239,18 @@ type MysteelChemicalAPiCheck struct {
 
 // GetIndexRefreshAllByMergeFile 根据合并文件去分组查询需要刷新的文件
 func (m *BaseFromMysteelChemicalIndex) GetIndexRefreshAllByMergeFile() (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE merge_file_path <>'' AND base_from_mysteel_chemical_classify_id NOT IN(54,55,56,57) GROUP BY merge_file_path`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
 func (m *BaseFromMysteelChemicalIndex) GetIndexItem(indexCode string) (item *BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_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
 }
 
@@ -253,43 +258,47 @@ func (m *BaseFromMysteelChemicalIndex) GetBatchIndexItem(indexCodes []string) (i
 	if len(indexCodes) <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_code IN (%s) `
 	holder := make([]string, 0, len(indexCodes))
 	for range indexCodes {
 		holder = append(holder, "?")
 	}
 	sql = fmt.Sprintf(sql, strings.Join(holder, ","))
-	_, err = o.Raw(sql, indexCodes).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, indexCodes).Find(&items).Error
+	//_, err = o.Raw(sql, indexCodes).QueryRows(&items)
 	return
 }
 
 func (m *BaseFromMysteelChemicalIndex) GetIndexCreate(terminalCode string) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_name = '' AND terminal_code = ? `
-	_, err = o.Raw(sql, terminalCode).QueryRows(&items)
+	//_, err = o.Raw(sql, terminalCode).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, terminalCode).Find(&items).Error
 	return
 }
 
 // Add 新增
 func (m *BaseFromMysteelChemicalIndex) 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 (m *BaseFromMysteelChemicalIndex) Update(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
 }
 
 // GetNoMergeIndexByFrequencyCount 获取未合并的指标总数量
 func (m *BaseFromMysteelChemicalIndex) GetNoMergeIndexByFrequencyCount(frequency string) (total int64, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT count(1) AS total FROM base_from_mysteel_chemical_index WHERE frequency = ? AND merge_file_path = '' AND index_name NOT LIKE "%停%"  `
-	err = o.Raw(sql, frequency).QueryRow(&total)
-
+	//err = o.Raw(sql, frequency).QueryRow(&total)
+	err = global.DEFAULT_DB.Raw(sql, frequency).Scan(&total).Error
 	return
 }
 
@@ -302,10 +311,10 @@ type GetMaxFileIndexReq struct {
 
 // GetMaxFileIndex 获取最大文件的
 func (m *BaseFromMysteelChemicalIndex) GetMaxFileIndex(frequency string) (item *BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE frequency=? AND index_name NOT LIKE "%停%" ORDER BY file_index DESC `
-	err = o.Raw(sql, frequency).QueryRow(&item)
-
+	///err = o.Raw(sql, frequency).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, frequency).First(&item).Error
 	return
 }
 
@@ -317,9 +326,10 @@ type GetNoMergeIndexByFrequencyPageReq struct {
 
 // GetNoMergeIndexByFrequencyPage 获取未合并的指标列表
 func (m *BaseFromMysteelChemicalIndex) GetNoMergeIndexByFrequencyPage(frequency string, limit int) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE frequency=? AND merge_file_path = '' limit ? `
-	_, err = o.Raw(sql, frequency, limit).QueryRows(&items)
+	//_, err = o.Raw(sql, frequency, limit).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, frequency, limit).Find(&items).Error
 	return
 }
 
@@ -328,25 +338,28 @@ type GetIndexCountByMergeFilePathReq struct {
 }
 
 func (m *BaseFromMysteelChemicalIndex) GetIndexCountByMergeFilePath(mergeFilePath string) (total int64, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT count(1) AS total FROM base_from_mysteel_chemical_index WHERE merge_file_path = ?`
-	err = o.Raw(sql, mergeFilePath).QueryRow(&total)
+	//err = o.Raw(sql, mergeFilePath).QueryRow(&total)
+	err = global.DEFAULT_DB.Raw(sql, mergeFilePath).Scan(&total).Error
 	return
 }
 
 // GetIndexRefreshMethanolByMergeFile 根据合并文件去分组查询需要刷新的甲醇文件
 func (m *BaseFromMysteelChemicalIndex) GetIndexRefreshMethanolByMergeFile() (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE merge_file_path <> '' AND base_from_mysteel_chemical_classify_id IN(54,55,56,57) GROUP BY merge_file_path`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
 // GetIndexRefreshMethanolByTimely 获取需要及时刷新的文件
 func (m *BaseFromMysteelChemicalIndex) GetIndexRefreshMethanolByTimely() (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE merge_file_path <> '' AND is_refresh = 1 GROUP BY merge_file_path`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
@@ -356,9 +369,10 @@ type GetIndexByFrequencyReq struct {
 
 // GetIndexByFrequency 根据频率获取指标
 func (m *BaseFromMysteelChemicalIndex) GetIndexByFrequency(frequency string) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE frequency = ? AND merge_file_path = '' `
-	_, err = o.Raw(sql, frequency).QueryRows(&items)
+	//_, err = o.Raw(sql, frequency).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, frequency).Find(&items).Error
 	return
 }
 
@@ -370,9 +384,10 @@ type GetIndexRefreshWeekReq struct {
 
 func (m *BaseFromMysteelChemicalIndex) GetIndexRefreshWeek(nowWeekZn, startTime, endTime string) (items []*BaseFromMysteelChemicalIndex, err error) {
 	where := `update_week = ? AND ((update_time >= ? AND update_time <= ?) OR (update_time2 >= ? AND update_time2 <= ?)) `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM base_from_mysteel_chemical_index WHERE %s `, where)
-	_, err = o.Raw(sql, nowWeekZn, startTime, endTime, startTime, endTime).QueryRows(&items)
+	//_, err = o.Raw(sql, nowWeekZn, startTime, endTime, startTime, endTime).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, nowWeekZn, startTime, endTime, startTime, endTime).Find(&items).Error
 	return
 }
 
@@ -389,8 +404,9 @@ func (m *BaseFromMysteelChemicalIndex) UpdateIndex(item *BaseFromMysteelChemical
 	if len(updateCols) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.Update(item, updateCols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(item, updateCols...)
+	err = global.DEFAULT_DB.Model(&item).Select(updateCols).Updates(&item).Error
 	return
 }
 
@@ -399,7 +415,7 @@ func (m *BaseFromMysteelChemicalIndex) MultiUpdateIndex(items []UpdateIndexReq)
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	for _, v := range items {
 		if len(v.UpdateCols) == 0 {
 			continue
@@ -407,7 +423,8 @@ func (m *BaseFromMysteelChemicalIndex) MultiUpdateIndex(items []UpdateIndexReq)
 		if v.Item == nil {
 			continue
 		}
-		if _, e := o.Update(v.Item, v.UpdateCols...); e != nil {
+		//if _, e := o.Update(v.Item, v.UpdateCols...); e != nil {
+		if e := global.DEFAULT_DB.Model(&v.Item).Select(v.UpdateCols).Updates(&v.Item).Error; e != nil {
 			err = fmt.Errorf("update err: %s", e.Error())
 			return
 		}
@@ -434,7 +451,8 @@ type HandleMysteelIndexResp struct {
 
 // 钢联化工指标数据
 type BaseFromMysteelChemicalData struct {
-	BaseFromMysteelChemicalDataId  int64 `orm:"column(base_from_mysteel_chemical_data_id);pk"`
+	BaseFromMysteelChemicalDataId int64 `gorm:"column:base_from_mysteel_chemical_data_id;primaryKey"`
+	//BaseFromMysteelChemicalDataId  int64 `orm:"column(base_from_mysteel_chemical_data_id);pk"`
 	BaseFromMysteelChemicalIndexId int64
 	IndexCode                      string
 	DataTime                       time.Time
@@ -446,23 +464,26 @@ type BaseFromMysteelChemicalData struct {
 
 // GetIndexDataList 根据指标编码获取数据
 func (d *BaseFromMysteelChemicalData) GetIndexDataList(indexCode string) (item []*BaseFromMysteelChemicalData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_data WHERE index_code = ? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&item)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&item)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).Find(&item).Error
 	return
 }
 
 // Update 修改
 func (r *BaseFromMysteelChemicalData) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(r, updateCols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(r, updateCols...)
+	err = global.DEFAULT_DB.Model(&r).Select(updateCols).Updates(&r).Error
 	return
 }
 
 // Add 新增
 func (r *BaseFromMysteelChemicalData) Add(list []BaseFromMysteelChemicalData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(500, list)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(500, list)
+	err = global.DEFAULT_DB.CreateInBatches(list, 500).Error
 	return
 }
 
@@ -471,8 +492,9 @@ func (r *BaseFromMysteelChemicalData) AddV2(list []*BaseFromMysteelChemicalData)
 	if len(list) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(500, list)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(500, list)
+	err = global.DEFAULT_DB.CreateInBatches(list, 500).Error
 	return
 }
 
@@ -490,22 +512,23 @@ type GetIndexDetailReq struct {
 
 // GetIndexCountByFrequency 获取未合并的指标总数量
 func (m *BaseFromMysteelChemicalIndex) GetIndexCountByFrequency(condition string, pars []interface{}) (total int64, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	sql := `SELECT count(1) AS total FROM base_from_mysteel_chemical_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&total)
-
+	//err = o.Raw(sql, pars).QueryRow(&total)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Scan(&total).Error
 	return
 }
 
 // GetNoMergeIndexByFrequencyPage 获取未合并的指标列表
 func (m *BaseFromMysteelChemicalIndex) GetIndexLimitByFrequency(frequency string, limit int) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE frequency=? limit ? `
-	_, err = o.Raw(sql, frequency, limit).QueryRows(&items)
+	//_, err = o.Raw(sql, frequency, limit).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, frequency, limit).Find(&items).Error
 	return
 }
 
@@ -519,21 +542,23 @@ type GetIndexPageByFrequencyPageReq struct {
 
 // GetNoMergeIndexByFrequencyPage 获取未合并的指标列表
 func (m *BaseFromMysteelChemicalIndex) GetIndexPageByFrequency(condition string, pars []interface{}, startSize, pageSize int) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` LIMIT ?,?  `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	pars = append(pars, startSize, pageSize)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func (d *BaseFromMysteelChemicalData) GetMysteelIndexInfoMaxAndMinInfo(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_mysteel_chemical_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
 	}
@@ -541,7 +566,8 @@ func (d *BaseFromMysteelChemicalData) GetMysteelIndexInfoMaxAndMinInfo(indexCode
 	// 获取最新值
 	var latest_value float64
 	sql = ` SELECT value AS latest_value FROM base_from_mysteel_chemical_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
 	}
@@ -551,35 +577,39 @@ func (d *BaseFromMysteelChemicalData) GetMysteelIndexInfoMaxAndMinInfo(indexCode
 }
 
 func (d *BaseFromMysteelChemicalData) ModifyMysteelIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_mysteel_chemical_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
 }
 
 // GetIndexByCondition 获取指标
 func (m *BaseFromMysteelChemicalIndex) GetIndexByCondition(condition string, pars []interface{}) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 type BaseFromMysteelChemicalRecord struct {
-	BaseFromMysteelChemicalRecordId int64 `orm:"column(base_from_mysteel_chemical_record_id);pk"`
-	BaseFromMysteelChemicalIndexId  int64
-	OldIndexName                    string    `description:"原始名称"`
-	NewIndexName                    string    `description:"新的名称"`
-	CreateTime                      time.Time `description:"记录创建时间"`
-	Timestamp                       int64     `description:"记录创建时间戳"`
+	BaseFromMysteelChemicalRecordId int64 `gorm:"column:base_from_mysteel_chemical_record_id;primaryKey"`
+	//BaseFromMysteelChemicalRecordId int64 `orm:"column(base_from_mysteel_chemical_record_id);pk"`
+	BaseFromMysteelChemicalIndexId int64
+	OldIndexName                   string    `description:"原始名称"`
+	NewIndexName                   string    `description:"新的名称"`
+	CreateTime                     time.Time `description:"记录创建时间"`
+	Timestamp                      int64     `description:"记录创建时间戳"`
 }
 
 func (m *BaseFromMysteelChemicalRecord) AddBaseFromMysteelChemicalRecord() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(m)
+	//o := orm.NewOrm()
+	//_, err = o.Insert(m)
+	err = global.DEFAULT_DB.Create(&m).Error
 	return
 }