兼容达梦数据库

models/base_from_coal_firm.go

@@ -1,43 +1,51 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_index_lib/global"
 	"time"
 )
 
 // BaseFromCoalmineFirmIndex 煤矿产量周度公司数据表
 type BaseFromCoalmineFirmIndex struct {
-	BaseFromCoalmineFirmIndexID int       `orm:"column(base_from_coalmine_firm_index_id);pk"`
-	IndexName                   string    // 省份/企业名称
-	IndexCode                   string    // 持买单量指标编码
-	DataTime                    string    // 指标时间
-	DealValue                   string    // 数据量
-	GroupName                   string    // 集团名
-	Source                      string    // 来源
-	Unit                        string    // 来源
-	Frequency                   string    `description:"频率"`
-	CreateTime                  time.Time `description:"插入时间"`
-	ModifyTime                  time.Time `description:"修改时间"`
+	BaseFromCoalmineFirmIndexID int `gorm:"column:base_from_coalmine_firm_index_id;primaryKey"`
+	//BaseFromCoalmineFirmIndexID int       `orm:"column(base_from_coalmine_firm_index_id);pk"`
+	IndexName  string    // 省份/企业名称
+	IndexCode  string    // 持买单量指标编码
+	DataTime   string    // 指标时间
+	DealValue  string    // 数据量
+	GroupName  string    // 集团名
+	Source     string    // 来源
+	Unit       string    // 来源
+	Frequency  string    `description:"频率"`
+	CreateTime time.Time `description:"插入时间"`
+	ModifyTime time.Time `description:"修改时间"`
 }
 
 // 查询指标
 func GetBaseFromCoalmineFirmIndex() (items []*BaseFromCoalmineFirmIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_firm_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
 // 添加数据
 func AddBaseFromCoalFirmIndex(item *BaseFromCoalmineFirmIndex) (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.BaseFromCoalmineFirmIndexID)
 	return
 }
 
 func UpdateBaseFromCoalFirmIndex(item *BaseFromCoalmineFirmIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_coalmine_firm_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_coal_inland.go

@@ -1,43 +1,51 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_index_lib/global"
 	"time"
 )
 
 // BaseFromCoalmineInlandIndex 沿海八省动力煤用户供耗存数据指标表
 type BaseFromCoalmineInlandIndex struct {
-	BaseFromCoalmineInlandIndexID int       `orm:"column(base_from_coalmine_inland_index_id);pk"`
-	IndexName                     string    // 省份/企业名称
-	IndexCode                     string    // 持买单量指标编码
-	DataTime                      string    // 指标时间
-	DealValue                     string    // 数据量
-	GroupName                     string    // 地区
-	Source                        string    // 来源
-	Unit                          string    // 来源
-	Frequency                     string    `description:"频率"`
-	CreateTime                    time.Time `description:"插入时间"`
-	ModifyTime                    time.Time `description:"修改时间"`
+	BaseFromCoalmineInlandIndexID int `gorm:"column:base_from_coalmine_inland_index_id;primaryKey"`
+	//BaseFromCoalmineInlandIndexID int       `orm:"column(base_from_coalmine_inland_index_id);pk"`
+	IndexName  string    // 省份/企业名称
+	IndexCode  string    // 持买单量指标编码
+	DataTime   string    // 指标时间
+	DealValue  string    // 数据量
+	GroupName  string    // 地区
+	Source     string    // 来源
+	Unit       string    // 来源
+	Frequency  string    `description:"频率"`
+	CreateTime time.Time `description:"插入时间"`
+	ModifyTime time.Time `description:"修改时间"`
 }
 
-//查询指标
+// 查询指标
 func GetBaseFromCoalmineInlandIndex() (items []*BaseFromCoalmineInlandIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_inland_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
-//添加数据
+// 添加数据
 func AddBaseFromCoalInlandIndex(item *BaseFromCoalmineInlandIndex) (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.BaseFromCoalmineInlandIndexID)
 	return
 }
 
 func UpdateBaseFromCoalInlandIndex(item *BaseFromCoalmineInlandIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_coalmine_inland_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_coalmine.go

@@ -1,112 +1,132 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_index_lib/global"
 	"time"
 )
 
 type BaseFromCoalmineMapping struct {
-	BaseFromCoalmineMappingId int       `orm:"column(base_from_coalmine_mapping_id);pk"`
-	IndexName                 string    `description:"持买单量指标名称"`
-	IndexCode                 string    `description:"持买单量指标编码"`
-	CreateTime                time.Time `description:"时间"`
+	BaseFromCoalmineMappingId int `gorm:"column:base_from_coalmine_mapping_id;primaryKey"`
+	//BaseFromCoalmineMappingId int       `orm:"column(base_from_coalmine_mapping_id);pk"`
+	IndexName  string    `description:"持买单量指标名称"`
+	IndexCode  string    `description:"持买单量指标编码"`
+	CreateTime time.Time `description:"时间"`
 }
 
 type BaseFromCoalmineJsmIndex struct {
-	BaseFromCoalmineJsmIndexId int       `orm:"column(base_from_coalmine_jsm_index_id);pk"`
-	IndexName                  string    `description:"持买单量指标名称"`
-	IndexCode                  string    `description:"持买单量指标编码"`
-	Exchange                   string    `description:"样本统计类别"`
-	DealValue                  string    `description:"成交量"`
-	DataTime                   string    `description:"数据日期"`
-	Source                     string    `description:"来源"`
-	Province                   string    `description:"省份"`
-	Description                string    `description:"描述"`
-	Unit                       string    `description:"单位"`
-	Frequency                  string    `description:"频率"`
-	CreateTime                 time.Time `description:"插入时间"`
-	ModifyTime                 time.Time `description:"修改时间"`
+	BaseFromCoalmineJsmIndexId int `gorm:"column:base_from_coalmine_jsm_index_id;primaryKey"`
+	//BaseFromCoalmineJsmIndexId int       `orm:"column(base_from_coalmine_jsm_index_id);pk"`
+	IndexName   string    `description:"持买单量指标名称"`
+	IndexCode   string    `description:"持买单量指标编码"`
+	Exchange    string    `description:"样本统计类别"`
+	DealValue   string    `description:"成交量"`
+	DataTime    string    `description:"数据日期"`
+	Source      string    `description:"来源"`
+	Province    string    `description:"省份"`
+	Description string    `description:"描述"`
+	Unit        string    `description:"单位"`
+	Frequency   string    `description:"频率"`
+	CreateTime  time.Time `description:"插入时间"`
+	ModifyTime  time.Time `description:"修改时间"`
 }
 
 type BaseFromCoalmineCompanyIndex struct {
-	BaseFromCoalmineCompanyIndexId int       `orm:"column(base_from_coalmine_company_index_id);pk"`
-	IndexName                      string    `description:"持买单量指标名称"`
-	IndexCode                      string    `description:"持买单量指标编码"`
-	DealValue                      string    `description:"成交量"`
-	DataTime                       string    `description:"数据日期"`
-	Source                         string    `description:"来源"`
-	Province                       string    `description:"省份"`
-	City                           string    `description:"城市"`
-	GroupName                      string    `description:"集团名称"`
-	Unit                           string    `description:"单位"`
-	Frequency                      string    `description:"频率"`
-	CreateTime                     time.Time `description:"插入时间"`
-	ModifyTime                     time.Time `description:"修改时间"`
+	BaseFromCoalmineCompanyIndexId int `gorm:"column:base_from_coalmine_company_index_id;primaryKey"`
+	//BaseFromCoalmineCompanyIndexId int       `orm:"column(base_from_coalmine_company_index_id);pk"`
+	IndexName  string    `description:"持买单量指标名称"`
+	IndexCode  string    `description:"持买单量指标编码"`
+	DealValue  string    `description:"成交量"`
+	DataTime   string    `description:"数据日期"`
+	Source     string    `description:"来源"`
+	Province   string    `description:"省份"`
+	City       string    `description:"城市"`
+	GroupName  string    `description:"集团名称"`
+	Unit       string    `description:"单位"`
+	Frequency  string    `description:"频率"`
+	CreateTime time.Time `description:"插入时间"`
+	ModifyTime time.Time `description:"修改时间"`
 }
 
 // 添加指标
 func AddBaseFromCoalmineMapping(item *BaseFromCoalmineMapping) (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
 	return
 }
 
 // 查询指标
 func GetBaseFromCoalmineMapping() (items []*BaseFromCoalmineMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_mapping`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
 // 查询数据
 func GetBaseFromCoalmineIndex() (items []*BaseFromCoalmineJsmIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_jsm_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
+	//_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 func UpdateBaseFromCoalmineIndex(item *BaseFromCoalmineJsmIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_coalmine_jsm_index SET deal_value=?  WHERE index_name=?  AND  data_time = ?`
-	_, err = o.Raw(sql, item.DealValue, item.IndexName, item.DataTime).Exec()
+	//_, err = o.Raw(sql, item.DealValue, item.IndexName, item.DataTime).Exec()
+	err = global.DEFAULT_DB.Exec(sql, item.DealValue, item.IndexName, item.DataTime).Error
 	return
 }
 
 // 添加数据
 func AddBaseFromCoalmineIndex(item *BaseFromCoalmineJsmIndex) (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.BaseFromCoalmineJsmIndexId)
 	return
 }
 
 // 添加公司指标
 func AddBaseFromCoalmineCompanyIndex(item *BaseFromCoalmineCompanyIndex) (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.BaseFromCoalmineCompanyIndexId)
 	return
 }
 
 // 查询公司指标
 func GetBaseFromCoalmineCompanyIndex() (items []*BaseFromCoalmineCompanyIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_coalmine_company_index`
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }
 
 func UpdateBaseFromCoalmineCompanyIndex(item *BaseFromCoalmineCompanyIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `UPDATE base_from_coalmine_company_index SET deal_value=?  WHERE index_name=?  AND  data_time = ?`
-	_, err = o.Raw(sql, item.DealValue, item.IndexName, item.DataTime).Exec()
+	err = global.DEFAULT_DB.Exec(sql, item.DealValue, item.IndexName, item.DataTime).Error
+	//_, err = o.Raw(sql, item.DealValue, item.IndexName, item.DataTime).Exec()
 	return
 }
 
 func (m *BaseFromCoalmineMapping) 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_sci99_data 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)
 	if err != nil {
 		return
 	}
@@ -114,7 +134,8 @@ func (m *BaseFromCoalmineMapping) GetMaxAndMinDateByIndexCode(indexCode string)
 	// 获取最新值
 	var latest_value float64
 	sql = ` SELECT value AS latest_value FROM base_from_sci99_data WHERE index_code=? ORDER BY data_time DESC LIMIT 1 `
-	err = o.Raw(sql, indexCode).QueryRow(&latest_value)
+	//err = o.Raw(sql, indexCode).QueryRow(&latest_value)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).Scan(&latest_value).Error
 	if err != nil {
 		return
 	}
@@ -124,9 +145,10 @@ func (m *BaseFromCoalmineMapping) GetMaxAndMinDateByIndexCode(indexCode string)
 }
 
 func (m *BaseFromCoalmineMapping) ModifyIndexMaxAndMinDate(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_sci99_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 = global.DEFAULT_DB.Exec(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Error
+	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Exec()
 	return
 }
 

models/base_from_com_trade.go

@@ -1,20 +1,20 @@
 package models
 
 import (
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // UN 联合国商品贸易数据指标
 
 // ComTradeCodeMapping 联合国商品贸易数据指标编码与分类编码的关系表
 type ComTradeCodeMapping struct {
-	Code       int       `orm:"column(code);pk"`
+	//Code       int       `orm:"column(code);pk"`
+	Code       int       `gorm:"column:code;primaryKey"`
 	IndexCode  string    `description:"联合国商品贸易编码"`
 	Type       int       `description:"1:价格；2：重量"`
 	Name       string    `description:"指标名称"`
@@ -23,9 +23,10 @@ type ComTradeCodeMapping struct {
 
 // GetComTradeIndex 根据指标code获取指标信息
 func GetComTradeIndex(indexCode string) (item *ComTradeCodeMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM com_trade_code_mapping WHERE 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
 }
 
@@ -35,7 +36,7 @@ type ComTradeData struct {
 }
 
 func GetComTradeDataByTradeCode(tradeCode, startDate string) (items []*ComTradeData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	pars := []interface{}{tradeCode}
 	sql1 := ` SELECT * FROM com_trade_data WHERE 1=1 AND index_trade_code = ? `
 	if startDate != `` {
@@ -43,12 +44,13 @@ func GetComTradeDataByTradeCode(tradeCode, startDate string) (items []*ComTradeD
 		pars = append(pars, startDate)
 	}
 	sql := `select trade_value AS value,data_time 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(&items)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
 func GetComTradeDataByWeightCode(weightCode, startDate string) (items []*ComTradeData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	pars := []interface{}{weightCode}
 	sql1 := ` SELECT * FROM com_trade_data WHERE 1=1  AND index_net_weight_code = ? `
 	if startDate != `` {
@@ -56,24 +58,26 @@ func GetComTradeDataByWeightCode(weightCode, startDate string) (items []*ComTrad
 		pars = append(pars, startDate)
 	}
 	sql := `select net_weight_value AS value,data_time 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(&items)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
 func GetComTradeDataByCondition(condition string, pars []interface{}) (item []*ComTradeData, err error) {
 	sql1 := ` SELECT * FROM com_trade_data WHERE 1=1  `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql1 += condition
 	}
 	sql := `select trade_value AS value,data_time 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 = global.DEFAULT_DB.Raw(sql, pars...).Find(&item).Error
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
 	return
 }
 
 // AddEdbDataFromComTrade 新增钢联指标数据
 func AddEdbDataFromComTrade(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	// 获取指标关系
 	codeMapping, err := GetComTradeIndex(edbCode)
@@ -115,7 +119,8 @@ func AddEdbDataFromComTrade(edbCode string) (err error) {
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
 			utils.FileLog.Info("addSql:" + addSql)
-			_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DB.Exec(addSql).Error
+			//_, err = o.Raw(addSql).Exec()
 			if err != nil {
 				return err
 			}
@@ -129,7 +134,7 @@ func RefreshEdbDataFromComTrade(edbInfoId int, edbCode, startDate string) (err e
 	source := utils.DATA_SOURCE_COM_TRADE
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -233,7 +238,8 @@ func RefreshEdbDataFromComTrade(edbInfoId int, edbCode, startDate string) (err e
 
 	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_dl.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 BaseFromTradeDalianIndex struct {
-	BaseFromTradeDalianIndexId int `orm:"column(base_from_trade_dalian_index_id);pk"`
+	//BaseFromTradeDalianIndexId int `orm:"column(base_from_trade_dalian_index_id);pk"`
+	BaseFromTradeDalianIndexId int `gorm:"column:base_from_trade_dalian_index_id;primaryKey"`
 	Rank                       int
 	DealShortName              string
 	DealName                   string
@@ -36,15 +37,17 @@ type BaseFromTradeDalianIndex struct {
 }
 
 func GetBaseFromDalianDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeDalianIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_dalian_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 BaseFromDlDataSimple struct {
-	Id        int `orm:"column(base_from_trade_dalian_index_id);pk"`
+	Id int `gorm:"column:base_from_trade_dalian_index_id;primaryKey"`
+	//Id        int `orm:"column(base_from_trade_dalian_index_id);pk"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -56,12 +59,13 @@ type BaseFromDlDataSimple struct {
 
 func GetDlDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromDlDataSimple, err error) {
 	sql := ` SELECT * FROM base_from_trade_dalian_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,7 +80,7 @@ func AddEdbDataFromDl(edbCode string) (err error) {
 		suffix = "sold"
 	}
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	dlBaseDataAll, err := GetBaseFromDalianDataAllByIndexCode(edbCode, suffix)
 	if err != nil && !utils.IsErrNoRow(err) {
 		return
@@ -116,7 +120,8 @@ func AddEdbDataFromDl(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
 		}
@@ -129,7 +134,7 @@ func RefreshEdbDataFromDl(edbInfoId int, edbCode, startDate string) (err error)
 	source := utils.DATA_SOURCE_DL
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -256,7 +261,8 @@ func RefreshEdbDataFromDl(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_edb_mapping.go

@@ -1,16 +1,16 @@
 package models
 
 import (
-	"eta/eta_index_lib/utils"
+	"eta/eta_index_lib/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
 
 // BaseFromEdbMapping 同花顺高频数据
 type BaseFromEdbMapping struct {
-	Id              int       `orm:"column(id);pk"`
+	Id int `gorm:"column:id;primaryKey"`
+	//Id              int       `orm:"column(id);pk"`
 	BaseFromIndexId int       `description:"源指标ID"`
 	BaseIndexCode   string    `description:"源指标编码"`
 	EdbInfoId       int       `description:"指标ID"`
@@ -55,12 +55,13 @@ func (m *BaseFromEdbMapping) Cols() BaseFromEdbMappingCols {
 }
 
 func (m *BaseFromEdbMapping) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.Id = int(id)
+	//o := orm.NewOrm()
+	//id, err := o.Insert(m)
+	err = global.DEFAULT_DB.Create(&m).Error
+	//if err != nil {
+	//	return
+	//}
+	//m.Id = int(id)
 	return
 }
 
@@ -68,21 +69,24 @@ func (m *BaseFromEdbMapping) CreateMulti(items []*BaseFromEdbMapping) (err error
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(len(items), items)
+	err = global.DEFAULT_DB.CreateInBatches(items, len(items)).Error
 	return
 }
 
 func (m *BaseFromEdbMapping) 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 *BaseFromEdbMapping) Remove() (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.Id).Exec()
+	//_, err = o.Raw(sql, m.Id).Exec()
+	err = global.DEFAULT_DB.Exec(sql, m.Id).Error
 	return
 }
 
@@ -90,9 +94,11 @@ func (m *BaseFromEdbMapping) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	//o := orm.NewOrm()
+	//sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
+	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN ?`, m.TableName(), m.Cols().PrimaryId)
+	//_, err = o.Raw(sql, ids).Exec()
+	err = global.DEFAULT_DB.Exec(sql, ids).Error
 	return
 }
 
@@ -100,39 +106,43 @@ func (m *BaseFromEdbMapping) RemoveByCondition(condition string, pars []interfac
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	//_, err = o.Raw(sql, pars).Exec()
+	err = global.DEFAULT_DB.Exec(sql, pars...).Error
 	return
 }
 
 func (m *BaseFromEdbMapping) GetItemById(id int) (item *BaseFromEdbMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	//err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *BaseFromEdbMapping) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *BaseFromEdbMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	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
 }
 
 func (m *BaseFromEdbMapping) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), 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
 }
 
 func (m *BaseFromEdbMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromEdbMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -142,12 +152,13 @@ func (m *BaseFromEdbMapping) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), 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
 }
 
 func (m *BaseFromEdbMapping) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BaseFromEdbMapping, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -157,6 +168,8 @@ func (m *BaseFromEdbMapping) GetPageItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	//_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	pars = append(pars, startSize, pageSize)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&items).Error
 	return
 }

models/base_from_eia_steo.go

@@ -1,13 +1,12 @@
 package models
 
 import (
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 //钢联
@@ -19,18 +18,19 @@ type EiaSteoData struct {
 
 func GetEiaSteoDataByCondition(condition string, pars []interface{}) (item []*EiaSteoData, err error) {
 	sql1 := ` SELECT * FROM base_from_eia_steo_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
 }
 
 // AddEdbDataFromEiaSteo 新增钢联指标数据
 func AddEdbDataFromEiaSteo(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -72,7 +72,8 @@ func AddEdbDataFromEiaSteo(edbCode string) (err error) {
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
 			utils.FileLog.Info("addSql:" + addSql)
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DB.Exec(addSql).Error
 			if err != nil {
 				return err
 			}
@@ -86,7 +87,7 @@ func RefreshEdbDataFromEiaSteo(edbInfoId int, edbCode, startDate string) (err er
 	source := utils.DATA_SOURCE_EIA_STEO
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -192,7 +193,8 @@ func RefreshEdbDataFromEiaSteo(edbInfoId int, edbCode, startDate string) (err er
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		//_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DB.Exec(addSql).Error
 		if err != nil {
 			return err
 		}

models/base_from_fenwei.go

@@ -1,10 +1,9 @@
 package models
 
 import (
-	"errors"
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -14,7 +13,8 @@ import (
 type BaseFromFenwei struct{}
 
 type BaseFromFenweiData struct {
-	FenweiDataId  int `orm:"column(fenwei_data_id);pk"`
+	FenweiDataId int `gorm:"column:fenwei_data_id;primaryKey"`
+	//enweiDataId  int `orm:"column(fenwei_data_id);pk"`
 	FenweiIndexId int
 	IndexCode     string
 	DataTime      string
@@ -29,18 +29,19 @@ func (m *BaseFromFenweiData) TableName() string {
 }
 
 func GetBaseFromFenweiDataByCondition(condition string, pars []interface{}) (list []*BaseFromFenweiData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_fenwei_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 BaseFromFenwei) Add(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -72,7 +73,8 @@ func (obj BaseFromFenwei) 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
 		}
@@ -83,7 +85,7 @@ func (obj BaseFromFenwei) Add(edbCode string) (err error) {
 // Refresh 刷新汾渭数据指标数据
 func (obj BaseFromFenwei) Refresh(edbInfoId int, edbCode, startDate string) (err error) {
 	source := obj.GetSource()
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -181,7 +183,8 @@ func (obj BaseFromFenwei) Refresh(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 {
 			fmt.Println("RefreshEdbDataFromBaiinfo add Err", err.Error())
 			return
@@ -201,18 +204,19 @@ func (obj BaseFromFenwei) GetSourceName() string {
 }
 
 type BaseFromFenweiIndex struct {
-	FenweiIndexId int64 `orm:"column(fenwei_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
+	FenweiIndexId int64 `gorm:"column:fenwei_index_id;primaryKey"`
+	//FenweiIndexId int64 `orm:"column(fenwei_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 *BaseFromFenweiIndex) TableName() string {
@@ -220,34 +224,42 @@ func (m *BaseFromFenweiIndex) TableName() string {
 }
 
 func (m *BaseFromFenweiIndex) 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.FenweiIndexId)
 	return
 }
 
 func (m *BaseFromFenweiIndex) 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 *BaseFromFenweiIndex) ModifyIndexMaxAndMinDate(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_fenwei_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 *BaseFromFenweiIndex) GetByIndexCode(indexCode string) (item *BaseFromFenweiIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).First(&item).Error
 	return
 }
 
 func (m *BaseFromFenweiIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromFenweiIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -257,12 +269,14 @@ func (m *BaseFromFenweiIndex) GetItemsByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_fenwei_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 BaseFromFenweiIndexList struct {
-	FenweiIndexId int64 `orm:"column(fenwei_index_id);pk"`
+	//FenweiIndexId int64 `orm:"column(fenwei_index_id);pk"`
+	FenweiIndexId int64 `gorm:"column:fenwei_index_id;primaryKey"`
 	IndexCode     string
 	IndexName     string
 	Frequency     string
@@ -276,15 +290,17 @@ type BaseFromFenweiIndexList struct {
 }
 
 func (y *BaseFromFenweiData) GetByIndexCode(indexCode string) (list []*BaseFromFenweiData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_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 (y *BaseFromFenweiData) AddMulti(item []*BaseFromFenweiData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(1, item)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(1, item)
+	err = global.DEFAULT_DB.CreateInBatches(&item, 1).Error
 	return
 }
 
@@ -324,13 +340,15 @@ type HandleFenWeiNetDataReq struct {
 }
 
 func (y *BaseFromFenweiData) 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_fenwei_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 lastVal float64
 	sql = ` SELECT value AS latest_value FROM base_from_fenwei_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).Scan(&lastVal).Error
 	if err != nil {
 		return
 	}
@@ -340,7 +358,8 @@ func (y *BaseFromFenweiData) GetMaxAndMinDateByIndexCode(indexCode string) (item
 
 // BaseFromFenweiClassify 汾渭数据分类表
 type BaseFromFenweiClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk"`
+	//ClassifyId      int       `orm:"column(classify_id);pk"`
+	ClassifyId      int       `gorm:"column:classify_id;primaryKey"`
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
 	SysUserId       int       `description:"创建人id"`
@@ -352,32 +371,37 @@ type BaseFromFenweiClassify struct {
 }
 
 func (y *BaseFromFenweiClassify) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(y)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(y)
+	err = global.DEFAULT_DB.Create(&y).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(y.ClassifyId)
 	return
 }
 
 func (y *BaseFromFenweiClassify) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(y, updateCols...)
-
+	//o := orm.NewOrm()
+	//_, err = o.Update(y, updateCols...)
+	err = global.DEFAULT_DB.Model(&y).Select(updateCols).Updates(&y).Error
 	return
 }
 
 func (y *BaseFromFenweiClassify) GetByClassifyName(classifyName string) (item []*BaseFromFenweiClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_classify WHERE classify_name=? `
-	_, err = o.Raw(sql, classifyName).QueryRows(&item)
+	//_, err = o.Raw(sql, classifyName).QueryRows(&item)
 
-	if errors.Is(err, orm.ErrNoRows) {
+	err = global.DEFAULT_DB.Raw(sql, classifyName).Find(&item).Error
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
-
 	return
 }
 
 func (y *BaseFromFenweiClassify) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromFenweiClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -387,7 +411,8 @@ func (y *BaseFromFenweiClassify) GetItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_fenwei_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
 }
 
@@ -424,34 +449,37 @@ func MultiUpdateBaseFromFenweiDataValue(items []*BaseFromFenweiData) (err error)
 		return
 	}
 
-	o := orm.NewOrm()
-	sql := `UPDATE base_from_fenwei_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_fenwei_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
 		}
 	}
+
 	return
 }
 
 // GetBaseFromFenWeiIndexByIndexName 根据指标名称查询指标
 func GetBaseFromFenWeiIndexByIndexName(indexName string) (item *BaseFromFenweiIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_index WHERE index_name=? `
-	err = o.Raw(sql, indexName).QueryRow(&item)
-
-	if errors.Is(err, orm.ErrNoRows) {
+	//err = o.Raw(sql, indexName).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, indexName).First(&item).Error
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 	return
@@ -459,11 +487,11 @@ func GetBaseFromFenWeiIndexByIndexName(indexName string) (item *BaseFromFenweiIn
 
 // GetBaseFromFenweiDataByIndexCodeAndDataTime 根据指标编码和dataTime查询指标数据
 func GetBaseFromFenweiDataByIndexCodeAndDataTime(indexCode, dataTime string) (item *BaseFromFenweiData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_data WHERE index_code=? AND data_time=? `
-	err = o.Raw(sql, indexCode, dataTime).QueryRow(&item)
-
-	if errors.Is(err, orm.ErrNoRows) {
+	//err = o.Raw(sql, indexCode, dataTime).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, indexCode, dataTime).First(&item).Error
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 
@@ -476,25 +504,31 @@ func BatchAddBaseFromFenWeiData(items []*BaseFromFenweiData) (err error) {
 		return
 	}
 
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(1, items)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(1, items)
+	err = global.DEFAULT_DB.CreateInBatches(items, 1).Error
 	return
 }
 
 // AddBaseFromFenWeiClassify 新增汾渭分类
 func AddBaseFromFenWeiClassify(item *BaseFromFenweiClassify) (classifyId int64, err error) {
-	o := orm.NewOrm()
-	classifyId, err = o.Insert(item)
+	//o := orm.NewOrm()
+	//classifyId, err = o.Insert(item)
+	err = global.DEFAULT_DB.Create(&item).Error
+	if err != nil {
+		return
+	}
+	classifyId = int64(item.ClassifyId)
 	return
 }
 
 // GetBaseFromFenWeiIndexByIndexCode 跟据指标编码查询指标信息
 func GetBaseFromFenWeiIndexByIndexCode(indexCode string) (item *BaseFromFenweiIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_fenwei_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
-
-	if errors.Is(err, orm.ErrNoRows) {
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).First(&item).Error
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 
@@ -503,7 +537,8 @@ func GetBaseFromFenWeiIndexByIndexCode(indexCode string) (item *BaseFromFenweiIn
 
 // UpdateBaseFromFenweiData 更新汾渭数据
 func UpdateBaseFromFenweiData(data *BaseFromFenweiData) error {
-	o := orm.NewOrm()
-	_, err := o.Update(data)
+	//o := orm.NewOrm()
+	//_, err := o.Update(data)
+	err := global.DEFAULT_DB.Save(&data).Error
 	return err
 }

models/base_from_fubao.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"
@@ -28,7 +28,7 @@ type FuBaoData struct {
 
 // 新增富宝指标数据
 func AddEdbDataFromFubao(edbCode string, fubaoData *FuBaoData) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	var isAdd bool
 	addSql := ` INSERT INTO edb_data_fubao(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	for _, dataItem := range fubaoData.ReturnValue.Data {
@@ -47,7 +47,8 @@ func AddEdbDataFromFubao(edbCode string, fubaoData *FuBaoData) (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 {
 			fmt.Println("RefreshAllEdbDataByFubao add Err", err.Error())
 			return
@@ -61,7 +62,7 @@ func RefreshEdbDataFromFubao(edbInfoId int, edbCode, startDate string, fubaoData
 	source := utils.DATA_SOURCE_FUBAO
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	// 真实数据的最大日期  ， 插入规则配置的日期
 	var realDataMaxDate, edbDataInsertConfigDate time.Time
@@ -149,7 +150,8 @@ func RefreshEdbDataFromFubao(edbInfoId int, edbCode, startDate string, fubaoData
 
 	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("RefreshEdbDataFromFubao Err", err.Error())
 			return

models/base_from_gie.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 BaseFromTradeEicIndex struct {
-	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+	//BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+	BaseFromEicIndexId     int `gorm:"column:base_from_eic_index_id;primaryKey"`
 	Country                string
 	Type                   string
 	EicCode                string
@@ -40,7 +41,8 @@ type BaseFromTradeEicIndex struct {
 }
 
 type BaseFromTradeEicIndexV2 struct {
-	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+	//BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+	BaseFromEicIndexId     int `gorm:"column:base_from_eic_index_id;primaryKey"`
 	Type                   string
 	EicCode                string
 	Name                   string
@@ -73,7 +75,7 @@ type BaseFromTradeEicIndexV2 struct {
 }
 
 func GetBaseFromEicDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeEicIndexV2, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	var name string
 	if suffix == "" {
 		name = "eic_code"
@@ -100,31 +102,34 @@ func GetBaseFromEicDataAllByIndexCode(indexCode, suffix string) (list []*BaseFro
 	}
 	sql := `SELECT * FROM base_from_trade_eic_index_v2 WHERE %s=? `
 	sql = fmt.Sprintf(sql, name)
-	_, 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 GetGieDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromTradeEicIndex, err error) {
 	sql := ` SELECT * FROM base_from_trade_eic_index WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY gas_day_started_on DESC `
 	fmt.Println(sql, pars)
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 func GetGieDataByTradeCodeV2(condition string, pars []interface{}) (item []*BaseFromTradeEicIndexV2, err error) {
 	sql := ` SELECT * FROM base_from_trade_eic_index_v2 WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY gas_day_start DESC `
 	fmt.Println(sql, pars)
-	_, 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
 }
 
@@ -155,8 +160,8 @@ func AddEdbDataFromGie(edbCode string) (err error) {
 	} else {
 		suffix = ""
 	}
-
-	o := orm.NewOrm()
+	//
+	//o := orm.NewOrm()
 	eicBaseDataAll, err := GetBaseFromEicDataAllByIndexCode(edbCode, suffix)
 	if err != nil && !utils.IsErrNoRow(err) {
 		fmt.Println("GetBaseFromEicDataAllByIndexCode err:", err)
@@ -225,7 +230,8 @@ func AddEdbDataFromGie(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 {
 			fmt.Println("addSql err:", err)
 			return err
@@ -239,7 +245,7 @@ func RefreshEdbDataFromGie(edbInfoId int, edbCode, startDate string) (err error)
 	source := utils.DATA_SOURCE_GIE
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -393,7 +399,8 @@ func RefreshEdbDataFromGie(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_google_travel.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 BaseFromChangesVisitorsCovid struct {
-	Id                  int    `orm:"column(id);pk"`
+	//Id                  int    `orm:"column(id);pk"`
+	Id                  int    `gorm:"column:id;primaryKey"`
 	Entity              string `description:"国家"`
 	Code                string `description:"国家编码"`
 	EdbCode             string `description:"指标ID"`
@@ -27,27 +28,29 @@ type BaseFromChangesVisitorsCovid struct {
 }
 
 func GetBaseFromChangesVisitorsCovidDataAllByIndexCode(indexCode string) (list []*BaseFromChangesVisitorsCovid, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_changes_visitors_covid WHERE edb_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 GetBaseFromChangesVisitorsCovidDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromChangesVisitorsCovid, err error) {
 	sql := ` SELECT * FROM base_from_changes_visitors_covid WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY day DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	//_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // 新增谷歌出行指标数据
 func AddEdbDataGoogleTravel(edbCode string) (err error) {
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	dataAll, err := GetBaseFromChangesVisitorsCovidDataAllByIndexCode(edbCode)
 	if err != nil && !utils.IsErrNoRow(err) {
 		return
@@ -71,7 +74,8 @@ func AddEdbDataGoogleTravel(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
 		}
@@ -84,7 +88,7 @@ func RefreshEdbDataGoogleTravel(edbInfoId int, edbCode, startDate string) (err e
 	source := utils.DATA_SOURCE_GOOGLE_TRAVEL
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -190,7 +194,8 @@ func RefreshEdbDataGoogleTravel(edbInfoId int, edbCode, startDate string) (err e
 
 	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_gpr_risk.go

@@ -2,20 +2,20 @@ package models
 
 import (
 	"bytes"
+	"eta/eta_index_lib/global"
 	"eta/eta_index_lib/utils"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // BaseFromGprRisk 美国农业部
 type BaseFromGprRisk struct{}
 
 type BaseFromGprRiskData struct {
-	BaseFromGprRiskDataId  int `orm:"column(base_from_gpr_risk_data_id);pk"`
+	//BaseFromGprRiskDataId  int `orm:"column(base_from_gpr_risk_data_id);pk"`
+	BaseFromGprRiskDataId  int `orm:"column(base_from_gpr_risk_data_id);primaryKey"`
 	BaseFromGprRiskIndexId int
 	IndexCode              string
 	DataTime               string
@@ -26,18 +26,19 @@ type BaseFromGprRiskData struct {
 }
 
 func GetBaseFromGprRiskDataByCondition(condition string, pars []interface{}) (list []*BaseFromGprRiskData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_gpr_risk_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 BaseFromGprRisk) Add(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -78,7 +79,8 @@ func (obj BaseFromGprRisk) Add(edbCode string) (err error) {
 		addSql = buffer.String()
 		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
 		}
@@ -89,7 +91,7 @@ func (obj BaseFromGprRisk) Add(edbCode string) (err error) {
 // Refresh 刷新涌益咨询指标数据
 func (obj BaseFromGprRisk) Refresh(edbInfoId int, edbCode, startDate string) (err error) {
 	source := obj.GetSource()
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -187,7 +189,8 @@ func (obj BaseFromGprRisk) Refresh(edbInfoId int, edbCode, startDate string) (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
@@ -207,7 +210,8 @@ func (obj BaseFromGprRisk) GetSourceName() string {
 }
 
 type BaseFromGprRiskIndex struct {
-	BaseFromGprRiskIndexId int64 `orm:"column(base_from_gpr_risk_index_id);pk"`
+	//BaseFromGprRiskIndexId int64 `orm:"column(base_from_gpr_risk_index_id);pk"`
+	BaseFromGprRiskIndexId int64 `gorm:"column:base_from_gpr_risk_index_id;primaryKey"`
 	IndexCode              string
 	IndexName              string
 	Frequency              string
@@ -224,7 +228,8 @@ type BaseFromGprRiskIndex struct {
 }
 
 type BaseFromGprRiskIndexList struct {
-	BaseFromGprRiskIndexId int64 `orm:"column(base_from_gpr_risk_index_id);pk"`
+	//BaseFromGprRiskIndexId int64 `orm:"column(base_from_gpr_risk_index_id);pk"`
+	BaseFromGprRiskIndexId int64 `gorm:"column:base_from_gpr_risk_index_id;primaryKey"`
 	IndexCode              string
 	IndexName              string
 	Frequency              string
@@ -239,22 +244,25 @@ type BaseFromGprRiskIndexList struct {
 }
 
 func (y *BaseFromGprRiskData) GetByIndexCode(indexCode string) (list []*BaseFromGprRiskData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_gpr_risk_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 (y *BaseFromGprRiskData) AddMulti(item []*BaseFromGprRiskData) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(1, item)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(1, item)
+	err = global.DEFAULT_DB.CreateInBatches(&item, 1).Error
 	return
 }
 
 // Update 修改
 func (y *BaseFromGprRiskData) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(y, updateCols...)
+	//o := orm.NewOrm()
+	//_, err = o.Update(y, updateCols...)
+	err = global.DEFAULT_DB.Model(&y).Select(updateCols).Updates(&y).Error
 	return
 }
 
@@ -277,48 +285,58 @@ type HandleGprRiskExcelDataReq struct {
 }
 
 func (y *BaseFromGprRiskData) 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_gpr_risk_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 %s WHERE index_code=? ORDER BY data_time DESC LIMIT 1 `
 	sql = fmt.Sprintf(sql, "base_from_gpr_risk_data")
-	err = o.Raw(sql, indexCode).QueryRow(&latest_value)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).Scan(&latest_value).Error
+	//err = o.Raw(sql, indexCode).QueryRow(&latest_value)
 	item.LatestValue = latest_value
 	return
 }
 
 func (y *BaseFromGprRiskIndex) ModifyIndexMaxAndMinDate(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_gpr_risk_index SET start_date=?,end_date=?, end_value=?, modify_time=NOW() WHERE index_code=? `
-	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Exec()
+	//_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Exec()
+	err = global.DEFAULT_DB.Exec(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Error
 	return
 }
 
 func (y *BaseFromGprRiskIndex) GetByIndexCode(indexCode string) (item *BaseFromGprRiskIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_gpr_risk_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, indexCode).First(&item).Error
 	return
 }
 
 func (y *BaseFromGprRiskIndex) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(y)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(y)
+	err = global.DEFAULT_DB.Create(&y).Error
+	if err != nil {
+		return
+	}
+	lastId = y.BaseFromGprRiskIndexId
 	return
 }
 
 // Update 修改
 func (y *BaseFromGprRiskIndex) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(y, updateCols...)
-
+	//o := orm.NewOrm()
+	//_, err = o.Update(y, updateCols...)
+	err = global.DEFAULT_DB.Model(&y).Select(updateCols).Updates(&y).Error
 	return
 }
 
 // BaseFromGprRiskClassify GprRisk原始数据分类表
 type BaseFromGprRiskClassify struct {
-	ClassifyId      int64     `orm:"column(classify_id);pk"`
+	//ClassifyId      int64     `orm:"column(classify_id);pk"`
+	ClassifyId      int64     `gorm:"column:classify_id;primaryKey"`
 	ClassifyName    string    `description:"分类名称"`
 	ClassifyNameEn  string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
@@ -331,29 +349,36 @@ type BaseFromGprRiskClassify struct {
 }
 
 func (y *BaseFromGprRiskClassify) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(y)
+	//o := orm.NewOrm()
+	//lastId, err = o.Insert(y)
+	err = global.DEFAULT_DB.Create(&y).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(y.ClassifyId)
 	return
 }
 
 // Update 修改
 func (y *BaseFromGprRiskClassify) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(y, updateCols...)
-
+	//o := orm.NewOrm()
+	//_, err = o.Update(y, updateCols...)
+	err = global.DEFAULT_DB.Model(&y).Select(updateCols).Updates(&y).Error
 	return
 }
 
 func (y *BaseFromGprRiskClassify) GetByClassifyName(classifyName string) (item *BaseFromGprRiskClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_gpr_risk_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 (y *BaseFromGprRiskClassify) GetParentClassify() (items []*BaseFromGprRiskClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_gpr_risk_classify WHERE parent_id=0 `
-	_, err = o.Raw(sql).QueryRows(&items)
+	//_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DEFAULT_DB.Raw(sql).Find(&items).Error
 	return
 }

models/base_from_gz.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 BaseFromTradeGuangzhouIndex struct {
-	BaseFromTradeGuangzhouIndexId    int       `orm:"column(base_from_trade_guangzhou_index_id);pk"`
+	BaseFromTradeGuangzhouIndexId int `gorm:"column:base_from_trade_guangzhou_index_id;primaryKey"`
+	//BaseFromTradeGuangzhouIndexId    int       `orm:"column(base_from_trade_guangzhou_index_id);pk"`
 	BaseFromTradeGuangzhouClassifyId int       `description:"分类id"`
 	IndexCode                        string    `description:"指标编码"`
 	IndexName                        string    `description:"指标名称"`
@@ -23,7 +24,8 @@ type BaseFromTradeGuangzhouIndex struct {
 }
 
 type BaseFromTradeGuangzhouData struct {
-	BaseFromTradeGuangzhouDataId  int       `orm:"column(base_from_trade_guangzhou_data_id);pk"`
+	BaseFromTradeGuangzhouDataId int `gorm:"column:base_from_trade_guangzhou_data_id;primaryKey"`
+	//BaseFromTradeGuangzhouDataId  int       `orm:"column(base_from_trade_guangzhou_data_id);pk"`
 	BaseFromTradeGuangzhouIndexId int       `description:"指标id"`
 	IndexCode                     string    `description:"指标编码"`
 	DataTime                      string    `description:"数据日期"`
@@ -34,26 +36,28 @@ type BaseFromTradeGuangzhouData struct {
 }
 
 func GetBaseFromGuangzhouDataByIndexCode(indexCode string) (items []*BaseFromTradeGuangzhouData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_guangzhou_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 GetBaseFromGuangzhouDataDataByCondition(condition string, pars []interface{}) (item []*BaseFromTradeGuangzhouData, err error) {
 	sql := ` SELECT * FROM base_from_trade_guangzhou_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
 }
 
 // 新增广期所指标数据
 func AddEdbDataFromGz(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	dataAll, err := GetBaseFromGuangzhouDataByIndexCode(edbCode)
 	if err != nil && !utils.IsErrNoRow(err) {
@@ -81,7 +85,8 @@ func AddEdbDataFromGz(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
 		}
@@ -94,7 +99,7 @@ func RefreshEdbDataFromGz(edbInfoId int, edbCode, startDate string) (err error)
 	source := utils.DATA_SOURCE_GFEX
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -199,7 +204,8 @@ func RefreshEdbDataFromGz(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_hisugar.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"
@@ -34,24 +34,35 @@ type BaseFromHisugarData struct {
 
 // 添加数据
 func AddBaseFromHisugarIndexMuti(items []*BaseFromHisugarIndex) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(500, items)
+	//o := orm.NewOrm()
+	//_, err = o.InsertMulti(500, items)
+	err = global.DEFAULT_DB.CreateInBatches(items, len(items)).Error
 	return
 }
 func AddBaseFromHisugarIndex(item *BaseFromHisugarIndex) (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.BaseFromHisugarIndexId)
 	return
 }
 
 func AddBaseFromHisugarData(item *BaseFromHisugarData) (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.BaseFromHisugarDataId)
 	return
 }
 
 func AddEdbDataFromHisugar(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	hisugarBaseDataAll, err := GetHisugarDataByCode(edbCode)
 	if err != nil && !utils.IsErrNoRow(err) {
@@ -91,7 +102,8 @@ func AddEdbDataFromHisugar(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
 		}
@@ -101,9 +113,10 @@ func AddEdbDataFromHisugar(edbCode string) (err error) {
 
 // GetHisugarDataByCode
 func GetHisugarDataByCode(indexCode string) (items []*BaseFromHisugarData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := "SELECT * FROM base_from_hisugar_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
 }
 
@@ -112,7 +125,7 @@ func RefreshEdbDataFromHisugar(edbInfoId int, edbCode, startDate string) (err er
 	source := utils.DATA_SOURCE_OILCHEM
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -210,7 +223,8 @@ func RefreshEdbDataFromHisugar(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("RefreshEdbDataFromSci add Err", err.Error())
 			return
@@ -220,12 +234,13 @@ func RefreshEdbDataFromHisugar(edbInfoId int, edbCode, startDate string) (err er
 }
 
 func GetBaseFromHisugarDataByCondition(condition string, pars []interface{}) (list []*BaseFromHisugarData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_hisugar_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
 }
 
@@ -234,24 +249,27 @@ type HandleHisugarEdbDataReq struct {
 }
 
 func GetBaseFromHisugarIndex() (list []*BaseFromHisugarIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_hisugar_index group by index_name `
-	_, err = o.Raw(sql).QueryRows(&list)
+	//_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DEFAULT_DB.Raw(sql).Find(&list).Error
 	return
 }
 
 func GetBaseFromHisugarData(indexCode, dataTime string) (item *BaseFromHisugarData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_hisugar_data where index_code=? And data_time = ? `
-	err = o.Raw(sql, indexCode, dataTime).QueryRow(&item)
+	//err = o.Raw(sql, indexCode, dataTime).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, indexCode, dataTime).First(&item).Error
 	return
 }
 
 // UpdateBaseFromSci99Data
 func UpdateBaseFromHisugarData(value, indexCode, dataTime string) (err error) {
-	o := orm.NewOrm()
+	//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()
+	//_, err = o.Raw(sql, value, indexCode, dataTime).Exec()
+	err = global.DEFAULT_DB.Exec(sql, value, indexCode, dataTime).Error
 	return
 }
 

models/base_from_icpi.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 BaseFromIcpiIndex struct {
-	BaseFromIcpiIndexId    int       `orm:"column(base_from_icpi_index_id);pk"`
+	BaseFromIcpiIndexId int `gorm:"column:base_from_icpi_index_id;primaryKey"`
+	//BaseFromIcpiIndexId    int       `orm:"column(base_from_icpi_index_id);pk"`
 	BaseFromIcpiClassifyId int       `description:"分类id"`
 	IndexCode              string    `description:"指标编码"`
 	IndexName              string    `description:"指标名称"`
@@ -23,7 +24,8 @@ type BaseFromIcpiIndex struct {
 }
 
 type BaseFromIcpiData struct {
-	BaseFromIcpiDataId  int       `orm:"column(base_from_icpi_data_id);pk"`
+	BaseFromIcpiDataId int `gorm:"column:base_from_icpi_data_id;primaryKey"`
+	//BaseFromIcpiDataId  int       `orm:"column(base_from_icpi_data_id);pk"`
 	BaseFromIcpiIndexId int       `description:"指标id"`
 	IndexCode           string    `description:"指标编码"`
 	DataTime            string    `description:"日期"`
@@ -33,35 +35,38 @@ type BaseFromIcpiData struct {
 }
 
 type BaseFromIcpiClassify struct {
-	BaseFromIcpiClassifyId int       `orm:"column(base_from_icpi_classify_id);pk"`
-	ClassifyName           string    `description:"分类名称"`
-	ClassifyNameEn         string    `description:"英文名称"`
-	ParentId               int       `description:"上级id"`
-	CreateTime             time.Time `description:"创建时间"`
-	ModifyTime             time.Time `description:"修改时间"`
+	BaseFromIcpiClassifyId int `gorm:"column:base_from_icpi_classify_id;primaryKey"`
+	//BaseFromIcpiClassifyId int       `orm:"column(base_from_icpi_classify_id);pk"`
+	ClassifyName   string    `description:"分类名称"`
+	ClassifyNameEn string    `description:"英文名称"`
+	ParentId       int       `description:"上级id"`
+	CreateTime     time.Time `description:"创建时间"`
+	ModifyTime     time.Time `description:"修改时间"`
 }
 
 func GetBaseFromIcpiDataByIndexCode(indexCode string) (items []*BaseFromIcpiData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_icpi_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 GetBaseFromIcpiDataDataByCondition(condition string, pars []interface{}) (item []*BaseFromIcpiData, err error) {
 	sql := ` SELECT * FROM base_from_icpi_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
 }
 
 // 新增广期所指标数据
 func AddEdbDataFromIcpi(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	dataAll, err := GetBaseFromIcpiDataByIndexCode(edbCode)
 	if err != nil && !utils.IsErrNoRow(err) {
 		return
@@ -88,7 +93,8 @@ func AddEdbDataFromIcpi(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
 		}
@@ -101,7 +107,7 @@ func RefreshEdbDataFromIcpi(edbInfoId int, edbCode, startDate string) (err error
 	source := utils.DATA_SOURCE_ICPI
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -206,7 +212,8 @@ func RefreshEdbDataFromIcpi(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_jiayue.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"
@@ -103,8 +103,9 @@ func AddEdbDataFromJiaYue(tableName, edbCode string, dataList []BridgeJiaYueInde
 	sql = strings.TrimRight(sql, ",")
 
 	// 新增入库
-	o := orm.NewOrm()
-	_, e := o.Raw(sql).Exec()
+	//o := orm.NewOrm()
+	//_, e := o.Raw(sql).Exec()
+	e := global.DEFAULT_DB.Exec(sql).Error
 	if e != nil {
 		err = fmt.Errorf("insert data err: %s", e.Error())
 	}
@@ -217,9 +218,10 @@ func RefreshEdbDataFromJiaYue(source, subSource, edbInfoId int, tableName, edbCo
 	if !hasNew {
 		return
 	}
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sqlInsert = strings.TrimRight(sqlInsert, ",")
-	_, e = o.Raw(sqlInsert).Exec()
+	//_, e = o.Raw(sqlInsert).Exec()
+	e = global.DEFAULT_DB.Exec(sqlInsert).Error
 	if e != nil {
 		err = fmt.Errorf("insert edb data err: %s", e.Error())
 		return

models/base_from_lt.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"
 	"reflect"
 	"strconv"
 	"strings"
@@ -14,7 +14,7 @@ import (
 
 // 新增路透指标数据
 func AddEdbDataFromLt(edbCode string, ltDataList map[int64]interface{}) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if len(ltDataList) > 0 {
 		var isAdd bool
 		addSql := ` INSERT INTO edb_data_lt(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
@@ -42,7 +42,8 @@ func AddEdbDataFromLt(edbCode string, ltDataList map[int64]interface{}) (err err
 		}
 		if isAdd {
 			addSql = strings.TrimRight(addSql, ",")
-			_, err = o.Raw(addSql).Exec()
+			//_, err = o.Raw(addSql).Exec()
+			err = global.DEFAULT_DB.Exec(addSql).Error
 			if err != nil {
 				fmt.Println("RefreshAllEdbDataByPb add Err", err.Error())
 				return
@@ -57,7 +58,7 @@ func RefreshEdbDataFromLt(edbInfoId int, edbCode, startDate string, ltDataList m
 	source := utils.DATA_SOURCE_LT
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	// 真实数据的最大日期  ， 插入规则配置的日期
 	var realDataMaxDate, edbDataInsertConfigDate time.Time
@@ -148,7 +149,8 @@ func RefreshEdbDataFromLt(edbInfoId int, edbCode, startDate string, ltDataList m
 
 	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("RefreshAllEdbDataByLt add Err", err.Error())
 			return

models/base_from_ly_classify.go

@@ -2,18 +2,20 @@
 package models
 
 import (
-	"errors"
+	"eta/eta_index_lib/global"
+	"eta/eta_index_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 )
 
 type BaseFromLyClassify struct {
-	BaseFromLyClassifyId int    `orm:"column(base_from_ly_classify_id);pk"` // 分类ID
-	CreateTime           string `orm:"column(create_time)"`                 // 创建时间
-	ModifyTime           string `orm:"column(modify_time)"`                 // 修改时间
-	ClassifyName         string `orm:"column(classify_name)"`               // 分类名称
-	ParentId             int    `orm:"column(parent_id)"`                   // 上级id
-	Sort                 int    `orm:"column(sort)"`                        // 排序字段，越小越靠前
-	ClassifyNameEn       string `orm:"column(classify_name_en)"`            // 英文分类名称
+	BaseFromLyClassifyId int `gorm:"column:base_from_ly_classify_id;primaryKey"` // 分类ID
+	//BaseFromLyClassifyId int    `orm:"column(base_from_ly_classify_id);pk"` // 分类ID
+	CreateTime     string `orm:"column(create_time)"`      // 创建时间
+	ModifyTime     string `orm:"column(modify_time)"`      // 修改时间
+	ClassifyName   string `orm:"column(classify_name)"`    // 分类名称
+	ParentId       int    `orm:"column(parent_id)"`        // 上级id
+	Sort           int    `orm:"column(sort)"`             // 排序字段，越小越靠前
+	ClassifyNameEn string `orm:"column(classify_name_en)"` // 英文分类名称
 }
 
 func init() {
@@ -22,10 +24,11 @@ func init() {
 
 // GetLyClassifyByName 根据分类名称查询
 func GetLyClassifyByName(classifyName string) (item *BaseFromLyClassify, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ly_classify WHERE classify_name=?`
-	err = o.Raw(sql, classifyName).QueryRow(&item)
-	if errors.Is(err, orm.ErrNoRows) {
+	//err = o.Raw(sql, classifyName).QueryRow(&item)
+	err = global.DEFAULT_DB.Raw(sql, classifyName).First(&item).Error
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 	return

models/base_from_ly_data.go

@@ -2,7 +2,6 @@
 package models
 
 import (
-	"errors"
 	"github.com/beego/beego/v2/client/orm"
 )
 
@@ -32,7 +31,7 @@ func GetLyDataByIndexIdAndDataTime(indexId int, dataTime string) (items []BaseFr
 	o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ly_data WHERE base_from_ly_index_id=? AND data_time=?`
 	_, err = o.Raw(sql, indexId, dataTime).QueryRows(&items)
-	if errors.Is(err, orm.ErrNoRows) {
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 	return
@@ -43,7 +42,7 @@ func GetLyDataByIndexIdAndDataTimeYM(indexId int, dataTime string) (items []Base
 	o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_ly_data WHERE base_from_ly_index_id=? AND data_time like ?`
 	_, err = o.Raw(sql, indexId, dataTime+"%").QueryRows(&items)
-	if errors.Is(err, orm.ErrNoRows) {
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 	return
@@ -65,7 +64,7 @@ func GetBaseFromLyDataByIndexCode(condition string, pars []interface{}) (items [
 		sql += condition
 	}
 	_, err = o.Raw(sql, pars...).QueryRows(&items)
-	if errors.Is(err, orm.ErrNoRows) {
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 	return

models/base_from_ly_index.go

@@ -3,7 +3,6 @@
 package models
 
 import (
-	"errors"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
@@ -49,7 +48,7 @@ func GetLyIndexByCode(indexCode string) (item *BaseFromLyIndex, err error) {
 	sql := `SELECT * FROM base_from_ly_index WHERE index_code=?`
 	err = o.Raw(sql, indexCode).QueryRow(&item)
 
-	if errors.Is(err, orm.ErrNoRows) {
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 

models/base_from_ly_index_record.go

@@ -3,7 +3,6 @@
 package models
 
 import (
-	"errors"
 	"github.com/beego/beego/v2/client/orm"
 )
 
@@ -38,7 +37,7 @@ func GetLyIndexRecordByUrl(url string) (item *BaseFromLyIndexRecord, err error)
 	sql := `SELECT * FROM base_from_ly_index_record WHERE url=?`
 	err = o.Raw(sql, url).QueryRow(&item)
 
-	if errors.Is(err, orm.ErrNoRows) {
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 

models/base_from_manual.go

@@ -34,7 +34,7 @@ func GetEdbdataManualByCondition(condition string, pars []interface{}) (item []*
 
 // AddEdbDataFromManual 新增弘则手工指标数据
 func AddEdbDataFromManual(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}

models/base_from_rzd_classify.go

@@ -2,7 +2,6 @@
 package models
 
 import (
-	"errors"
 	"github.com/beego/beego/v2/client/orm"
 )
 
@@ -25,7 +24,7 @@ func GetRzdClassifyByName(classifyName string) (item *BaseFromRzdClassify, err e
 	o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_rzd_classify WHERE classify_name=?`
 	err = o.Raw(sql, classifyName).QueryRow(&item)
-	if errors.Is(err, orm.ErrNoRows) {
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 	return

models/base_from_rzd_data.go

@@ -2,7 +2,6 @@
 package models
 
 import (
-	"errors"
 	"eta/eta_index_lib/utils"
 	"github.com/beego/beego/v2/client/orm"
 )
@@ -33,7 +32,7 @@ func GetRzdDataByIndexCodeAndDataTime(indexCode string, dataTime string) (items
 	o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_rzd_data WHERE index_code=? AND data_time=?`
 	err = o.Raw(sql, indexCode, dataTime).QueryRow(&items) // 使用 QueryRow
-	if errors.Is(err, orm.ErrNoRows) {
+	if utils.IsErrNoRow(err) {
 		return items, nil
 	}
 	if err != nil {
@@ -58,7 +57,7 @@ func GetBaseFromRzdDataByCondition(condition string, pars []interface{}) (items
 		sql += condition
 	}
 	_, err = o.Raw(sql, pars...).QueryRows(&items)
-	if errors.Is(err, orm.ErrNoRows) {
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 	return

models/base_from_rzd_index.go

@@ -3,7 +3,6 @@
 package models
 
 import (
-	"errors"
 	"github.com/beego/beego/v2/client/orm"
 )
 
@@ -46,7 +45,7 @@ func GetRzdIndexByCode(indexCode string) (item *BaseFromRzdIndex, err error) {
 	sql := `SELECT * FROM base_from_rzd_index WHERE index_code=?`
 	err = o.Raw(sql, indexCode).QueryRow(&item)
 
-	if errors.Is(err, orm.ErrNoRows) {
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 

models/base_from_sci99.go

@@ -58,7 +58,7 @@ type BaseFromSci99Classify struct {
 
 func GetBaseFromSci99DataDataByCondition(condition string, pars []interface{}) (item []*BaseFromIcpiData, err error) {
 	sql := ` SELECT * FROM base_from_sci99_data WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}
@@ -69,32 +69,32 @@ func GetBaseFromSci99DataDataByCondition(condition string, pars []interface{}) (
 
 // 添加数据
 func AddBaseFromSci99Index(item *BaseFromSci99Index) (lastId int64, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	lastId, err = o.Insert(item)
 	return
 }
 
 func AddBaseFromSci99Classify(item *BaseFromSci99Classify) (lastId int64, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	lastId, err = o.Insert(item)
 	return
 }
 
 func AddBaseFromSci99DataMulti(item []*BaseFromSci99Data) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	_, err = o.InsertMulti(1000, item)
 	return
 }
 
 func GetBaseFromSci99Index() (list []*BaseFromSci99Index, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci99_index `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
 
 func GetBaseFromSci99DataByIndexCode(indexCode string) (items []*BaseFromSci99DataItem, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci99_data WHERE index_code=? `
 	_, err = o.Raw(sql, indexCode).QueryRows(&items)
 	return

models/base_from_sci_hq.go

@@ -6,12 +6,10 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 func GetBaseFromSciHqDataByCondition(condition string, pars []interface{}) (list []*BaseFromSciHqData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci_hq_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -21,7 +19,7 @@ func GetBaseFromSciHqDataByCondition(condition string, pars []interface{}) (list
 }
 
 func GetBaseFromSciHqDataByIndexCode(indexCode string) (list []*BaseFromSciHqData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci_hq_data WHERE 1=1 AND index_code=?`
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
 	return
@@ -29,7 +27,7 @@ func GetBaseFromSciHqDataByIndexCode(indexCode string) (list []*BaseFromSciHqDat
 
 // AddEdbDataFromSciHq 新增卓创红期指标数据
 func AddEdbDataFromSciHq(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -61,7 +59,7 @@ func AddEdbDataFromSciHq(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
 		}
@@ -74,7 +72,7 @@ func RefreshEdbDataFromSciHq(edbInfoId int, edbCode, startDate string) (err erro
 	source := utils.DATA_SOURCE_SCI_HQ
 	subSource := utils.DATA_SUB_SOURCE_EDB
 
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	edbInfoIdStr := strconv.Itoa(edbInfoId)
 	//计算数据
 	var condition string
@@ -206,14 +204,14 @@ type BaseFromSciHqIndex struct {
 }
 
 func GetAllBaseFromSciHqIndex() (items []*BaseFromSciHqIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_sci_hq_index`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 func BatchAddBaseFromSciHqIndex(list []*BaseFromSciHqIndex) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	_, err = o.InsertMulti(len(list), list)
 	return
 }
@@ -230,19 +228,19 @@ type BaseFromSciHqData struct {
 }
 
 func (r *BaseFromSciHqData) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	_, err = o.Update(r, cols...)
 	return
 }
 
 func BatchAddBaseFromSciHqData(list []*BaseFromSciHqData) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	_, err = o.InsertMulti(500, list)
 	return
 }
 
 func GetSciHqIndexInfoMaxAndMinInfo(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_sci_hq_data WHERE index_code=? `
 	err = o.Raw(sql, indexCode).QueryRow(&item)
 
@@ -266,7 +264,7 @@ func GetSciHqIndexInfoMaxAndMinInfo(indexCode string) (item *EdbInfoMaxAndMinInf
 }
 
 func ModifySciHqIndexMaxAndMinInfo(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_sci_hq_index SET start_date=?,end_date=?,latest_value=?,latest_date=?,modify_time=NOW() WHERE index_code=? `
 	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, item.LatestDate, indexCode).Exec()
 	return

models/base_from_ths.go

@@ -3,7 +3,6 @@ package models
 import (
 	"eta/eta_index_lib/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -26,7 +25,7 @@ type Tables struct {
 
 // 新增同花顺指标数据
 func AddEdbDataFromThs(edbCode string, item EdbDataFromThs) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	if len(item.Tables) > 0 {
 		table := item.Tables[0]
@@ -62,7 +61,7 @@ func AddEdbDataFromThs(edbCode string, item EdbDataFromThs) (err error) {
 
 // 刷新同花顺指标数据
 func RefreshEdbDataFromThs(edbInfoId int, edbCode, startDate string, item EdbDataFromThs) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	source := utils.DATA_SOURCE_THS
 	subSource := utils.DATA_SUB_SOURCE_EDB
 

models/base_from_ths_ds.go

@@ -13,7 +13,7 @@ var thsds = "thsds"
 
 // 新增同花顺指标数据
 func AddEdbDataFromThsDs(stockCode, edbCode string, item EdbDataFromThs) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	edbCodeList := strings.Split(edbCode, ",")
 	indexCodeMap := make(map[string]string)

models/base_from_usda_fas.go

@@ -25,7 +25,7 @@ type BaseFromUsdaFasData struct {
 }
 
 func GetBaseFromUsdaFasDataByCondition(condition string, pars []interface{}) (list []*BaseFromUsdaFasData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_usda_fas_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -36,7 +36,7 @@ func GetBaseFromUsdaFasDataByCondition(condition string, pars []interface{}) (li
 
 // Add 添加
 func (obj BaseFromUsdaFas) Add(edbCode string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 
 	var condition string
 	var pars []interface{}
@@ -68,7 +68,7 @@ func (obj BaseFromUsdaFas) Add(edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info("addSql:" + addSql)
-		_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DB.Exec(addSql).Error
 		if err != nil {
 			return err
 		}
@@ -79,7 +79,7 @@ func (obj BaseFromUsdaFas) Add(edbCode string) (err error) {
 // Refresh 刷新涌益咨询指标数据
 func (obj BaseFromUsdaFas) Refresh(edbInfoId int, edbCode, startDate string) (err error) {
 	source := obj.GetSource()
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if err != nil {
 		return
 	}
@@ -177,7 +177,7 @@ func (obj BaseFromUsdaFas) Refresh(edbInfoId int, edbCode, startDate string) (er
 
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
-		_, err = o.Raw(addSql).Exec()
+		err = global.DEFAULT_DB.Exec(addSql).Error
 		if err != nil {
 			fmt.Println("RefreshEdbDataFromBaiinfo add Err", err.Error())
 			return
@@ -231,21 +231,21 @@ type BaseFromUsdaFasIndexList struct {
 }
 
 func (y *BaseFromUsdaFasData) GetByIndexCode(indexCode string) (list []*BaseFromUsdaFasData, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_usda_fas_data WHERE index_code=? `
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
 	return
 }
 
 func (y *BaseFromUsdaFasData) AddMulti(item []*BaseFromUsdaFasData) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	_, err = o.InsertMulti(1, item)
 	return
 }
 
 // Update 修改
 func (y *BaseFromUsdaFasData) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	_, err = o.Update(y, updateCols...)
 	return
 }
@@ -271,7 +271,7 @@ type HandleUsdaFasExcelDataReq struct {
 }
 
 func (y *BaseFromUsdaFasData) 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_usda_fas_data WHERE index_code=? `
 	err = o.Raw(sql, indexCode).QueryRow(&item)
 	var latest_value float64
@@ -283,21 +283,21 @@ func (y *BaseFromUsdaFasData) GetMaxAndMinDateByIndexCode(indexCode string) (ite
 }
 
 func (y *BaseFromUsdaFasIndex) ModifyIndexMaxAndMinDate(indexCode string, item *EdbInfoMaxAndMinInfo) (err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` UPDATE base_from_usda_fas_index SET start_date=?,end_date=?, end_value=?, modify_time=NOW() WHERE index_code=? `
 	_, err = o.Raw(sql, item.MinDate, item.MaxDate, item.LatestValue, indexCode).Exec()
 	return
 }
 
 func (y *BaseFromUsdaFasIndex) GetByIndexCode(indexCode string) (item *BaseFromUsdaFasIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM base_from_usda_fas_index WHERE index_code=? `
 	err = o.Raw(sql, indexCode).QueryRow(&item)
 	return
 }
 
 func (y *BaseFromUsdaFasIndex) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	lastId, err = o.Insert(y)
 	return
 }

models/base_from_zz.go

@@ -47,7 +47,7 @@ type BaseFromZzDataSimple struct {
 }
 
 func GetBaseFromZhengzhouDataAllByIndexCode(indexCode, suffix string) (list []*BaseFromTradeZhengzhouIndex, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_trade_zhengzhou_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
 	_, err = o.Raw(sql, indexCode).QueryRows(&list)
@@ -56,7 +56,7 @@ func GetBaseFromZhengzhouDataAllByIndexCode(indexCode, suffix string) (list []*B
 
 func GetZzDataByTradeCode(condition string, pars []interface{}) (item []*BaseFromZzDataSimple, err error) {
 	sql := ` SELECT * FROM base_from_trade_zhengzhou_index WHERE 1=1 `
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	if condition != "" {
 		sql += condition
 	}

models/edb_data_ly.go

@@ -2,7 +2,6 @@
 package models
 
 import (
-	"errors"
 	"eta/eta_index_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
@@ -30,7 +29,7 @@ func GetLyEdbDataByIndexCodeAndDataTime(indexCode string, dataTime string) (item
 	o := orm.NewOrm()
 	sql := `SELECT * FROM edb_data_ly WHERE index_code=? AND data_time like ?`
 	_, err = o.Raw(sql, indexCode, dataTime+"%").QueryRows(&items)
-	if errors.Is(err, orm.ErrNoRows) {
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 	return
@@ -40,7 +39,7 @@ func GetLyEdbDataByIndexCodeAndExactDataTime(indexCode string, dataTime string)
 	o := orm.NewOrm()
 	sql := `SELECT * FROM edb_data_ly WHERE edb_code=? AND data_time=?`
 	_, err = o.Raw(sql, indexCode, dataTime).QueryRows(&items)
-	if errors.Is(err, orm.ErrNoRows) {
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 	return

models/edb_data_rzd.go

@@ -2,7 +2,6 @@
 package models
 
 import (
-	"errors"
 	"eta/eta_index_lib/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
@@ -31,7 +30,7 @@ func GetRzdEdbDataByIndexCodeAndDataTime(indexCode string, dataTime string) (ite
 	o := orm.NewOrm()
 	sql := `SELECT * FROM edb_data_rzd WHERE edb_code=? AND data_time=?`
 	_, err = o.Raw(sql, indexCode, dataTime).QueryRows(&items)
-	if errors.Is(err, orm.ErrNoRows) {
+	if utils.IsErrNoRow(err) {
 		return nil, nil
 	}
 	return

models/edb_info.go

@@ -13,7 +13,6 @@ import (
 
 	"go.mongodb.org/mongo-driver/bson"
 
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
 )
 
@@ -583,7 +582,7 @@ func GetEdbInfoByEdbCode(source int, edbCode string) (item *EdbInfo, err error)
 	sql := ` SELECT * FROM edb_info WHERE source=? AND edb_code=? `
 	//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) {
+	if utils.IsErrNoRow(err) {
 		err = nil
 	}