兼容达梦数据库

logic/base_edb_info.go

@@ -39,7 +39,7 @@ func RefreshBaseEdbInfo(edbInfo *models.EdbInfo, startDate string) (isHandling b
 	default:
 		return
 	}
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "刷新指标信息失败！"
 		err = errors.New("刷新指标信息失败 RefreshEdbDataFromSci，Err:" + err.Error())
 		return

logic/predict_edb.go

@@ -16,7 +16,7 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 	// 来源指标信息校验
 	{
 		sourceEdbInfo, err = models.GetEdbInfoById(sourceEdbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			errMsg = "新增失败"
 			err = errors.New("获取来源指标失败，Err:" + err.Error())
 			return
@@ -43,7 +43,7 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 	// 来源分类信息校验
 	{
 		classifyInfo, err = models.GetEdbClassifyById(classifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			errMsg = "新增失败"
 			err = errors.New("获取预测指标分类失败，Err:" + err.Error())
 			return
@@ -426,7 +426,7 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 	// 指标信息校验
 	{
 		edbInfo, err = models.GetEdbInfoById(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			errMsg = "修改失败"
 			err = errors.New("获取预测指标失败，Err:" + err.Error())
 			return
@@ -449,7 +449,7 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 	{
 		// 查找该预测指标配置
 		predictEdbConfList, tmpErr := models.GetPredictEdbConfListById(edbInfo.EdbInfoId)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			errMsg = "修改失败"
 			err = errors.New("获取预测指标配置信息失败，Err:" + tmpErr.Error())
 			return
@@ -499,7 +499,7 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 	// 来源指标信息校验
 	{
 		sourceEdbInfo, err = models.GetEdbInfoById(predictEdbConf.SourceEdbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			errMsg = "新增失败"
 			err = errors.New("获取来源指标失败，Err:" + err.Error())
 			return
@@ -834,7 +834,7 @@ func RefreshPredictEdbInfo(edbInfoId int) (edbInfo *models.EdbInfo, err error, e
 	// 指标信息校验
 	{
 		edbInfo, err = models.GetEdbInfoById(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			errMsg = "刷新失败"
 			err = errors.New("获取预测指标失败，Err:" + err.Error())
 			return
@@ -1126,7 +1126,7 @@ func AddStaticPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, frequency
 	// 来源指标信息校验
 	{
 		sourceEdbInfo, err = models.GetEdbInfoById(sourceEdbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			errMsg = "新增失败"
 			err = errors.New("获取来源指标失败，Err:" + err.Error())
 			return
@@ -1142,7 +1142,7 @@ func AddStaticPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, frequency
 	// 来源分类信息校验
 	{
 		classifyInfo, err = models.GetEdbClassifyById(classifyId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			errMsg = "新增失败"
 			err = errors.New("获取预测指标分类失败，Err:" + err.Error())
 			return
@@ -1244,7 +1244,7 @@ func AddStaticPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, frequency
 	if sourceEdbInfo.EdbType == 1 {
 		// 查找该预测指标配置
 		predictEdbConfList, tmpErr := models.GetPredictEdbConfListById(sourceEdbInfo.EdbInfoId)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			errMsg = "获取预测指标配置信息失败"
 			err = errors.New("获取预测指标配置信息失败，Err:" + tmpErr.Error())
 			return

models/base_from_baiinfo.go

@@ -43,7 +43,7 @@ func AddEdbDataFromBaiinfo(edbCode string) (err error) {
 		pars = append(pars, edbCode)
 	}
 	baiinfoBaseDataAll, err := GetBaseFromBaiinfoDataByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 	var isAdd bool
@@ -109,7 +109,7 @@ func RefreshEdbDataFromBaiinfo(edbInfoId int, edbCode, startDate string) (err er
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_bloomberg.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"
@@ -35,31 +35,35 @@ func (m *BaseFromBloombergIndex) TableName() string {
 }
 
 func (m *BaseFromBloombergIndex) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.BaseFromBloombergIndexId = int(id)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.BaseFromBloombergIndexId = int(id)
+	err = global.DEFAULT_DB.Create(&m).Error
 	return
 }
 
 func (m *BaseFromBloombergIndex) 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
 }
 
 func GetBaseFromBloombergIndexByCode(indexCode string) (item *BaseFromBloombergIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_bloomberg_index WHERE index_code = ? LIMIT 1`
-	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
 }
 
 // BaseFromBloombergData Bloomberg原始数据
 type BaseFromBloombergData struct {
-	BaseFromBloombergDataId  int       `orm:"column(base_from_bloomberg_data_id);pk"`
+	//BaseFromBloombergDataId  int       `orm:"column(base_from_bloomberg_data_id);pk"`
+	BaseFromBloombergDataId  int       `gorm:"column:base_from_bloomberg_data_id;primaryKey"`
 	BaseFromBloombergIndexId int       `description:"指标ID"`
 	IndexCode                string    `description:"指标编码"`
 	DataTime                 time.Time `description:"数据日期"`
@@ -75,48 +79,67 @@ func (m *BaseFromBloombergData) TableName() string {
 
 func GetBaseFromBloombergDataByCondition(condition string, pars []interface{}) (items []*BaseFromBloombergData, err error) {
 	sub := `SELECT * FROM base_from_bloomberg_data WHERE 1=1  `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sub += condition
 	}
 	sql := `SELECT * FROM (` + sub + ` HAVING 1 ORDER BY modify_time DESC) tmp GROUP BY data_time ORDER BY data_time DESC `
-	_, 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
 }
 
 func MultiInsertOrUpdateBaseFromBloombergData(inserts, updates []*BaseFromBloombergData) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if len(inserts) > 0 {
-		_, e := o.InsertMulti(1000, inserts)
+		//_, e := o.InsertMulti(1000, inserts)
+		e := global.DEFAULT_DB.CreateInBatches(&inserts, 1000).Error
 		if e != nil {
 			err = fmt.Errorf("insert multi err: %s", e.Error())
 			return
 		}
 	}
 	if len(updates) > 0 {
-		p, e := o.Raw("UPDATE base_from_bloomberg_data SET value = ?, modify_time = NOW() WHERE index_code = ? AND data_time = ?").Prepare()
-		if e != nil {
-			err = fmt.Errorf("prepare err: %s", e.Error())
-			return
-		}
+		to := global.DEFAULT_DB.Begin()
 		defer func() {
-			_ = p.Close()
+			if err != nil {
+				_ = to.Rollback()
+			} else {
+				_ = to.Commit()
+			}
 		}()
+		sql := `UPDATE base_from_bloomberg_data SET value = ?, modify_time = NOW() WHERE index_code = ? AND data_time = ?`
 		for _, v := range updates {
-			_, e = p.Exec(v.Value, v.IndexCode, v.DataTime.Format(utils.FormatDate))
-			if e != nil {
-				err = fmt.Errorf("update err: %s", e.Error())
+			err = to.Exec(sql, v.Value, v.IndexCode, v.DataTime.Format(utils.FormatDate)).Error
+			if err != nil {
+				err = fmt.Errorf("update err: %s", err.Error())
 				return
 			}
 		}
+		//p, e := o.Raw("UPDATE base_from_bloomberg_data SET value = ?, modify_time = NOW() WHERE index_code = ? AND data_time = ?").Prepare()
+		//if e != nil {
+		//	err = fmt.Errorf("prepare err: %s", e.Error())
+		//	return
+		//}
+		//defer func() {
+		//	_ = p.Close()
+		//}()
+		//for _, v := range updates {
+		//	_, e = p.Exec(v.Value, v.IndexCode, v.DataTime.Format(utils.FormatDate))
+		//	if e != nil {
+		//		err = fmt.Errorf("update err: %s", e.Error())
+		//		return
+		//	}
+		//}
 	}
 	return
 }
 
 func GetBaseFromBloombergIndexMinMax(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_bloomberg_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
 	}
@@ -124,7 +147,8 @@ func GetBaseFromBloombergIndexMinMax(indexCode string) (item *EdbInfoMaxAndMinIn
 	// 获取最新值
 	var lastVal float64
 	sql = ` SELECT value AS latest_value FROM base_from_bloomberg_data WHERE index_code = ? ORDER BY data_time DESC LIMIT 1 `
-	err = o.Raw(sql, indexCode).QueryRow(&lastVal)
+	//err = o.Raw(sql, indexCode).QueryRow(&lastVal)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).First(&lastVal).Error
 	if err != nil {
 		return
 	}
@@ -133,9 +157,10 @@ func GetBaseFromBloombergIndexMinMax(indexCode string) (item *EdbInfoMaxAndMinIn
 }
 
 func ModifyBaseFromBloombergIndexMinMax(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_bloomberg_index 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
 }
 
@@ -146,18 +171,19 @@ type BloombergData struct {
 
 func GetBloombergDataByCondition(condition string, pars []interface{}) (item []*BloombergData, err error) {
 	sql1 := ` SELECT * FROM base_from_bloomberg_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
 }
 
 // AddEdbDataFromBloomberg 新增Bloomberg指标数据
 func AddEdbDataFromBloomberg(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -199,7 +225,8 @@ func AddEdbDataFromBloomberg(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
 			}
@@ -213,7 +240,7 @@ func RefreshEdbDataFromBloomberg(edbInfoId int, edbCode, startDate string) (err
 	source := utils.DATA_SOURCE_BLOOMBERG
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -243,7 +270,7 @@ func RefreshEdbDataFromBloomberg(edbInfoId int, edbCode, startDate string) (err
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {
@@ -319,7 +346,8 @@ func RefreshEdbDataFromBloomberg(edbInfoId int, edbCode, startDate string) (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 {
 			return err
 		}

models/base_from_business.go

@@ -1,32 +1,32 @@
 package models
 
 import (
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/models/mgo"
 	"eta/eta_index_lib/utils"
 	"fmt"
 	"go.mongodb.org/mongo-driver/bson"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // BaseFromBusinessIndex
 // @Description: 外部指标（商家系统）表
 type BaseFromBusinessIndex struct {
-	BaseFromBusinessIndexId int64     `orm:"column(base_from_business_index_id);pk"`
-	IndexCode               string    `description:"指标编码"`
-	IndexName               string    `description:"指标名称"`
-	Unit                    string    `description:"单位"`
-	Frequency               string    `description:"频度"`
-	Source                  int       `description:"数据来源"`
-	SourceName              string    `description:"数据来源名称"`
-	StartDate               time.Time `description:"开始日期"`
-	EndDate                 time.Time `description:"结束日期"`
-	Remark                  string    `description:"备注字段"`
-	BaseModifyTime          time.Time `description:"基础信息(名称，单位，频度)变更时间"`
-	DataUpdateTime          time.Time `description:"最近一次数据发生变化的时间"`
-	CreateTime              time.Time `description:"创建时间"`
-	ModifyTime              time.Time `description:"修改时间"`
+	BaseFromBusinessIndexId int64 `gorm:"column:base_from_business_index_id;primaryKey"`
+	//BaseFromBusinessIndexId int64     `orm:"column(base_from_business_index_id);pk"`
+	IndexCode      string    `description:"指标编码"`
+	IndexName      string    `description:"指标名称"`
+	Unit           string    `description:"单位"`
+	Frequency      string    `description:"频度"`
+	Source         int       `description:"数据来源"`
+	SourceName     string    `description:"数据来源名称"`
+	StartDate      time.Time `description:"开始日期"`
+	EndDate        time.Time `description:"结束日期"`
+	Remark         string    `description:"备注字段"`
+	BaseModifyTime time.Time `description:"基础信息(名称，单位，频度)变更时间"`
+	DataUpdateTime time.Time `description:"最近一次数据发生变化的时间"`
+	CreateTime     time.Time `description:"创建时间"`
+	ModifyTime     time.Time `description:"修改时间"`
 }
 
 // BaseFromBusinessIndexResp
@@ -42,9 +42,10 @@ type BaseFromBusinessIndexResp struct {
 // EdbBusinessSource
 // @Description: 自有数据（商家）指标来源
 type EdbBusinessSource struct {
-	EdbBusinessSourceId int64     `orm:"column(edb_business_source_id);pk"`
-	SourceName          string    `description:"来源名称"` // 来源名称
-	CreateTime          time.Time `description:"创建时间"` // 创建时间
+	EdbBusinessSourceId int64 `gorm:"column:edb_business_source_id;primaryKey"`
+	//EdbBusinessSourceId int64     `orm:"column(edb_business_source_id);pk"`
+	SourceName string    `description:"来源名称"` // 来源名称
+	CreateTime time.Time `description:"创建时间"` // 创建时间
 }
 
 // AddBusinessIndexReq
@@ -89,9 +90,10 @@ type DelBusinessIndexDataReq struct {
 // @return item *BaseFromBusinessIndex
 // @return err error
 func (m *BaseFromBusinessIndex) GetIndexItem(indexCode string) (item *BaseFromBusinessIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_business_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
 }
 
@@ -108,9 +110,11 @@ func (m *BaseFromBusinessIndex) GetIndexItemList(indexCodeList []string) (items
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_business_index WHERE index_code in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, indexCodeList).QueryRows(&items)
+	//o := orm.NewOrm()
+	//sql := `SELECT * FROM base_from_business_index WHERE index_code in (` + utils.GetOrmInReplace(num) + `) `
+	sql := `SELECT * FROM base_from_business_index WHERE index_code in ? `
+	err = global.DEFAULT_DB.Raw(sql, indexCodeList).Find(&items).Error
+	//_, err = o.Raw(sql, indexCodeList).QueryRows(&items)
 
 	return
 }
@@ -127,9 +131,11 @@ func (m *BaseFromBusinessIndex) DelIndexItemList(indexCodeList []string) (err er
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
-	sql := `DELETE FROM base_from_business_index WHERE index_code in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, indexCodeList).Exec()
+	//o := orm.NewOrm()
+	//sql := `DELETE FROM base_from_business_index WHERE index_code in (` + utils.GetOrmInReplace(num) + `) `
+	sql := `DELETE FROM base_from_business_index WHERE index_code in ? `
+	err = global.DEFAULT_DB.Exec(sql, indexCodeList).Error
+	//_, err = o.Raw(sql, indexCodeList).Exec()
 
 	return
 }
@@ -142,33 +148,36 @@ func (m *BaseFromBusinessIndex) DelIndexItemList(indexCodeList []string) (err er
 // @return maxId int
 // @return err error
 func (m *BaseFromBusinessIndex) GetMaxId() (maxId int, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT max(base_from_business_index_id) id FROM base_from_business_index limit 1`
-	err = o.Raw(sql).QueryRow(&maxId)
+	err = global.DEFAULT_DB.Raw(sql).Scan(&maxId).Error
+	//err = o.Raw(sql).QueryRow(&maxId)
 	return
 }
 
 // Add 新增
 func (m *BaseFromBusinessIndex) Add() (err error) {
-	o := orm.NewOrm()
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.BaseFromBusinessIndexId = lastId
-
+	//o := orm.NewOrm()
+	//lastId, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.BaseFromBusinessIndexId = lastId
+	err = global.DEFAULT_DB.Create(&m).Error
 	return
 }
 
 func (m *BaseFromBusinessIndex) 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
 }
 
 func (m *BaseFromBusinessIndex) Del() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Delete(m)
+	//o := orm.NewOrm()
+	//_, err = o.Delete(m)
+	err = global.DEFAULT_DB.Delete(&m).Error
 	return
 }
 
@@ -179,8 +188,9 @@ func (m *BaseFromBusinessIndex) UpdateIndex(item *BaseFromBusinessIndex, updateC
 	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
 }
 
@@ -193,21 +203,22 @@ func (m *BaseFromBusinessIndex) UpdateIndex(item *BaseFromBusinessIndex, updateC
 // @return item *EdbBusinessSource
 // @return err error
 func (m *EdbBusinessSource) GetEdbBusinessSourceItem(sourceName string) (item *EdbBusinessSource, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM edb_business_source WHERE source_name = ? `
-	err = o.Raw(sql, sourceName).QueryRow(&item)
+	//err = o.Raw(sql, sourceName).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, sourceName).First(&item).Error
 	return
 }
 
 // Add 新增
 func (m *EdbBusinessSource) Add() (err error) {
-	o := orm.NewOrm()
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.EdbBusinessSourceId = lastId
-
+	////o := orm.NewOrm()
+	//lastId, err := o.Insert(m)
+	//if err != nil {
+	//	return
+	//}
+	//m.EdbBusinessSourceId = lastId
+	err = global.DEFAULT_DB.Create(&m).Error
 	return
 }
 
@@ -319,12 +330,13 @@ func (m BaseFromBusinessIndex) getEdbInfoMaxAndMinInfoByMysql(edbCode string) (i
 // @param isIndexUpdateOrAdd bool
 // @return err error
 func (m *BaseFromBusinessIndex) ModifyIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInfo, isIndexUpdateOrAdd bool) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_business_index SET start_date=?,end_date=?,latest_value=?,modify_time=NOW() `
 	if isIndexUpdateOrAdd {
 		sql += `,data_update_time=NOW() `
 	}
 	sql += ` 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_business_data.go

@@ -2,9 +2,9 @@ package models
 
 import (
 	"errors"
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -12,7 +12,8 @@ import (
 // BaseFromBusinessData
 // @Description: 外部指标（商家系统）原始数据表
 type BaseFromBusinessData struct {
-	BusinessDataId          int       `orm:"column(business_data_id);pk" json:"business_data_id"`
+	//BusinessDataId          int       `orm:"column(business_data_id);pk" json:"business_data_id"`
+	BusinessDataId          int       `gorm:"column:business_data_id;primaryKey" json:"business_data_id"`
 	BaseFromBusinessIndexId int       `json:"base_from_business_index_id"` // 指标id
 	IndexCode               string    `json:"index_code"`                  // 指标编码
 	DataTime                time.Time `json:"data_time"`                   // 数据日期
@@ -68,7 +69,7 @@ type WhereParams struct {
 // @return result []*BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) GetAllDataList(condition []string, pars []interface{}, order string) (result []*BaseFromBusinessData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	sql := `SELECT * FROM base_from_business_data `
 	if len(condition) > 0 {
@@ -79,8 +80,8 @@ func (m *BaseFromBusinessData) GetAllDataList(condition []string, pars []interfa
 		sql += ` ORDER BY ` + order
 	}
 
-	_, err = o.Raw(sql, pars).QueryRows(&result)
-
+	//_, err = o.Raw(sql, pars).QueryRows(&result)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&result).Error
 	return
 }
 
@@ -96,7 +97,7 @@ func (m *BaseFromBusinessData) GetAllDataList(condition []string, pars []interfa
 // @return result []*BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) GetLimitDataList(condition []string, pars []interface{}, order string, size int64) (result []*BaseFromBusinessData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_business_data `
 	if len(condition) > 0 {
 		sql += ` WHERE ` + strings.Join(condition, " AND ")
@@ -108,8 +109,8 @@ func (m *BaseFromBusinessData) GetLimitDataList(condition []string, pars []inter
 
 	sql += fmt.Sprintf(` LIMIT %d`, size)
 
-	_, err = o.Raw(sql, pars).QueryRows(&result)
-
+	//_, err = o.Raw(sql, pars).QueryRows(&result)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&result).Error
 	return
 }
 
@@ -126,7 +127,7 @@ func (m *BaseFromBusinessData) GetLimitDataList(condition []string, pars []inter
 // @return result []*BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) GetPageDataList(condition []string, pars []interface{}, order string, startSize, size int64) (result []*BaseFromBusinessData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_business_data `
 	if len(condition) > 0 {
 		sql += ` WHERE ` + strings.Join(condition, " AND ")
@@ -138,8 +139,8 @@ func (m *BaseFromBusinessData) GetPageDataList(condition []string, pars []interf
 
 	sql += fmt.Sprintf(` LIMIT %d,%d`, startSize, size)
 
-	_, err = o.Raw(sql, pars).QueryRows(&result)
-
+	//_, err = o.Raw(sql, pars).QueryRows(&result)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&result).Error
 	return
 }
 
@@ -153,13 +154,13 @@ func (m *BaseFromBusinessData) GetPageDataList(condition []string, pars []interf
 // @return count int64
 // @return err error
 func (m *BaseFromBusinessData) GetCountDataList(condition []string, pars []interface{}) (count int64, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT COUNT(1) FROM base_from_business_data `
 	if len(condition) > 0 {
 		sql += ` WHERE ` + strings.Join(condition, " AND ")
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
-
+	//err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -171,9 +172,9 @@ func (m *BaseFromBusinessData) GetCountDataList(condition []string, pars []inter
 // @param addData interface{}
 // @return err error
 func (m *BaseFromBusinessData) InsertDataByColl(addData interface{}) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(addData)
-
+	//o := orm.NewOrm()
+	//_, err = o.Insert(addData)
+	err = global.DEFAULT_DB.Create(&addData).Error
 	return
 }
 
@@ -186,9 +187,9 @@ func (m *BaseFromBusinessData) InsertDataByColl(addData interface{}) (err error)
 // @param dataList []*BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) BatchInsertData(bulk int, dataList []*BaseFromBusinessData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(bulk, dataList)
-
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(bulk, dataList)
+	err = global.DEFAULT_DB.CreateInBatches(&dataList, bulk).Error
 	return
 }
 
@@ -201,8 +202,9 @@ func (m *BaseFromBusinessData) BatchInsertData(bulk int, dataList []*BaseFromBus
 // @param updateParams interface{}
 // @return err error
 func (m *BaseFromBusinessData) UpdateData(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, updateCols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(m, updateCols...)
+	err = global.DEFAULT_DB.Model(&m).Select(updateCols).Updates(&m).Error
 	if err != nil {
 		fmt.Println("UpdateDataByColl:Err:" + err.Error())
 		return
@@ -220,8 +222,9 @@ func (m *BaseFromBusinessData) UpdateData(updateCols []string) (err error) {
 // @param updateDataList []*BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) HandleData(addDataList, updateDataList []*BaseFromBusinessData) (err error) {
-	o := orm.NewOrm()
-	to, err := o.Begin()
+	//o := orm.NewOrm()
+	//to, err := o.Begin()
+	to := global.DEFAULT_DB.Begin()
 	if err != nil {
 		return
 	}
@@ -236,7 +239,8 @@ func (m *BaseFromBusinessData) HandleData(addDataList, updateDataList []*BaseFro
 
 	// 插入数据
 	if len(addDataList) > 0 {
-		_, err = to.InsertMulti(500, addDataList)
+		//_, err = to.InsertMulti(500, addDataList)
+		err = to.CreateInBatches(&addDataList, 500).Error
 		if err != nil {
 			return
 		}
@@ -246,7 +250,8 @@ func (m *BaseFromBusinessData) HandleData(addDataList, updateDataList []*BaseFro
 
 	if len(updateDataList) > 0 {
 		for _, v := range updateDataList {
-			_, err = to.Update(v, "Value", "ModifyTime")
+			//_, err = to.Update(v, "Value", "ModifyTime")
+			err = to.Model(&v).Select([]string{"Value", "ModifyTime"}).Updates(&v).Error
 			if err != nil {
 				fmt.Println("BaseFromBusinessData HandleData Update:Err:" + err.Error())
 				return
@@ -266,17 +271,19 @@ func (m *BaseFromBusinessData) HandleData(addDataList, updateDataList []*BaseFro
 // @return result EdbInfoMaxAndMinInfo
 // @return err error
 func (m *BaseFromBusinessData) GetEdbInfoMaxAndMinInfo(indexCode string) (result EdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ``
 	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_business_data WHERE index_code = ? `
-	err = o.Raw(sql, indexCode).QueryRow(&result)
+	//err = o.Raw(sql, indexCode).QueryRow(&result)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).Find(&result).Error
 	if err != nil {
 		return
 	}
 
 	var latestValue float64
 	sql = ` SELECT value AS latest_value FROM base_from_business_data WHERE index_code = ? ORDER BY data_time DESC LIMIT 1 `
-	err = o.Raw(sql, indexCode).QueryRow(&latestValue)
+	//err = o.Raw(sql, indexCode).QueryRow(&latestValue)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).Scan(&latestValue).Error
 	result.LatestValue = latestValue
 
 	return
@@ -295,12 +302,12 @@ func (m *BaseFromBusinessData) DelDataByCond(condition []string, pars []interfac
 		err = errors.New("条件不能为空")
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `DELETE FROM base_from_business_data `
 
 	sql += ` WHERE ` + strings.Join(condition, " AND ")
 
-	_, err = o.Raw(sql, pars).Exec()
-
+	//_, err = o.Raw(sql, pars).Exec()
+	err = global.DEFAULT_DB.Exec(sql, pars...).Error
 	return
 }

models/base_from_calculate.go

@@ -3,15 +3,16 @@ package models
 import (
 	"encoding/json"
 	"errors"
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/dengsgo/math-engine/engine"
 
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
 )
 
@@ -48,8 +49,9 @@ type CalculateItems struct {
 // AddCalculateInfo 新增计算（运算）指标
 func AddCalculateInfo(req EdbInfoCalculateSaveReq, calculateMappingList []*EdbInfoCalculateMapping, edbInfoList []*EdbInfo, edbCode, uniqueCode string, edbInfoIdBytes []string) (edbInfo *EdbInfo, err error) {
 
-	o := orm.NewOrm()
-	to, err := o.Begin()
+	//o := orm.NewOrm()
+	//to, err := o.Begin()
+	to := global.DEFAULT_DB.Begin()
 	if err != nil {
 		return
 	}
@@ -98,11 +100,12 @@ func AddCalculateInfo(req EdbInfoCalculateSaveReq, calculateMappingList []*EdbIn
 		MaxEmptyType:     req.MaxEmptyType,
 		Extra:            req.Extra,
 	}
-	lastId, err := to.Insert(edbInfo)
+	//lastId, err := to.Insert(edbInfo)
+	err = to.Create(&edbInfo).Error
 	if err != nil {
 		return
 	}
-	edbInfo.EdbInfoId = int(lastId)
+	//edbInfo.EdbInfoId = int(lastId)
 	edbInfoTag := make(map[string]int)
 	//关联关系表
 	{
@@ -113,7 +116,8 @@ func AddCalculateInfo(req EdbInfoCalculateSaveReq, calculateMappingList []*EdbIn
 			v.EdbInfoId = edbInfo.EdbInfoId
 		}
 		if len(calculateMappingList) > 0 {
-			_, err = to.InsertMulti(len(calculateMappingList), calculateMappingList)
+			//_, err = to.InsertMulti(len(calculateMappingList), calculateMappingList)
+			err = to.CreateInBatches(&calculateMappingList, len(calculateMappingList)).Error
 			if err != nil {
 				return
 			}
@@ -127,8 +131,9 @@ func AddCalculateInfo(req EdbInfoCalculateSaveReq, calculateMappingList []*EdbIn
 
 // EditCalculateInfo 编辑计算（运算）指标
 func EditCalculateInfo(edbInfo *EdbInfo, req EdbInfoCalculateSaveReq, formulaSlice []string, edbInfoIdBytes []string, needCalculate bool) (err error, errMsg string) {
-	o := orm.NewOrm()
-	to, err := o.Begin()
+	//o := orm.NewOrm()
+	//to, err := o.Begin()
+	to := global.DEFAULT_DB.Begin()
 	if err != nil {
 		return
 	}
@@ -154,7 +159,8 @@ func EditCalculateInfo(edbInfo *EdbInfo, req EdbInfoCalculateSaveReq, formulaSli
 	edbInfo.EmptyType = req.EmptyType
 	edbInfo.MaxEmptyType = req.MaxEmptyType
 	edbInfo.Extra = req.Extra
-	_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "EdbNameEn", "UnitEn", "ClassifyId", "CalculateFormula", "ModifyTime", "EmptyType", "MaxEmptyType", "Extra")
+	//_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "EdbNameEn", "UnitEn", "ClassifyId", "CalculateFormula", "ModifyTime", "EmptyType", "MaxEmptyType", "Extra")
+	err = to.Model(&edbInfo).Select([]string{"EdbName", "EdbNameSource", "Frequency", "Unit", "EdbNameEn", "UnitEn", "ClassifyId", "CalculateFormula", "ModifyTime", "EmptyType", "MaxEmptyType", "Extra"}).Updates(&edbInfo).Error
 	if err != nil {
 		return
 	}
@@ -162,13 +168,15 @@ func EditCalculateInfo(edbInfo *EdbInfo, req EdbInfoCalculateSaveReq, formulaSli
 	if needCalculate {
 		// 清除计算数据
 		sql := `DELETE FROM edb_data_calculate WHERE edb_info_id=?`
-		_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+		//_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+		err = to.Exec(sql, edbInfo.EdbInfoId).Error
 		if err != nil {
 			return
 		}
 		// 清除关联关系表
 		sql = `DELETE FROM edb_info_calculate_mapping WHERE edb_info_id=?`
-		_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+		//_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+		err = to.Exec(sql, edbInfo.EdbInfoId).Error
 		if err != nil {
 			return
 		}
@@ -225,7 +233,8 @@ func EditCalculateInfo(edbInfo *EdbInfo, req EdbInfoCalculateSaveReq, formulaSli
 		//关联关系表
 		{
 			if len(calculateMappingList) > 0 {
-				_, err = to.InsertMulti(len(calculateMappingList), calculateMappingList)
+				//_, err = to.InsertMulti(len(calculateMappingList), calculateMappingList)
+				err = to.CreateInBatches(&calculateMappingList, len(calculateMappingList)).Error
 				if err != nil {
 					return
 				}
@@ -241,20 +250,22 @@ func EditCalculateInfo(edbInfo *EdbInfo, req EdbInfoCalculateSaveReq, formulaSli
 
 // GetCalculateEdbInfo 获取计算指标的关联指标id
 func GetCalculateEdbInfo(edbInfoId int) (from_edb_info_id string, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT GROUP_CONCAT(from_edb_info_id ORDER BY sort ASC SEPARATOR ',') AS from_edb_info_id 
 			FROM edb_info_calculate_mapping
 			WHERE edb_info_id=?
 			GROUP BY edb_info_id
 			 `
-	err = o.Raw(sql, edbInfoId).QueryRow(&from_edb_info_id)
+	//err = o.Raw(sql, edbInfoId).QueryRow(&from_edb_info_id)
+	err = global.DEFAULT_DB.Raw(sql, edbInfoId).Scan(&from_edb_info_id).Error
 	return
 }
 
 // DeleteCalculateEdbInfo 删除指标信息
 func DeleteCalculateEdbInfo(edbInfoId int) (err error) {
-	o := orm.NewOrm()
-	to, err := o.Begin()
+	//o := orm.NewOrm()
+	//to, err := o.Begin()
+	to := global.DEFAULT_DB.Begin()
 	if err != nil {
 		return
 	}
@@ -266,19 +277,22 @@ func DeleteCalculateEdbInfo(edbInfoId int) (err error) {
 		}
 	}()
 	sql := `DELETE FROM edb_data_calculate WHERE edb_info_id=?`
-	_, err = to.Raw(sql, edbInfoId).Exec()
+	//_, err = to.Raw(sql, edbInfoId).Exec()
+	err = to.Exec(sql, edbInfoId).Error
 	if err != nil {
 		return
 	}
 	sql = `DELETE FROM edb_info_calculate_mapping WHERE edb_info_id=?`
-	_, err = to.Raw(sql, edbInfoId).Exec()
+	//_, err = to.Raw(sql, edbInfoId).Exec()
+	err = to.Exec(sql, edbInfoId).Error
 	return
 }
 
 // RefreshAllCalculate 刷新全部数据
 func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoTag map[string]int, edbInfoId, source, subSource int, edbCode, formulaStr, startDate, endDate string, edbInfoIdBytes []string, emptyType, maxEmptyType int, extra string) (err error) {
-	o := orm.NewOrm()
-	to, err := o.Begin()
+	//o := orm.NewOrm()
+	//to, err := o.Begin()
+	to := global.DEFAULT_DB.Begin()
 	if err != nil {
 		return
 	}
@@ -298,7 +312,9 @@ func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoTag map[string]int, edb
 }
 
 // refreshAllCalculate 刷新全部数据
-func refreshAllCalculate(to orm.TxOrmer, edbInfoIdArr []*EdbInfo, edbInfoTag map[string]int, edbInfoId, source, subSource int, edbCode, formulaStr, startDate, endDate string, edbInfoIdBytes []string, emptyType, maxEmptyType int, extra string) (err error) {
+func refreshAllCalculate(to *gorm.DB, edbInfoIdArr []*EdbInfo, edbInfoTag map[string]int, edbInfoId, source, subSource int, edbCode, formulaStr, startDate, endDate string, edbInfoIdBytes []string, emptyType, maxEmptyType int, extra string) (err error) {
+	//func refreshAllCalculate(to orm.TxOrmer, edbInfoIdArr []*EdbInfo, edbInfoTag map[string]int, edbInfoId, source, subSource int, edbCode, formulaStr, startDate, endDate string, edbInfoIdBytes []string, emptyType, maxEmptyType int, extra string) (err error) {
+
 	realSaveDataMap := make(map[string]map[int]float64)
 	saveDataMap := make(map[string]map[int]float64)
 
@@ -400,7 +416,8 @@ func refreshAllCalculate(to orm.TxOrmer, edbInfoIdArr []*EdbInfo, edbInfoTag map
 	dataTableName := GetEdbDataTableName(source, subSource)
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
 	sql = fmt.Sprintf(sql, dataTableName)
-	_, err = to.Raw(sql, edbInfoId).QueryRows(&dataList)
+	//_, err = to.Raw(sql, edbInfoId).QueryRows(&dataList)
+	err = to.Raw(sql, edbInfoId).Find(&dataList).Error
 	if err != nil {
 		return err
 	}
@@ -515,7 +532,8 @@ func refreshAllCalculate(to orm.TxOrmer, edbInfoIdArr []*EdbInfo, edbInfoTag map
 			if existStr != saveValue {
 				sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 				sql = fmt.Sprintf(sql, dataTableName)
-				_, err = to.Raw(sql, saveValue, edbInfoId, sk).Exec()
+				//_, err = to.Raw(sql, saveValue, edbInfoId, sk).Exec()
+				err = to.Exec(sql, saveValue, edbInfoId, sk).Error
 				if err != nil {
 					return err
 				}
@@ -525,7 +543,8 @@ func refreshAllCalculate(to orm.TxOrmer, edbInfoIdArr []*EdbInfo, edbInfoTag map
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = to.Raw(addSql).Exec()
+		//_, err = to.Raw(addSql).Exec()
+		err = to.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshAllCalculate add Err", err.Error())
 			return
@@ -543,7 +562,8 @@ func refreshAllCalculate(to orm.TxOrmer, edbInfoIdArr []*EdbInfo, edbInfoTag map
 		tableName := GetEdbDataTableName(source, subSource)
 		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)
 
-		_, err = to.Raw(sql, edbInfoId).Exec()
+		//_, err = to.Raw(sql, edbInfoId).Exec()
+		err = to.Exec(sql, edbInfoId).Error
 		if err != nil {
 			err = fmt.Errorf("删除计算失败的计算指标数据失败,Err:" + err.Error())
 			return

models/base_from_ccf.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"
@@ -13,7 +13,8 @@ import (
 type BaseFromCCF struct{}
 
 type BaseFromCCFData struct {
-	BaseFromCcfDataId  int `orm:"column(base_from_ccf_data_id);pk"`
+	//BaseFromCcfDataId  int `orm:"column(base_from_ccf_data_id);pk"`
+	BaseFromCcfDataId  int `gorm:"column:base_from_ccf_data_id;primaryKey"`
 	BaseFromCcfIndexId int
 	IndexCode          string
 	DataTime           string
@@ -28,18 +29,19 @@ func (m *BaseFromCCFData) TableName() string {
 }
 
 func GetBaseFromCCFDataByCondition(condition string, pars []interface{}) (list []*BaseFromCCFData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ccf_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
 }
 
 // Add 添加
 func (obj BaseFromCCF) Add(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -48,7 +50,7 @@ func (obj BaseFromCCF) Add(edbCode string) (err error) {
 		pars = append(pars, edbCode)
 	}
 	ccfBaseDataAll, err := GetBaseFromCCFDataByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 	var isAdd bool
@@ -71,7 +73,8 @@ func (obj BaseFromCCF) Add(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
 		}
@@ -82,7 +85,7 @@ func (obj BaseFromCCF) Add(edbCode string) (err error) {
 // Refresh 刷新CCF化纤指标数据
 func (obj BaseFromCCF) Refresh(edbInfoId int, edbCode, startDate string) (err error) {
 	source := obj.GetSource()
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -112,7 +115,7 @@ func (obj BaseFromCCF) Refresh(edbInfoId int, edbCode, startDate string) (err er
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {
@@ -180,7 +183,8 @@ func (obj BaseFromCCF) Refresh(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 {
 			fmt.Println("RefreshEdbDataFromBaiinfo add Err", err.Error())
 			return
@@ -200,18 +204,19 @@ func (obj BaseFromCCF) GetSourceName() string {
 }
 
 type BaseFromCCFIndex struct {
-	BaseFromCcfIndexId int64 `orm:"column(base_from_ccf_index_id);pk"`
-	IndexCode          string
-	IndexName          string
-	Frequency          string
-	Unit               string
-	ClassifyId         int
-	StartDate          string
-	EndDate            string
-	Sort               int
-	TerminalCode       string
-	CreateTime         time.Time
-	ModifyTime         time.Time
+	BaseFromCcfIndexId int64 `gorm:"column:base_from_ccf_index_id;primaryKey"`
+	//BaseFromCcfIndexId int64 `orm:"column(base_from_ccf_index_id);pk"`
+	IndexCode    string
+	IndexName    string
+	Frequency    string
+	Unit         string
+	ClassifyId   int
+	StartDate    string
+	EndDate      string
+	Sort         int
+	TerminalCode string
+	CreateTime   time.Time
+	ModifyTime   time.Time
 }
 
 func (m *BaseFromCCFIndex) TableName() string {
@@ -219,34 +224,41 @@ func (m *BaseFromCCFIndex) TableName() string {
 }
 
 func (m *BaseFromCCFIndex) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(m)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(m)
+	err = global.DEFAULT_DB.Create(&m).Error
+	if err != nil {
+		return
+	}
+	lastId = m.BaseFromCcfIndexId
 	return
 }
 
 func (m *BaseFromCCFIndex) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, updateCols...)
-
+	//o := orm.NewOrm()
+	//_, err = o.Update(m, updateCols...)
+	err = global.DEFAULT_DB.Model(&m).Select(updateCols).Updates(&m).Error
 	return
 }
 
 func (m *BaseFromCCFIndex) ModifyIndexMaxAndMinDate(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_ccf_index 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
 }
 
 func (m *BaseFromCCFIndex) GetByIndexCode(indexCode string) (item *BaseFromCCFIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_ccf_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).First(&item).Error
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
 	return
 }
 
 func (m *BaseFromCCFIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromCCFIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -256,12 +268,14 @@ func (m *BaseFromCCFIndex) GetItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_ccf_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, 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 BaseFromCCFIndexList struct {
-	CcfIndexId   int64 `orm:"column(ccf_index_id);pk"`
+	CcfIndexId int64 `gorm:"column:ccf_index_id;primaryKey"`
+	//CcfIndexId   int64 `orm:"column(ccf_index_id);pk"`
 	IndexCode    string
 	IndexName    string
 	Frequency    string
@@ -275,15 +289,17 @@ type BaseFromCCFIndexList struct {
 }
 
 func (m *BaseFromCCFData) GetByIndexCode(indexCode string) (list []*BaseFromCCFData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_ccf_data WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).Find(&list).Error
 	return
 }
 
 func (m *BaseFromCCFData) AddMulti(item []*BaseFromCCFData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(100, item)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(100, item)
+	err = global.DEFAULT_DB.CreateInBatches(&item, 100).Error
 	return
 }
 
@@ -317,20 +333,22 @@ type HandleCCFStockTableReq struct {
 }
 
 func (m *BaseFromCCFData) GetMaxAndMinDateByIndexCode(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_ccf_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
 	var latest_value float64
 	sql = ` SELECT value AS latest_value FROM base_from_ccf_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
 	item.LatestValue = latest_value
 	return
 }
 
 // BaseFromCCFClassify CCF化纤数据分类表
 type BaseFromCCFClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk"`
+	ClassifyId int `gorm:"column:classify_id;primaryKey"`
+	//ClassifyId      int       `orm:"column(classify_id);pk"`
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
 	SysUserId       int       `description:"创建人id"`
@@ -342,27 +360,33 @@ type BaseFromCCFClassify struct {
 }
 
 func (m *BaseFromCCFClassify) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(m)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(m)
+	err = global.DEFAULT_DB.Create(&m).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(m.ClassifyId)
 	return
 }
 
 func (m *BaseFromCCFClassify) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, updateCols...)
-
+	//o := orm.NewOrm()
+	//_, err = o.Update(m, updateCols...)
+	err = global.DEFAULT_DB.Model(&m).Select(updateCols).Updates(&m).Error
 	return
 }
 
 func (m *BaseFromCCFClassify) GetByClassifyName(classifyName string) (item *BaseFromCCFClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_ccf_classify WHERE classify_name=? `
-	err = o.Raw(sql, classifyName).QueryRow(&item)
+	//err = o.Raw(sql, classifyName).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, classifyName).First(&item).Error
 	return
 }
 
 func (m *BaseFromCCFClassify) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromCCFClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -372,7 +396,8 @@ func (m *BaseFromCCFClassify) GetItemsByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_ccf_classify WHERE 1=1 %s %s`, fields, condition, order)
-	_, 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
 }
 
@@ -409,23 +434,40 @@ func MultiUpdateBaseFromCCFDataValue(items []*BaseFromCCFData) (err error) {
 		return
 	}
 
-	o := orm.NewOrm()
-	sql := `UPDATE base_from_ccf_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_ccf_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 = 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
 }

models/base_from_cffex.go

@@ -1,16 +1,17 @@
 package models
 
 import (
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
 )
 
 type BaseFromTradeCFFEXIndex struct {
-	BaseFromTradeCffexIndexId int `orm:"column(base_from_trade_cffex_index_id);pk"`
+	//BaseFromTradeCffexIndexId int `orm:"column(base_from_trade_cffex_index_id);pk"`
+	BaseFromTradeCffexIndexId int `gorm:"column:base_from_trade_cffex_index_id;primaryKey"`
 	Rank                      int
 	DealShortName             string
 	DealName                  string
@@ -36,15 +37,18 @@ type BaseFromTradeCFFEXIndex struct {
 }
 
 func GetBaseFromCffexDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeCFFEXIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_cffex_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	//_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).Find(&list).Error
+
 	return
 }
 
 type BaseFromCffexDataSimple struct {
-	Id        int `orm:"column(base_from_trade_cffex_index_id);pk"`
+	Id int `gorm:"column:base_from_trade_cffex_index_id;primaryKey"`
+	//Id        int `orm:"column(base_from_trade_cffex_index_id);pk"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -56,12 +60,13 @@ type BaseFromCffexDataSimple struct {
 
 func GetCffexDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromCffexDataSimple, err error) {
 	sql := ` SELECT * FROM base_from_trade_cffex_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
 }
 
@@ -76,12 +81,14 @@ func AddEdbDataFromCffex(edbCode string) (err error) {
 		suffix = "sold"
 	}
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	cffexBaseDataAll, err := GetBaseFromCffexDataAllByIndexCode(edbCode, suffix)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	//if err != nil && !utils.IsErrNoRow(err) {
+	//	return
+	//}
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
-
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_cffex(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	existMap := make(map[string]string)
@@ -116,7 +123,8 @@ func AddEdbDataFromCffex(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 +145,7 @@ func RefreshEdbDataFromCffex(edbInfoId int, edbCode, startDate string) (err erro
 		suffix = "sold"
 	}
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -174,7 +182,7 @@ func RefreshEdbDataFromCffex(edbInfoId int, edbCode, startDate string) (err erro
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {
@@ -258,7 +266,8 @@ func RefreshEdbDataFromCffex(edbInfoId int, edbCode, startDate string) (err erro
 
 	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_clarksons.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,15 +11,16 @@ import (
 )
 
 type BaseFromClarksonsIndex struct {
-	BaseFromClarksonsIndexId int       `orm:"pk"`
-	ClassifyId               int       `description:"指标分类id"`
-	IndexCode                string    `description:"指标编码"`
-	IndexName                string    `description:"指标名称"`
-	Unit                     string    `description:"单位"`
-	Frequency                string    `description:"频度"`
-	Sort                     int       `description:"排序"`
-	CreateTime               time.Time
-	ModifyTime               time.Time
+	BaseFromClarksonsIndexId int `gorm:"primaryKey"`
+	//BaseFromClarksonsIndexId int       `orm:"pk"`
+	ClassifyId int    `description:"指标分类id"`
+	IndexCode  string `description:"指标编码"`
+	IndexName  string `description:"指标名称"`
+	Unit       string `description:"单位"`
+	Frequency  string `description:"频度"`
+	Sort       int    `description:"排序"`
+	CreateTime time.Time
+	ModifyTime time.Time
 }
 
 type BaseFromClarksonsData struct {
@@ -33,48 +35,60 @@ type BaseFromClarksonsData struct {
 
 // 查询指标
 func GetBaseFromClarksonsIndex() (items []*BaseFromClarksonsIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_clarksons_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
 // 查询指标
 func GetBaseFromClarksonsData() (items []*BaseFromClarksonsData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_clarksons_data`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
 // 添加数据
 func AddBaseFromClarksonsIndex(item *BaseFromClarksonsIndex) (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.BaseFromClarksonsIndexId)
 	return
 }
 
 func AddBaseFromClarksonsDataMuti(items []*BaseFromClarksonsData) (count int64, err error) {
 	o := orm.NewOrm()
 	count, err = o.InsertMulti(500, items)
+	dbResult := global.DEFAULT_DB.CreateInBatches(&items, 500)
+	err = dbResult.Error
+	count = dbResult.RowsAffected
 	return
 }
 
 func UpdateBaseFromClarksonsIndex(item *BaseFromClarksonsIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_clarksons_index SET frequency=?  WHERE index_code=? `
-	_, err = o.Raw(sql, item.Frequency, item.IndexCode).Exec()
+	//_, err = o.Raw(sql, item.Frequency, item.IndexCode).Exec()
+	err = global.DEFAULT_DB.Exec(sql, item.Frequency, item.IndexCode).Error
 	return
 }
 
 func AddEdbDataFromClarksons(edbCode string) (err error) {
-	o := orm.NewOrm()
-
+	//o := orm.NewOrm()
 	coalBaseDataAll, err := GetClarksonsindexByCode(edbCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
-
+	//if err != nil && !utils.IsErrNoRow(err) {
+	//	return
+	//}
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_clarksons(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	existMap := make(map[string]string)
@@ -108,7 +122,8 @@ func AddEdbDataFromClarksons(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
 		}
@@ -119,7 +134,7 @@ func AddEdbDataFromClarksons(edbCode string) (err error) {
 func RefreshEdbDataFromClarksons(edbInfoId int, edbCode, startDate string) (err error) {
 	source := utils.DATA_SOURCE_CLARKSONS
 	subSource := utils.DATA_SUB_SOURCE_EDB
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -150,7 +165,7 @@ func RefreshEdbDataFromClarksons(edbInfoId int, edbCode, startDate string) (err
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {
@@ -236,7 +251,8 @@ func RefreshEdbDataFromClarksons(edbInfoId int, edbCode, startDate string) (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 {
 			return err
 		}
@@ -247,19 +263,21 @@ func RefreshEdbDataFromClarksons(edbInfoId int, edbCode, startDate string) (err
 
 // GetClarksonsindexByCode
 func GetClarksonsindexByCode(indexCode string) (items []*BaseFromClarksonsData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := "SELECT * FROM base_from_clarksons_data 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 GetClarksonsDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromClarksonsData, err error) {
 	sql := ` SELECT * FROM base_from_clarksons_data 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
 }

models/base_from_coal.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"
@@ -26,22 +26,24 @@ type BaseFromCoalmineIndex struct {
 }
 
 func GetBaseFromCoalIndexByCode(suffix, indexCode string) (items []*BaseFromCoalmineIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_%s WHERE index_code=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, 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 GetCoalDataByTradeCode(suffix, condition string, pars []interface{}) (item []*BaseFromCoalmineIndex, err error) {
 	sql := ` SELECT * FROM base_from_coalmine_%s WHERE 1=1 `
 	sql = fmt.Sprintf(sql, suffix)
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&item).Error
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
 	return
 }
 
@@ -59,10 +61,10 @@ func AddEdbDataFromCoal(edbCode string) (err error) {
 		suffix = "inland_index"
 	}
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	coalBaseDataAll, err := GetBaseFromCoalIndexByCode(suffix, edbCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 
@@ -129,7 +131,8 @@ func AddEdbDataFromCoal(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
 		}
@@ -140,7 +143,7 @@ func AddEdbDataFromCoal(edbCode string) (err error) {
 func RefreshEdbDataFromCoal(edbInfoId int, edbCode, startDate string) (err error) {
 	source := utils.DATA_SOURCE_COAL
 	subSource := utils.DATA_SUB_SOURCE_EDB
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -182,7 +185,7 @@ func RefreshEdbDataFromCoal(edbInfoId int, edbCode, startDate string) (err error
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {
@@ -297,7 +300,8 @@ func RefreshEdbDataFromCoal(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_coal_coastal.go

@@ -1,13 +1,14 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_index_lib/global"
 	"time"
 )
 
 // BaseFromCoalmineCoastalIndex 沿海八省动力煤用户供耗存数据指标表
 type BaseFromCoalmineCoastalIndex struct {
-	BaseFromCoalmineCoastalIndexID int       `orm:"column(base_from_coalmine_coastal_index_id);pk"`
+	//BaseFromCoalmineCoastalIndexID int       `orm:"column(base_from_coalmine_coastal_index_id);pk"`
+	BaseFromCoalmineCoastalIndexID int       `gorm:"column:base_from_coalmine_coastal_index_id;primaryKey"`
 	IndexName                      string    // 省份/企业名称
 	IndexCode                      string    // 持买单量指标编码
 	DataTime                       string    // 指标时间
@@ -20,24 +21,31 @@ type BaseFromCoalmineCoastalIndex struct {
 	ModifyTime                     time.Time `description:"修改时间"`
 }
 
-//查询指标
+// 查询指标
 func GetBaseFromCoalmineCoastalIndex() (items []*BaseFromCoalmineCoastalIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_coastal_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
-//添加数据
+// 添加数据
 func AddBaseFromCoalCoastalIndex(item *BaseFromCoalmineCoastalIndex) (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.BaseFromCoalmineCoastalIndexID)
 	return
 }
 
 func UpdateBaseFromCoalCoastalIndex(item *BaseFromCoalmineCoastalIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_coalmine_coastal_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
 }

models/base_from_com_trade.go

@@ -157,7 +157,7 @@ func RefreshEdbDataFromComTrade(edbInfoId int, edbCode, startDate string) (err e
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_dl.go

@@ -78,7 +78,7 @@ func AddEdbDataFromDl(edbCode string) (err error) {
 
 	o := orm.NewOrm()
 	dlBaseDataAll, err := GetBaseFromDalianDataAllByIndexCode(edbCode, suffix)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 
@@ -173,7 +173,7 @@ func RefreshEdbDataFromDl(edbInfoId int, edbCode, startDate string) (err error)
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_eia_steo.go

@@ -116,7 +116,7 @@ func RefreshEdbDataFromEiaSteo(edbInfoId int, edbCode, startDate string) (err er
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_fenwei.go

@@ -49,7 +49,7 @@ func (obj BaseFromFenwei) Add(edbCode string) (err error) {
 		pars = append(pars, edbCode)
 	}
 	fenweiBaseDataAll, err := GetBaseFromFenweiDataByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 	var isAdd bool
@@ -113,7 +113,7 @@ func (obj BaseFromFenwei) Refresh(edbInfoId int, edbCode, startDate string) (err
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_fubao.go

@@ -69,7 +69,7 @@ func RefreshEdbDataFromFubao(edbInfoId int, edbCode, startDate string, fubaoData
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_gie.go

@@ -158,7 +158,7 @@ func AddEdbDataFromGie(edbCode string) (err error) {
 
 	o := orm.NewOrm()
 	eicBaseDataAll, err := GetBaseFromEicDataAllByIndexCode(edbCode, suffix)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		fmt.Println("GetBaseFromEicDataAllByIndexCode err:", err)
 		return
 	}
@@ -294,7 +294,7 @@ func RefreshEdbDataFromGie(edbInfoId int, edbCode, startDate string) (err error)
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_google_travel.go

@@ -49,7 +49,7 @@ func AddEdbDataGoogleTravel(edbCode string) (err error) {
 
 	o := orm.NewOrm()
 	dataAll, err := GetBaseFromChangesVisitorsCovidDataAllByIndexCode(edbCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 
@@ -114,7 +114,7 @@ func RefreshEdbDataGoogleTravel(edbInfoId int, edbCode, startDate string) (err e
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_gpr_risk.go

@@ -46,7 +46,7 @@ func (obj BaseFromGprRisk) Add(edbCode string) (err error) {
 		pars = append(pars, edbCode)
 	}
 	gprRiskBaseDataAll, err := GetBaseFromGprRiskDataByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 	var isAdd bool
@@ -119,7 +119,7 @@ func (obj BaseFromGprRisk) Refresh(edbInfoId int, edbCode, startDate string) (er
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_gz.go

@@ -56,7 +56,7 @@ func AddEdbDataFromGz(edbCode string) (err error) {
 	o := orm.NewOrm()
 
 	dataAll, err := GetBaseFromGuangzhouDataByIndexCode(edbCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 
@@ -124,7 +124,7 @@ func RefreshEdbDataFromGz(edbInfoId int, edbCode, startDate string) (err error)
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_hisugar.go

@@ -32,8 +32,7 @@ type BaseFromHisugarData struct {
 	ModifyTime             time.Time // 修改时间
 }
 
-
-//添加数据
+// 添加数据
 func AddBaseFromHisugarIndexMuti(items []*BaseFromHisugarIndex) (err error) {
 	o := orm.NewOrm()
 	_, err = o.InsertMulti(500, items)
@@ -55,7 +54,7 @@ func AddEdbDataFromHisugar(edbCode string) (err error) {
 	o := orm.NewOrm()
 
 	hisugarBaseDataAll, err := GetHisugarDataByCode(edbCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 
@@ -108,7 +107,6 @@ func GetHisugarDataByCode(indexCode string) (items []*BaseFromHisugarData, err e
 	return
 }
 
-
 // RefreshEdbDataFromHisugar 刷新隆众资讯
 func RefreshEdbDataFromHisugar(edbInfoId int, edbCode, startDate string) (err error) {
 	source := utils.DATA_SOURCE_OILCHEM
@@ -144,7 +142,7 @@ func RefreshEdbDataFromHisugar(edbInfoId int, edbCode, startDate string) (err er
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {
@@ -231,7 +229,6 @@ func GetBaseFromHisugarDataByCondition(condition string, pars []interface{}) (li
 	return
 }
 
-
 type HandleHisugarEdbDataReq struct {
 	List []*BaseFromHisugarIndexReq
 }
@@ -251,7 +248,7 @@ func GetBaseFromHisugarData(indexCode, dataTime string) (item *BaseFromHisugarDa
 }
 
 // UpdateBaseFromSci99Data
-func UpdateBaseFromHisugarData(value , indexCode, dataTime string) (err error) {
+func UpdateBaseFromHisugarData(value, indexCode, dataTime string) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE base_from_sci99_data SET value=?,modify_time=NOW() WHERE index_code = ? AND data_time = ? `
 	_, err = o.Raw(sql, value, indexCode, dataTime).Exec()
@@ -273,4 +270,4 @@ type BaseFromHisugarIndexReq struct {
 	IndexNameStr           string    // 指标名称字符串
 	MarketName             string    // 市场名称
 	Value                  string    // 值
-}
+}

models/base_from_icpi.go

@@ -63,7 +63,7 @@ func GetBaseFromIcpiDataDataByCondition(condition string, pars []interface{}) (i
 func AddEdbDataFromIcpi(edbCode string) (err error) {
 	o := orm.NewOrm()
 	dataAll, err := GetBaseFromIcpiDataByIndexCode(edbCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 
@@ -131,7 +131,7 @@ func RefreshEdbDataFromIcpi(edbInfoId int, edbCode, startDate string) (err error
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_lt.go

@@ -65,7 +65,7 @@ func RefreshEdbDataFromLt(edbInfoId int, edbCode, startDate string, ltDataList m
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_lz.go

@@ -88,7 +88,7 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_manual.go

@@ -122,7 +122,7 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	edbDataInsertConfigDateStr := ``
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_mtjh.go

@@ -89,7 +89,7 @@ func AddEdbDataFromMtjh(edbCode string) (err error) {
 	o := orm.NewOrm()
 
 	coalBaseDataAll, err := GetMtjhindexByCode(edbCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 
@@ -168,7 +168,7 @@ func RefreshEdbDataFromMtjh(edbInfoId int, edbCode, startDate string) (err error
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_mysteel.go

@@ -130,7 +130,7 @@ func RefreshEdbDataFromMysteel(edbInfoId int, edbCode, startDate string) (err er
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_mysteel_chemical.go

@@ -116,7 +116,7 @@ func RefreshEdbDataFromMysteelChemical(edbInfoId int, edbCode, startDate string)
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_national_statistics.go

@@ -43,7 +43,7 @@ func AddEdbDataFromNationalStatistics(edbCode string) (err error) {
 	}
 
 	dataList, err := GetBaseFromNationalStatisticsDataByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 	var isAdd bool
@@ -107,7 +107,7 @@ func RefreshEdbDataFromNationalStatistics(edbInfoId int, edbCode, startDate stri
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_oilchem.go

@@ -32,8 +32,7 @@ type BaseFromOilchemData struct {
 	ModifyTime             time.Time // 修改时间
 }
 
-
-//添加数据
+// 添加数据
 func AddBaseFromOilchemIndexMuti(items []*BaseFromOilchemIndex) (err error) {
 	o := orm.NewOrm()
 	_, err = o.InsertMulti(500, items)
@@ -55,7 +54,7 @@ func AddEdbDataFromOilchem(edbCode string) (err error) {
 	o := orm.NewOrm()
 
 	oilchemBaseDataAll, err := GetOilchemDataByCode(edbCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 
@@ -108,7 +107,6 @@ func GetOilchemDataByCode(indexCode string) (items []*BaseFromOilchemData, err e
 	return
 }
 
-
 // RefreshEdbDataFromOilchem 刷新隆众资讯
 func RefreshEdbDataFromOilchem(edbInfoId int, edbCode, startDate string) (err error) {
 	source := utils.DATA_SOURCE_OILCHEM
@@ -144,7 +142,7 @@ func RefreshEdbDataFromOilchem(edbInfoId int, edbCode, startDate string) (err er
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {
@@ -231,7 +229,6 @@ func GetBaseFromOilchemDataByCondition(condition string, pars []interface{}) (li
 	return
 }
 
-
 type BaseFromOilchemIndexReq struct {
 	BaseFromOilchemIndexId int       // 主键ID
 	IndexCode              string    // 指标编码
@@ -242,7 +239,7 @@ type BaseFromOilchemIndexReq struct {
 	Frequency              string    // 频度
 	Describe               string    // 指标描述
 	DataTime               string    // 数据日期
-	Value                  string   // 数据值
+	Value                  string    // 数据值
 	Sort                   int       // 排序
 	CreateTime             time.Time // 创建时间
 	ModifyTime             time.Time // 修改时间
@@ -250,7 +247,6 @@ type BaseFromOilchemIndexReq struct {
 	MarketName             string    // 市场名称
 }
 
-
 type HandleOielchemEdbDataReq struct {
 	List []*BaseFromOilchemIndexReq
 }
@@ -270,9 +266,9 @@ func GetBaseFromOilchemData(indexCode, dataTime string) (item *BaseFromOilchemDa
 }
 
 // UpdateBaseFromSci99Data
-func UpdateBaseFromOilchemData(value , indexCode, dataTime string) (err error) {
+func UpdateBaseFromOilchemData(value, indexCode, dataTime string) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE base_from_sci99_data SET value=?,modify_time=NOW() WHERE index_code = ? AND data_time = ? `
 	_, err = o.Raw(sql, value, indexCode, dataTime).Exec()
 	return
-}
+}

models/base_from_pb.go

@@ -73,7 +73,7 @@ func RefreshEdbDataFromPb(edbInfoId int, edbCode, startDate string, item *EdbDat
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_pb_finance.go

@@ -55,7 +55,7 @@ func RefreshEdbDataFromPbFinance(edbInfoId int, edbCode, startDate string, item
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_sci.go

@@ -67,7 +67,7 @@ func AddEdbDataFromSci(edbCode string) (err error) {
 		pars = append(pars, edbCode)
 	}
 	sciBaseDataAll, err := GetBaseFromSciDataByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 	var isAdd bool
@@ -133,7 +133,7 @@ func RefreshEdbDataFromSci(edbInfoId int, edbCode, startDate string) (err error)
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_sci99.go

@@ -104,7 +104,7 @@ func GetBaseFromSci99DataByIndexCode(indexCode string) (items []*BaseFromSci99Da
 func AddEdbDataFromSci99(edbCode string) (err error) {
 	o := orm.NewOrm()
 	dataAll, err := GetBaseFromSci99DataByIndexCode(edbCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 
@@ -172,7 +172,7 @@ func RefreshEdbDataFromSci99(edbInfoId int, edbCode, startDate string) (err erro
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_sci_hq.go

@@ -38,7 +38,7 @@ func AddEdbDataFromSciHq(edbCode string) (err error) {
 		pars = append(pars, edbCode)
 	}
 	sciBaseDataAll, err := GetBaseFromSciHqDataByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 	var isAdd bool
@@ -101,7 +101,7 @@ func RefreshEdbDataFromSciHq(edbInfoId int, edbCode, startDate string) (err erro
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_sh.go

@@ -79,7 +79,7 @@ func AddEdbDataFromSh(edbCode string) (err error) {
 	o := orm.NewOrm()
 
 	shBaseDataAll, err := GetBaseFromShDataAllByIndexCode(edbCode, suffix)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 
@@ -174,7 +174,7 @@ func RefreshEdbDataFromSh(edbInfoId int, edbCode, startDate string) (err error)
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_shfe.go

@@ -77,7 +77,7 @@ func AddEdbDataFromShfe(edbCode string) (err error) {
 	}
 	o := orm.NewOrm()
 	ineBaseDataAll, err := GetBaseFromShfeDataAllByIndexCode(edbCode, suffix)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 
@@ -172,7 +172,7 @@ func RefreshEdbDataFromShfe(edbInfoId int, edbCode, startDate string) (err error
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_smm.go

@@ -143,7 +143,7 @@ func RefreshEdbDataFromSmm(edbInfoId int, edbCode, startDate string) (err error)
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {
@@ -549,7 +549,7 @@ func RefreshEdbDataFromSmmToEdb(edbInfoId int, edbCode, startDate string, smmDat
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_ths.go

@@ -72,7 +72,7 @@ func RefreshEdbDataFromThs(edbInfoId int, edbCode, startDate string, item EdbDat
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_ths_ds.go

@@ -12,7 +12,7 @@ import (
 var thsds = "thsds"
 
 // 新增同花顺指标数据
-func AddEdbDataFromThsDs(stockCode,edbCode string, item EdbDataFromThs) (err error) {
+func AddEdbDataFromThsDs(stockCode, edbCode string, item EdbDataFromThs) (err error) {
 	o := orm.NewOrm()
 
 	edbCodeList := strings.Split(edbCode, ",")
@@ -35,7 +35,7 @@ func AddEdbDataFromThsDs(stockCode,edbCode string, item EdbDataFromThs) (err err
 				}
 				timestamp := dataTime.UnixNano() / 1e6
 				timeStr := fmt.Sprintf("%d", timestamp)
-				indexCode := thsds+stockCode+code
+				indexCode := thsds + stockCode + code
 				indexCodeMap[indexCode] = indexCode
 				addSql += GetAddSql("0", indexCode, eDate, timeStr, utils.SubFloatToString(sValue, 20))
 				isAdd = true
@@ -80,7 +80,7 @@ func RefreshEdbDataFromThsDs(edbInfoId int, edbCode, startDate string, item EdbD
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_usda_fas.go

@@ -45,7 +45,7 @@ func (obj BaseFromUsdaFas) Add(edbCode string) (err error) {
 		pars = append(pars, edbCode)
 	}
 	UsdaFasBaseDataAll, err := GetBaseFromUsdaFasDataByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 	var isAdd bool
@@ -109,7 +109,7 @@ func (obj BaseFromUsdaFas) Refresh(edbInfoId int, edbCode, startDate string) (er
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_wind.go

@@ -59,7 +59,7 @@ func RefreshEdbDataFromWind(edbInfoId int, edbCode, startDate string, item *EdbD
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_wind_wsd.go

@@ -37,7 +37,7 @@ func AddEdbDataFromWindWsd(stockCode string, item map[string]map[string]interfac
 				err = errors.New("OUTMESSAGE:" + vv.(string))
 				return err
 			}
-			
+
 			vk = strings.ToLower(vk)
 			indexCode = windWsd + stockCode + vk
 
@@ -112,7 +112,7 @@ func RefreshEdbDataFromWindWsd(edbInfoId int, edbCode, startDate string, item ma
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_yongyi.go

@@ -45,7 +45,7 @@ func (obj BaseFromYongyi) Add(edbCode string) (err error) {
 		pars = append(pars, edbCode)
 	}
 	yongyiBaseDataAll, err := GetBaseFromYongyiDataByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 	var isAdd bool
@@ -109,7 +109,7 @@ func (obj BaseFromYongyi) Refresh(edbInfoId int, edbCode, startDate string) (err
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/base_from_zz.go

@@ -79,7 +79,7 @@ func AddEdbDataFromZz(edbCode string) (err error) {
 	o := orm.NewOrm()
 
 	zzBaseDataAll, err := GetBaseFromZhengzhouDataAllByIndexCode(edbCode, suffix)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 
@@ -173,7 +173,7 @@ func RefreshEdbDataFromZz(edbInfoId int, edbCode, startDate string) (err error)
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/edb_data_base.go

@@ -160,7 +160,7 @@ func GetFinalLastByTo(to orm.TxOrmer, edbInfoId, source, subSource int, latestDa
 	dataTableName := GetEdbDataTableName(source, subSource)
 	sql := fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
 	err = to.Raw(sql, edbInfoId, latestDate).QueryRow(&finalLast)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		return
 	}
 	return

models/edb_data_business.go

@@ -212,7 +212,7 @@ func (obj Business) refreshByMongo(edbInfo *EdbInfo, startDate string) (err erro
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfo.EdbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {
@@ -373,7 +373,7 @@ func (obj Business) refreshByMysql(to orm.TxOrmer, edbInfo *EdbInfo, startDate s
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfo.EdbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/edb_data_calculate_nszydbpjjs.go

@@ -126,7 +126,7 @@ func EditCalculateNszydpjjs(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq,
 
 	//判断计算指标是否被更换
 	count, err := GetEdbInfoCalculateCountByCondition(existCondition, existPars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		err = errors.New("判断指标是否改变失败,Err:" + err.Error())
 		return
 	}

models/edb_data_ly.go

@@ -147,7 +147,7 @@ func RefreshEdbDataFromLy(edbInfoId int, edbCode, startDate string) (err error)
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/edb_data_rzd.go

@@ -146,7 +146,7 @@ func RefreshEdbDataFromRzd(edbInfoId int, edbCode, startDate string) (err error)
 	var isFindConfigDateRealData bool //是否找到配置日期的实际数据的值
 	{
 		edbDataInsertConfig, err = GetEdbDataInsertConfigByEdbId(edbInfoId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
 		if edbDataInsertConfig != nil {

models/edb_info.go

@@ -3,6 +3,7 @@ package models
 import (
 	"encoding/json"
 	"errors"
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/models/mgo"
 	"eta/eta_index_lib/utils"
 	"fmt"
@@ -17,7 +18,8 @@ import (
 )
 
 type EdbInfo struct {
-	EdbInfoId        int    `orm:"column(edb_info_id);pk"`
+	//EdbInfoId        int    `orm:"column(edb_info_id);pk"`
+	EdbInfoId        int    `gorm:"column:edb_info_id;primaryKey"`
 	EdbInfoType      int    `description:"指标类型，0：普通指标，1：预测指标"`
 	SourceName       string `description:"来源名称"`
 	Source           int    `description:"来源id"`
@@ -70,21 +72,28 @@ type EdbInfo struct {
 }
 
 func (e *EdbInfo) Add() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(e)
+	//o := orm.NewOrm()
+	//_, err = o.Insert(e)
+	err = global.DEFAULT_DB.Create(&e).Error
 	return
 }
 
 // AddEdbInfo 添加指标
 func AddEdbInfo(item *EdbInfo) (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.EdbInfoId)
 	return
 }
 
 // EdbInfoList 指标数据列表
 type EdbInfoList struct {
-	EdbInfoId       int                    `orm:"column(edb_info_id);pk"`
+	EdbInfoId int `gorm:"column:edb_info_id;primaryKey"`
+	//EdbInfoId       int                    `orm:"column(edb_info_id);pk"`
 	EdbInfoType     int                    `description:"指标类型，0：普通指标，1：预测指标"`
 	SourceName      string                 `description:"来源名称"`
 	Source          int                    `description:"来源id"`
@@ -137,33 +146,37 @@ type EdbClassifyItemsButton struct {
 
 // GetEdbInfoByName 根据指标名称获取所有的指标数据列表
 func GetEdbInfoByName(edbName string) (items []*EdbInfoList, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE edb_name=? `
-	_, err = o.Raw(sql, edbName).QueryRows(&items)
+	//_, err = o.Raw(sql, edbName).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, edbName).Find(&items).Error
 	return
 }
 
 // ModifyEdbInfoNameSource 根据来源修改指标名称
 func ModifyEdbInfoNameSource(edbNameSource string, edbInfoId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE  edb_info SET edb_name_source=? WHERE edb_info_id = ? `
-	_, err = o.Raw(sql, edbNameSource, edbInfoId).Exec()
+	//_, err = o.Raw(sql, edbNameSource, edbInfoId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, edbNameSource, edbInfoId).Error
 	return
 }
 
 // GetEdbInfoById 根据指标id获取指标信息
 func GetEdbInfoById(edbInfoId int) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	//err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, edbInfoId).First(&item).Error
 	return
 }
 
 // GetEdbInfoByUniqueCode 根据指标唯一编码获取指标信息
 func GetEdbInfoByUniqueCode(uniqueCode string) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE unique_code=? `
-	err = o.Raw(sql, uniqueCode).QueryRow(&item)
+	//err = o.Raw(sql, uniqueCode).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, uniqueCode).First(&item).Error
 	return
 }
 
@@ -173,9 +186,11 @@ func GetEdbInfoByIdList(edbInfoIdList []int) (items []*EdbInfo, err error) {
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM edb_info WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, edbInfoIdList).QueryRows(&items)
+	//o := orm.NewOrm()
+	//sql := ` SELECT * FROM edb_info WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `) `
+	//_, err = o.Raw(sql, edbInfoIdList).QueryRows(&items)
+	sql := ` SELECT * FROM edb_info WHERE edb_info_id in ? `
+	err = global.DEFAULT_DB.Raw(sql, edbInfoIdList).Find(&items).Error
 	return
 }
 
@@ -184,16 +199,19 @@ func GetEdbInfoListByIds(edbInfoIdList []int) (items []*EdbInfoList, err error)
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM edb_info WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, edbInfoIdList).QueryRows(&items)
+	//o := orm.NewOrm()
+	//sql := ` SELECT * FROM edb_info WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `) `
+	//_, err = o.Raw(sql, edbInfoIdList).QueryRows(&items)
+	sql := `  SELECT * FROM edb_info WHERE edb_info_id in ? `
+	err = global.DEFAULT_DB.Raw(sql, edbInfoIdList).Find(&items).Error
 	return
 }
 
 // Update 更新EdbInfo信息
 func (edbInfo *EdbInfo) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(edbInfo, cols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(edbInfo, cols...)
+	err = global.DEFAULT_DB.Model(&edbInfo).Select(cols).Updates(&edbInfo).Error
 	return
 }
 
@@ -247,8 +265,8 @@ func GetEdbDataListAllByMysql(source, subSource int, findEdbDataListAllCond Find
 	if findEdbDataListAllCond.EdbInfoId <= 0 {
 		return
 	}
-	to := orm.NewOrm()
-
+	//to := orm.NewOrm()
+	to := global.DEFAULT_DB.Begin()
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -278,7 +296,8 @@ func GetEdbDataListAllByMysql(source, subSource int, findEdbDataListAllCond Find
 	} else {
 		sql += ` ORDER BY data_time DESC `
 	}
-	_, err = to.Raw(sql, pars).QueryRows(&item)
+	//_, err = to.Raw(sql, pars).QueryRows(&item)
+	err = to.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -346,6 +365,7 @@ func GetEdbDataListAllByMysqlTo(to *gorm.DB, source, subSource int, findEdbDataL
 		sql += ` ORDER BY data_time DESC `
 	}
 	//_, err = to.Raw(sql, pars).QueryRows(&item)
+	//err = to.Raw(sql, pars...).Find(&item).Error
 	err = to.Raw(sql, pars...).Find(&item).Error
 	return
 }
@@ -417,17 +437,18 @@ type EdbInfoMaxAndMinInfo struct {
 
 // GetEdbInfoMaxAndMinInfo 获取指标的最新数据记录信息
 func GetEdbInfoMaxAndMinInfo(source, subSource int, edbCode string) (item *EdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	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 %s WHERE edb_code=? `
 	sql = fmt.Sprintf(sql, tableName)
-	err = o.Raw(sql, edbCode).QueryRow(&item)
-
+	//err = o.Raw(sql, edbCode).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, edbCode).First(&item).Error
 	var latest_value float64
 	sql = ` SELECT value AS latest_value FROM %s WHERE edb_code=? ORDER BY data_time DESC LIMIT 1 `
 	sql = fmt.Sprintf(sql, tableName)
-	err = o.Raw(sql, edbCode).QueryRow(&latest_value)
+	//err = o.Raw(sql, edbCode).QueryRow(&latest_value)
+	err = global.DEFAULT_DB.Raw(sql, edbCode).Scan(&latest_value).Error
 	item.LatestValue = latest_value
 	return
 }
@@ -438,36 +459,40 @@ type EdbIndoDataUpdateTime struct {
 
 // GetEdbDataUpdateTimeByModify 获取指标的刷新时间获取最早的一条记录
 func GetEdbDataUpdateTimeByModify(source, subSource int, edbCode string, dataUpdateTime string) (item *EdbIndoDataUpdateTime, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT MIN(data_time) AS min_date FROM %s WHERE edb_code=? and modify_time>=?`
 	sql = fmt.Sprintf(sql, tableName)
-	err = o.Raw(sql, edbCode, dataUpdateTime).QueryRow(&item)
+	//err = o.Raw(sql, edbCode, dataUpdateTime).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, edbCode, dataUpdateTime).First(&item).Error
 	return
 }
 
 // ModifyEdbInfoMaxAndMinInfo 修改指标的最新数据信息
 func ModifyEdbInfoMaxAndMinInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE edb_info SET start_date=?,end_date=?,min_value=?,max_value=?,is_update=2,latest_date=?,latest_value=?, end_value = ?,modify_time=NOW() WHERE edb_info_id=? `
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, item.LatestValue, edbInfoId).Exec()
+	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, item.LatestValue, edbInfoId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.MaxDate, item.LatestValue, item.LatestValue, edbInfoId).Error
 	return
 }
 
 // ModifyEdbTimeAndLastInfo 修改指标的最新数据信息(除上下限)
 func ModifyEdbTimeAndLastInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE edb_info SET start_date = ?, end_date = ?, is_update = 2,latest_date = ?, latest_value = ?, end_value = ?, modify_time = NOW() WHERE edb_info_id = ?`
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.MaxDate, item.LatestValue, item.LatestValue, edbInfoId).Exec()
+	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.MaxDate, item.LatestValue, item.LatestValue, edbInfoId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, item.MinDate, item.MaxDate, item.MaxDate, item.LatestValue, item.LatestValue, edbInfoId).Error
 	return
 }
 
 // ModifyEdbDataUpdateTime 修改指标刷新，本次数据刷新的最早日期
 func ModifyEdbDataUpdateTime(edbInfoId int, dataUpdateTime, erDataUpdateDate string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE edb_info SET data_update_time = ?, er_data_update_date = ?, modify_time = NOW() WHERE edb_info_id = ?`
-	_, err = o.Raw(sql, dataUpdateTime, erDataUpdateDate, edbInfoId).Exec()
+	//_, err = o.Raw(sql, dataUpdateTime, erDataUpdateDate, edbInfoId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, dataUpdateTime, erDataUpdateDate, edbInfoId).Error
 	return
 }
 
@@ -525,18 +550,19 @@ func GetLteZeroEdbDataCountByMongo(source, subSource, edbInfoId int) (count int,
 // @return count int
 // @return err error
 func GetLteZeroEdbDataCountByMysql(source, subSource, edbInfoId int) (count int, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT COUNT(1) AS count FROM %s WHERE 1=1 AND edb_info_id =?  AND value <=0 `
 	sql = fmt.Sprintf(sql, tableName)
-	err = o.Raw(sql, edbInfoId).QueryRow(&count)
+	//err = o.Raw(sql, edbInfoId).QueryRow(&count)
+	err = global.DEFAULT_DB.Raw(sql, edbInfoId).Scan(&count).Error
 	return
 }
 
 // GetLastEdbData 获取最近的一条指标数据
 func GetLastEdbData(condition string, pars []interface{}, source, subSource int) (item *EdbInfoSearchData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -546,16 +572,17 @@ func GetLastEdbData(condition string, pars []interface{}, source, subSource int)
 		sql += condition
 	}
 	sql += ` ORDER BY data_time DESC `
-	err = o.Raw(sql, pars).QueryRow(&item)
+	//err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, pars...).First(&item).Error
 	return
 }
 
 // GetEdbInfoByEdbCode 根据指标code获取指标信息
 func GetEdbInfoByEdbCode(source int, edbCode string) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE source=? AND edb_code=? `
-	err = o.Raw(sql, source, edbCode).QueryRow(&item)
-
+	//err = o.Raw(sql, source, edbCode).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, source, edbCode).First(&item).Error
 	if errors.Is(err, orm.ErrNoRows) {
 		err = nil
 	}
@@ -565,33 +592,36 @@ func GetEdbInfoByEdbCode(source int, edbCode string) (item *EdbInfo, err error)
 
 // GetEdbInfoOnlyByEdbCode 仅根据指标code获取指标信息
 func GetEdbInfoOnlyByEdbCode(edbCode string) (item *EdbInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&item)
+	//err = o.Raw(sql, edbCode).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, edbCode).First(&item).Error
 	return
 }
 
 // GetEdbInfoCalculateListByCondition 获取指标关系列表
 func GetEdbInfoCalculateListByCondition(condition string, pars []interface{}) (items []*EdbInfoCalculateMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	sql := ` SELECT * FROM edb_info_calculate_mapping WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
 // GetEdbInfoCalculateCountByCondition 获取关联指标数量
 func GetEdbInfoCalculateCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	sql := ` SELECT COUNT(1) AS count FROM edb_info_calculate_mapping WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	//err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -604,7 +634,7 @@ type EdbInfoSearchDataV1 struct {
 
 // 优化版本-处理数据精度问题
 func GetEdbDataListAllV1(condition string, pars []interface{}, source, subSource, order int) (item []*EdbInfoSearchDataV1, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -618,12 +648,13 @@ func GetEdbDataListAllV1(condition string, pars []interface{}, source, subSource
 	} else {
 		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
 }
 
 // GetEdbDataListAllV1ByTo 通过事务链接获取数据列表
-func GetEdbDataListAllV1ByTo(to orm.TxOrmer, condition string, pars []interface{}, source, subSource, order int) (item []*EdbInfoSearchDataV1, err error) {
+func GetEdbDataListAllV1ByTo(to *gorm.DB, condition string, pars []interface{}, source, subSource, order int) (item []*EdbInfoSearchDataV1, err error) {
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` SELECT * FROM %s WHERE 1=1 `
@@ -637,13 +668,14 @@ func GetEdbDataListAllV1ByTo(to orm.TxOrmer, condition string, pars []interface{
 	} else {
 		sql += ` ORDER BY data_time DESC `
 	}
-	_, err = to.Raw(sql, pars).QueryRows(&item)
+	//_, err = to.Raw(sql, pars).QueryRows(&item)
+	err = to.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // GetEdbInfoByCondition 获取指标列表
 func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (item []*EdbInfo, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -653,7 +685,8 @@ func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (ite
 	} else {
 		sql += ` ORDER BY edb_info_id ASC `
 	}
-	_, 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
 }
 
@@ -707,7 +740,7 @@ func UnifiedModifyEdbInfoMaxAndMinInfoDataUpdate(edbInfo *EdbInfo, dataUpdateTim
 	// 获取本次刷新，指标数据更新的最早日期
 	erDataUpdateTime, tErr := GetEdbDataUpdateTimeByModify(edbInfo.Source, edbInfo.SubSource, edbInfo.EdbCode, dataUpdateTime)
 	if tErr != nil {
-		if tErr.Error() != utils.ErrNoRow() { //本次刷新指标数据无变化
+		if !utils.IsErrNoRow(tErr) { //本次刷新指标数据无变化
 			errMsg = "刷新指标失败！"
 			err = errors.New("查询指标刷新，数据更新的最早日期失败，err:" + tErr.Error())
 			return
@@ -1186,7 +1219,7 @@ func getPredictEdbDayList(startDate, endDate time.Time, frequency, dataDateType
 func GetPredictDataListByPredictEdbInfo(edbInfo *EdbInfo, order int, startDate string) (dataList []*EdbInfoSearchData, sourceEdbInfoItem *EdbInfo, err error, errMsg string) {
 	// 查找该预测指标配置
 	predictEdbConfList, err := GetPredictEdbConfAndDataListById(edbInfo.EdbInfoId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取预测指标配置信息失败"
 		return
 	}
@@ -1313,15 +1346,16 @@ func GetPredictEdbDataListAllByStartDate(edbInfo *EdbInfo, order int, startDate
 
 // ModifyPredictEdbInfoMaxAndMinInfo 修改预测指标的最新数据信息
 func ModifyPredictEdbInfoMaxAndMinInfo(edbInfoId int, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE edb_info SET start_date=?,end_date=?,min_value=?,max_value=?,is_update=2,latest_date=?,latest_value=?,end_value=?,modify_time=NOW() WHERE edb_info_id=? `
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.LatestDate, item.LatestValue, item.EndValue, edbInfoId).Exec()
+	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.LatestDate, item.LatestValue, item.EndValue, edbInfoId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, item.MinDate, item.MaxDate, item.MinValue, item.MaxValue, item.LatestDate, item.LatestValue, item.EndValue, edbInfoId).Error
 	return
 }
 
 // ModifyCalculateEdbInfo 修改计算指标信息
 func ModifyCalculateEdbInfo(edbName, frequency, unit, calculateFormula string, classifyId, edbInfoId int) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE  edb_info
 			SET
 			  edb_name =?,
@@ -1332,24 +1366,27 @@ func ModifyCalculateEdbInfo(edbName, frequency, unit, calculateFormula string, c
 			  calculate_formula=?,
 			  modify_time = NOW()
 			WHERE edb_info_id = ?`
-	_, err = o.Raw(sql, edbName, edbName, frequency, unit, classifyId, calculateFormula, edbInfoId).Exec()
+	//_, err = o.Raw(sql, edbName, edbName, frequency, unit, classifyId, calculateFormula, edbInfoId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, edbName, edbName, frequency, unit, classifyId, calculateFormula, edbInfoId).Error
 	return
 }
 
 func GetEdbInfoItemByCondition(condition string, pars []interface{}) (item *EdbInfoList, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&item)
+	//err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 func GetEdbInfoItemListByCondition() (items []*EdbInfoList, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE 1=1 `
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
@@ -1414,8 +1451,9 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
 
 	if len(items) > 0 {
 		sql := ` UPDATE edb_info SET classify_id=?,modify_time=NOW() WHERE edb_code=? `
-		o := orm.NewOrm()
-		_, err = o.Raw(sql, req.ClassifyId, req.EdbCode).Exec()
+		//o := orm.NewOrm()
+		//_, err = o.Raw(sql, req.ClassifyId, req.EdbCode).Exec()
+		err = global.DEFAULT_DB.Exec(sql, req.ClassifyId, req.EdbCode).Error
 		if err != nil {
 			err = errors.New("更新指标分类信息失败,Err:" + err.Error())
 			return
@@ -1533,10 +1571,11 @@ func EdbInfoAdd(req *AddEdbInfoParams, serverUrl string, sysUserId int, sysUserR
 }
 
 func ModifyEdbInfoBaseTimeById(edbInfoId int, cTime time.Time) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	// 更新修改时间
 	sql := ` UPDATE edb_info SET base_modify_time = ? WHERE edb_info_id = ? `
-	_, err = o.Raw(sql, cTime, edbInfoId).Exec()
+	//_, err = o.Raw(sql, cTime, edbInfoId).Exec()
+	err = global.DEFAULT_DB.Exec(sql, cTime, edbInfoId).Error
 	return
 }
 
@@ -1563,9 +1602,10 @@ type ResetEdbClassifyReq struct {
 
 // GetEdbInfoMaxSortByClassifyId 获取分类下指标的最大的排序数
 func GetEdbInfoMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT Max(sort) AS sort FROM edb_info WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	//err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = global.DEFAULT_DB.Raw(sql, classifyId).Scan(&sort).Error
 	return
 }
 
@@ -1620,10 +1660,10 @@ func GetEdbInfoByEdbCodeList(source int, edbCodeList []string) (items []*EdbInfo
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM edb_info WHERE source=? AND edb_code IN (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, source, edbCodeList).QueryRows(&items)
-
+	//_, err = o.Raw(sql, source, edbCodeList).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql, source, edbCodeList).Find(&items).Error
 	return
 }
 
@@ -1652,9 +1692,10 @@ func GetEdbInfoNoUpdateTotalByIdList(edbInfoIdList []int) (total int, err error)
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT count(*) FROM edb_info WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `)  and no_update=1`
-	err = o.Raw(sql, edbInfoIdList).QueryRow(&total)
+	//err = o.Raw(sql, edbInfoIdList).QueryRow(&total)
+	err = global.DEFAULT_DB.Raw(sql, edbInfoIdList).Scan(&total).Error
 	return
 }
 
@@ -1707,11 +1748,12 @@ func (m SortEdbDataList) Swap(i, j int) {
 }
 
 func ModifyEdbInfoDataStatus(edbInfoId int64, source, subSource int, edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ``
 	tableName := GetEdbDataTableName(source, subSource)
 	sql = ` UPDATE %s SET edb_info_id=?,modify_time=NOW() WHERE edb_code=? `
 	sql = fmt.Sprintf(sql, tableName)
-	_, err = o.Raw(sql, edbInfoId, edbCode).Exec()
+	//_, err = o.Raw(sql, edbInfoId, edbCode).Exec()
+	err = global.DEFAULT_DB.Exec(sql, edbInfoId, edbCode).Error
 	return
 }

models/predict_edb_data_base.go

@@ -322,7 +322,7 @@ func (obj PredictStandardBase) Refresh(params RefreshParams) (latestDateStr stri
 	}
 	// 查找该预测指标配置
 	predictEdbConfList, err := GetPredictEdbConfAndDataListById(edbInfo.EdbInfoId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
+	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取预测指标配置信息失败"
 		return
 	}
@@ -468,7 +468,7 @@ func (obj PredictStandardBase) refresh(to orm.TxOrmer, edbInfo *EdbInfo, predict
 	//确定实际数据的最终值
 	{
 		finalLast, tmpErr := GetFinalLastByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource, fromEdbInfo.LatestDate)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			return
 		}
 		if tmpErr == nil {

models/predict_edb_data_calculate_cjjx.go

@@ -374,7 +374,7 @@ func refreshAllPredictCalculateCjjx(to orm.TxOrmer, edbInfoId, source, subSource
 	sql = ` SELECT data_time , value FROM edb_data_predict_calculate_cjjx WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
 	tmpErr := to.Raw(sql, edbInfoId, latestDateStr).QueryRow(&finalLast)
 	if tmpErr != nil {
-		if tmpErr.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(tmpErr) {
 			err = tmpErr
 		} else {
 			latestDateStr = "0000-00-00"

models/predict_edb_data_calculate_ljz.go

@@ -615,7 +615,7 @@ func (obj PredictLjz) refresh(to orm.TxOrmer, edbInfoId, source, subSource int,
 		var finalLast EdbInfoSearchData
 		sql = fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
 		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).QueryRow(&finalLast)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		} else {
 			latestDateStr = finalLast.DataTime

models/predict_edb_data_calculate_ljznczj.go

@@ -463,7 +463,7 @@ func (obj PredictLjzNczj) refresh(to orm.TxOrmer, edbInfoId, source, subSource i
 		var finalLast EdbInfoSearchData
 		sql = fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
 		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).QueryRow(&finalLast)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		} else {
 			latestDateStr = finalLast.DataTime

models/predict_edb_data_calculate_ljztbpj.go

@@ -592,7 +592,7 @@ func refreshAllPredictCalculateLjztbpj(to orm.TxOrmer, edbInfo, firstEdbInfo, se
 	sql = ` SELECT data_time , value FROM edb_data_predict_calculate_ljztbpj WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
 	tmpErr := to.Raw(sql, edbInfo.EdbInfoId, latestDateStr).QueryRow(&finalLast)
 	if tmpErr != nil {
-		if tmpErr.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(tmpErr) {
 			err = tmpErr
 		}
 		return

models/predict_edb_data_calculate_ljzzj.go

@@ -410,7 +410,7 @@ func (obj PredictLjzzj) refresh(to orm.TxOrmer, edbInfoId, source, subSource int
 		var finalLast EdbInfoSearchData
 		sql = fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
 		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).QueryRow(&finalLast)
-		if err != nil && err.Error() != utils.ErrNoRow() {
+		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		} else {
 			latestDateStr = finalLast.DataTime

models/predict_edb_data_calculate_ljzzy.go

@@ -368,7 +368,7 @@ func refreshAllPredictCalculateLjzzy(to orm.TxOrmer, edbInfoId, source, subSourc
 	sql = ` SELECT data_time , value FROM edb_data_predict_calculate_ljzzy WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
 	tmpErr := to.Raw(sql, edbInfoId, latestDateStr).QueryRow(&finalLast)
 	if tmpErr != nil {
-		if tmpErr.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(tmpErr) {
 			err = tmpErr
 		}
 		return

models/predict_edb_data_calculate_nhcc.go

@@ -567,7 +567,7 @@ func refreshAllPredictCalculateNhcc(to orm.TxOrmer, edbInfo, firstEdbInfo, secon
 	sql = ` SELECT data_time , value FROM edb_data_predict_calculate_nhcc WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `
 	tmpErr := to.Raw(sql, edbInfo.EdbInfoId, latestDateStr).QueryRow(&finalLast)
 	if tmpErr != nil {
-		if tmpErr.Error() != utils.ErrNoRow() {
+		if !utils.IsErrNoRow(tmpErr) {
 			err = tmpErr
 		}
 		return

models/predict_edb_data_calculate_percentile.go

@@ -364,7 +364,7 @@ func (obj PredictPercentile) refresh(to orm.TxOrmer, edbInfo, fromEdbInfo *EdbIn
 	//确定实际数据的最终值
 	{
 		finalLast, tmpErr := GetFinalLastByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource, fromEdbInfo.LatestDate)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			return
 		}
 		if tmpErr == nil {

models/predict_edb_data_calculate_qjjs.go

@@ -317,7 +317,7 @@ func (obj PredictCalculateRangeAnalysis) refresh(to orm.TxOrmer, edbInfoId, sour
 	//确定实际数据的最终值
 	{
 		finalLast, tmpErr := GetFinalLastByTo(to, edbInfoId, obj.GetSource(), utils.DATA_SUB_SOURCE_EDB, fromEdbInfo.LatestDate)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			return
 		}
 		if tmpErr == nil {

models/predict_edb_data_calculate_standard_deviation.go

@@ -375,7 +375,7 @@ func (obj PredictStandardDeviation) refresh(to orm.TxOrmer, edbInfo, fromEdbInfo
 	//确定实际数据的最终值
 	{
 		finalLast, tmpErr := GetFinalLastByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource, fromEdbInfo.LatestDate)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			return
 		}
 		if tmpErr == nil {

models/predict_edb_data_calculate_tbz.go

@@ -387,7 +387,7 @@ func (obj PredictTb) refresh(to orm.TxOrmer, edbInfo, fromEdbInfo *EdbInfo, edbC
 	//确定实际数据的最终值
 	{
 		finalLast, tmpErr := GetFinalLastByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource, fromEdbInfo.LatestDate)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			return
 		}
 		if tmpErr == nil {

models/predict_edb_data_calculate_zsxy.go

@@ -357,7 +357,7 @@ func (obj PredictExponentialSmoothing) refresh(to orm.TxOrmer, edbInfo, fromEdbI
 	//确定实际数据的最终值
 	{
 		finalLast, tmpErr := GetFinalLastByTo(to, edbInfoId, edbInfo.Source, edbInfo.SubSource, fromEdbInfo.LatestDate)
-		if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		if tmpErr != nil && !utils.IsErrNoRow(tmpErr) {
 			return
 		}
 		if tmpErr == nil {

services/base_from_gpr_risk.go

@@ -292,7 +292,7 @@ func handleGprRiskIndex(req *models.HandleGprRiskExcelData, terminalCode string,
 		var edbInfo *models.EdbInfo
 		edbInfo, err = models.GetEdbInfoByEdbCode(baseObj.GetSource(), indexCode)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				errMsgList = append(errMsgList, fmt.Sprint("刷新ETA指标异常，指标编码：", indexCode, err.Error()))
 				return
 			} else {

services/base_from_usda_fas.go

@@ -297,7 +297,7 @@ func handleUsdaFasIndex(req *models.HandleUsdaFasExcelData, terminalCode string,
 		var edbInfo *models.EdbInfo
 		edbInfo, err = models.GetEdbInfoByEdbCode(baseObj.GetSource(), indexCode)
 		if err != nil {
-			if err.Error() != utils.ErrNoRow() {
+			if !utils.IsErrNoRow(err) {
 				errMsgList = append(errMsgList, fmt.Sprint("刷新ETA指标异常，指标编码：", indexCode, err.Error()))
 				return
 			} else {

utils/common.go

@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/shopspring/decimal"
+	"gorm.io/gorm"
 	"image"
 	"image/png"
 	"io"
@@ -1767,3 +1768,9 @@ func ReverseTimeSlice(s []time.Time) []time.Time {
 	}
 	return s
 }
+func IsErrNoRow(err error) bool {
+	if err == nil {
+		return false
+	}
+	return errors.Is(err, gorm.ErrRecordNotFound)
+}