gorm改版

models/data_manage/base_from_eia_steo.go

@@ -40,8 +40,7 @@ func AddBaseFromEiaSteoIndex(item *BaseFromEiaSteoIndex) (lastId int64, err erro
 }
 
 func InsertOrUpdateBaseFromEiaSteoIndex(item *BaseFromEiaSteoIndex) (lastId int64, err error) {
-	//o := orm.NewOrm()
-	//lastId, err = o.InsertOrUpdate(item)
+	saveItem := *item
 	o := global.DbMap[utils.DbNameIndex]
 	result := o.FirstOrCreate(item, "base_from_eia_steo_index_id = ?", item.BaseFromEiaSteoIndexId)
 	if result.Error != nil {
@@ -49,7 +48,8 @@ func InsertOrUpdateBaseFromEiaSteoIndex(item *BaseFromEiaSteoIndex) (lastId int6
 		return
 	}
 	if result.RowsAffected == 0 {
-		result = o.Save(item)
+		saveItem.BaseFromEiaSteoIndexId = 0
+		result = o.Model(item).Where("base_from_eia_steo_index_id = ?", item.BaseFromEiaSteoIndexId).Updates(saveItem)
 		if result.Error != nil {
 			err = result.Error
 			return

models/data_manage/base_from_gpr_risk.go

@@ -71,6 +71,7 @@ func (obj *BaseFromGprRiskIndex) AddBaseFromGprRiskIndex(item *BaseFromGprRiskIn
 }
 
 func (obj *BaseFromGprRiskIndex) InsertOrUpdateBaseFromGprRiskIndex(item *BaseFromGprRiskIndex) (lastId int64, err error) {
+	saveItem := *item
 	o := global.DbMap[utils.DbNameIndex]
 	result := o.FirstOrCreate(item, "base_from_gpr_risk_index_id = ?", item.BaseFromGprRiskIndexId)
 	if result.Error != nil {
@@ -78,7 +79,8 @@ func (obj *BaseFromGprRiskIndex) InsertOrUpdateBaseFromGprRiskIndex(item *BaseFr
 		return
 	}
 	if result.RowsAffected == 0 {
-		result = o.Save(item)
+		saveItem.BaseFromGprRiskIndexId = 0
+		result = o.Model(item).Where("base_from_gpr_risk_index_id = ?", item.BaseFromGprRiskIndexId).Updates(saveItem)
 		if result.Error != nil {
 			err = result.Error
 			return
@@ -108,6 +110,7 @@ func AddBaseFromGprRiskClassify(item *BaseFromGprRiskClassify) (lastId int64, er
 }
 
 func InsertOrUpdateBaseFromGprRiskClassify(item *BaseFromGprRiskClassify) (lastId int64, err error) {
+	saveItem := *item
 	o := global.DbMap[utils.DbNameIndex]
 	result := o.FirstOrCreate(item, "classify_id = ?", item.ClassifyId)
 	if result.Error != nil {
@@ -115,7 +118,8 @@ func InsertOrUpdateBaseFromGprRiskClassify(item *BaseFromGprRiskClassify) (lastI
 		return
 	}
 	if result.RowsAffected == 0 {
-		result = o.Save(item)
+		saveItem.ClassifyId = 0
+		result = o.Model(item).Where("classify_id = ?", item.ClassifyId).Updates(saveItem)
 		if result.Error != nil {
 			err = result.Error
 			return

models/data_manage/base_from_icpi.go

@@ -56,6 +56,7 @@ func (obj *BaseFromIcpiIndex) AddBaseFromIcpiIndex(item *BaseFromIcpiIndex) (las
 }
 
 func (obj *BaseFromIcpiIndex) InsertOrUpdateBaseFromIcpiIndex(item *BaseFromIcpiIndex) (lastId int64, err error) {
+	saveItem := *item
 	o := global.DbMap[utils.DbNameIndex]
 	result := o.FirstOrCreate(item, "base_from_icpi_index_id = ?", item.BaseFromIcpiIndexId)
 	if result.Error != nil {
@@ -63,7 +64,8 @@ func (obj *BaseFromIcpiIndex) InsertOrUpdateBaseFromIcpiIndex(item *BaseFromIcpi
 		return
 	}
 	if result.RowsAffected == 0 {
-		result = o.Save(item)
+		saveItem.BaseFromIcpiIndexId = 0
+		result = o.Model(item).Where("base_from_icpi_index_id = ?", item.BaseFromIcpiIndexId).Updates(saveItem)
 		if result.Error != nil {
 			err = result.Error
 			return
@@ -102,6 +104,7 @@ func AddBaseFromIcpiClassify(item *BaseFromIcpiClassify) (lastId int64, err erro
 }
 
 func InsertOrUpdateBaseFromIcpiClassify(item *BaseFromIcpiClassify) (lastId int64, err error) {
+	saveItem := *item
 	o := global.DbMap[utils.DbNameIndex]
 	result := o.FirstOrCreate(item, "base_from_icpi_classify_id = ?", item.BaseFromIcpiClassifyId)
 	if result.Error != nil {
@@ -109,7 +112,8 @@ func InsertOrUpdateBaseFromIcpiClassify(item *BaseFromIcpiClassify) (lastId int6
 		return
 	}
 	if result.RowsAffected == 0 {
-		result = o.Save(item)
+		saveItem.BaseFromIcpiClassifyId = 0
+		result = o.Model(item).Where("base_from_icpi_classify_id = ?", item.BaseFromIcpiClassifyId).Updates(saveItem)
 		if result.Error != nil {
 			err = result.Error
 			return

models/data_manage/base_from_trade_guangzhou.go

@@ -24,6 +24,7 @@ type BaseFromTradeGuangzhouIndex struct {
 }
 
 func AddBaseFromTradeGuangzhouIndex(item *BaseFromTradeGuangzhouIndex) (lastId int64, err error) {
+	saveItem := *item
 	o := global.DbMap[utils.DbNameIndex]
 	//lastId, err = o.InsertOrUpdate(item)
 	result := o.FirstOrCreate(item, "base_from_trade_guangzhou_index_id = ?", item.BaseFromTradeGuangzhouIndexId)
@@ -32,7 +33,8 @@ func AddBaseFromTradeGuangzhouIndex(item *BaseFromTradeGuangzhouIndex) (lastId i
 		return
 	}
 	if result.RowsAffected == 0 {
-		result = o.Save(item)
+		saveItem.BaseFromTradeGuangzhouIndexId = 0
+		result = o.Model(item).Where("base_from_trade_guangzhou_index_id = ?", item.BaseFromTradeGuangzhouIndexId).Updates(saveItem)
 		if result.Error != nil {
 			err = result.Error
 			return

models/data_manage/base_from_trade_shanghai.go

@@ -1,12 +1,14 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 type BaseFromTradeShanghaiIndex struct {
-	BaseFromTradeShangHaiIndexId int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	BaseFromTradeShangHaiIndexId int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey;autoIncrement"`
 	Rank                         int
 	DealShortName                string
 	DealName                     string
@@ -32,22 +34,25 @@ type BaseFromTradeShanghaiIndex struct {
 }
 
 func AddBaseFromTradeShangHaiIndex(item *BaseFromTradeShanghaiIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromTradeShangHaiIndexId)
 	return
 }
 
 func GetBaseFromTradeShangHaiIndexAll(dateStr string) (list []*BaseFromTradeShanghaiIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_trade_shanghai_index WHERE data_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func ModifyBaseFromTradeShangHaiIndex(dealValue, buyValue, soldValue int, dataId int) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `UPDATE base_from_trade_shanghai_index SET deal_value=?,buy_value=?,sold_value=?,modify_time=NOW() WHERE base_from_trade_shanghai_index_id=? `
-	_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
+	err = o.Exec(sql, dealValue, buyValue, soldValue, dataId).Error
 	return
 }
 
@@ -59,9 +64,16 @@ type ShanghaiIndexResp struct {
 	Data    []*BaseFromTradeShanghaiIndex
 }
 
-func GetBaseFromTradeShangHaiIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_shanghai_index as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+func GetBaseFromTradeShangHaiIndexMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
+	sql := ` SELECT max(a.data_time) as max_date FROM base_from_trade_shanghai_index as a `
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }

models/data_manage/base_from_trade_zhengzhou.go

@@ -1,7 +1,9 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
@@ -32,22 +34,21 @@ type BaseFromTradeZhengzhouIndex struct {
 }
 
 func AddBaseFromTradeZhengzhouIndex(item *BaseFromTradeZhengzhouIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
 func GetBaseFromTradeZhengzhouIndexAll(dateStr string) (list []*BaseFromTradeZhengzhouIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_trade_zhengzhou_index WHERE data_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func ModifyBaseFromTradeZhengzhouIndex(dealValue, buyValue, soldValue int, dataId int) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `UPDATE base_from_trade_zhengzhou_index SET deal_value=?,buy_value=?,sold_value=?,modify_time=NOW() WHERE base_from_trade_zhengzhou_index_id=? `
-	_, err = o.Raw(sql, dealValue, buyValue, soldValue, dataId).Exec()
+	err = o.Exec(sql, dealValue, buyValue, soldValue, dataId).Error
 	return
 }
 
@@ -59,9 +60,16 @@ type ZhengzhouIndexResp struct {
 	Data    []*BaseFromTradeZhengzhouIndex
 }
 
-func GetBaseFromTradeZhengzhouIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT max(a.data_time)as max_date FROM base_from_trade_zhengzhou_index as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+func GetBaseFromTradeZhengzhouIndexMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
+	sql := ` SELECT max(a.data_time) as max_date FROM base_from_trade_zhengzhou_index as a `
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }

models/data_manage/base_from_usda_fas.go

@@ -1,13 +1,15 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
 type BaseFromUsdaFasIndex struct {
-	BaseFromUsdaFasIndexId int `orm:"column(base_from_usda_fas_index_id);pk"`
+	BaseFromUsdaFasIndexId int `gorm:"column:base_from_usda_fas_index_id;primaryKey;autoIncrement"`
 	ClassifyId             int
 	IndexCode              string
 	IndexName              string
@@ -25,7 +27,7 @@ type BaseFromUsdaFasIndex struct {
 
 // BaseFromUsdaFasClassify UsdaFas原始数据分类表
 type BaseFromUsdaFasClassify struct {
-	ClassifyId      int       `orm:"column(classify_id);pk"`
+	ClassifyId      int       `gorm:"column:classify_id;primaryKey;autoIncrement"`
 	ClassifyName    string    `description:"分类名称"`
 	ParentId        int       `description:"父级id"`
 	SysUserId       int       `description:"创建人id"`
@@ -36,10 +38,17 @@ type BaseFromUsdaFasClassify struct {
 	CreateTime      time.Time `description:"创建时间"`
 }
 
-func GetBaseFromUsdaFasIndexMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT max(a.modify_time)as max_date FROM base_from_usda_fas_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+func GetBaseFromUsdaFasIndexMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
+	sql := ` SELECT max(a.modify_time) as max_date FROM base_from_usda_fas_data as a `
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }
 
@@ -52,22 +61,39 @@ type UsdaFasIndexResp struct {
 }
 
 func GetBaseFromUsdaFasIndexAll(dateStr string) (list []*BaseFromUsdaFasIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_usda_fas_index WHERE end_date>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 func (obj *BaseFromUsdaFasIndex) AddBaseFromUsdaFasIndex(item *BaseFromUsdaFasIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromUsdaFasIndexId)
 	return
 }
 
 func (obj *BaseFromUsdaFasIndex) InsertOrUpdateBaseFromUsdaFasIndex(item *BaseFromUsdaFasIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertOrUpdate(item)
-	return
+	saveItem := *item
+	o := global.DbMap[utils.DbNameIndex]
+	//lastId, err = o.InsertOrUpdate(item)
+	result := o.FirstOrCreate(item, "base_from_usda_fas_index_id = ?", item.BaseFromUsdaFasIndexId)
+	if result.Error != nil {
+		err = result.Error
+		return
+	}
+	if result.RowsAffected == 0 {
+		saveItem.BaseFromUsdaFasIndexId = 0
+		result = o.Model(item).Where("base_from_usda_fas_index_id = ?", item.BaseFromUsdaFasIndexId).Updates(saveItem)
+		if result.Error != nil {
+			err = result.Error
+			return
+		}
+	}
+	return int64(item.BaseFromUsdaFasIndexId), nil
 }
 
 type UsdaFasClassifyResp struct {
@@ -79,29 +105,53 @@ type UsdaFasClassifyResp struct {
 }
 
 func GetBaseFromUsdaFasClassifyAll() (list []*BaseFromUsdaFasClassify, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_usda_fas_classify `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 func AddBaseFromUsdaFasClassify(item *BaseFromUsdaFasClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.ClassifyId)
 	return
 }
 
 func InsertOrUpdateBaseFromUsdaFasClassify(item *BaseFromUsdaFasClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertOrUpdate(item)
-	return
+	saveItem := *item
+	o := global.DbMap[utils.DbNameIndex]
+	//lastId, err = o.InsertOrUpdate(item)
+	result := o.FirstOrCreate(item, "classify_id = ?", item.ClassifyId)
+	if result.Error != nil {
+		err = result.Error
+		return
+	}
+	if result.RowsAffected == 0 {
+		saveItem.ClassifyId = 0
+		result = o.Model(item).Where("classify_id = ?", item.ClassifyId).Updates(saveItem)
+		if result.Error != nil {
+			err = result.Error
+			return
+		}
+	}
+	return int64(item.ClassifyId), nil
 }
 
-// GetBaseFromComTradeMaxDate 获取UsdaFas消费者指数最大数据
-func GetBaseFromUsdaFasMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT max(a.modify_time)as max_date FROM base_from_usda_fas_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+// GetBaseFromUsdaFasMaxDate 获取UsdaFas消费者指数最大数据
+func GetBaseFromUsdaFasMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
+	sql := ` SELECT max(a.modify_time) as max_date FROM base_from_usda_fas_data as a `
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }
 
@@ -115,11 +165,11 @@ type BaseFromUsdaFasData struct {
 	ModifyTime             time.Time `description:"修改时间"`
 }
 
-// GetAllComTradeDataList 获取UsdaFas消费者指数数据
+// GetAllBaseFromUsdaFasDataList 获取UsdaFas消费者指数数据
 func GetAllBaseFromUsdaFasDataList(startDate string) (list []*BaseFromUsdaFasData, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_usda_fas_data WHERE modify_time>=?  ORDER BY base_from_usda_fas_data_id ASC `
-	_, err = o.Raw(sql, startDate).QueryRows(&list)
+	err = o.Raw(sql, startDate).Find(&list).Error
 	return
 }
 
@@ -131,20 +181,19 @@ type BaseFromUsdaFasDataResp struct {
 	Data    BaseFromUsdaFasDataIndexAndDataResp
 }
 
-// ComTradeIndexDataResp 分页列表响应体
+// BaseFromUsdaFasDataIndexAndDataResp 分页列表响应体
 type BaseFromUsdaFasDataIndexAndDataResp struct {
 	List   []*BaseFromUsdaFasData
 	Paging *paging.PagingItem `description:"分页数据"`
 }
 
-// MultiAddBaseFromComTradeData 批量添加数据
+// MultiAddBaseFromUsdaFasDataIndex 批量添加数据
 func MultiAddBaseFromUsdaFasDataIndex(items []*BaseFromUsdaFasData) (lastId int64, err error) {
 	num := len(items)
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
-	lastId, err = o.InsertMulti(num, items)
-
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }

models/data_manage/business_sys_interaction_log.go

@@ -1,7 +1,8 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
@@ -39,21 +40,13 @@ var BusinessSysInteractionLogColumns = struct {
 
 // Create 添加数据
 func (m *BusinessSysInteractionLog) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.ID = uint32(id)
-
+	err = global.DbMap[utils.DbNameIndex].Create(m).Error
 	return
 }
 
 // Update 更新数据
 func (m *BusinessSysInteractionLog) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
-
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(m).Error
 	return
 }
 
@@ -63,8 +56,8 @@ var CrmIndexLastUpdateTime = "crm_index_update_time" // crm数据
 
 // GetBusinessSysInteractionLogByKey 根据记录key获取数据
 func GetBusinessSysInteractionLogByKey(key string) (item *BusinessSysInteractionLog, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM business_sys_interaction_log WHERE 1=1 AND interaction_key = ? LIMIT 1`
-	err = o.Raw(sql, key).QueryRow(&item)
+	err = o.Raw(sql, key).First(&item).Error
 	return
 }

models/data_manage/chart_edb_mapping.go

@@ -1,12 +1,13 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 type ChartEdbMapping struct {
-	ChartEdbMappingId int       `orm:"column(chart_edb_mapping_id);pk"`
+	ChartEdbMappingId int       `gorm:"column:chart_edb_mapping_id;primaryKey;autoIncrement"`
 	ChartInfoId       int       `description:"图表id"`
 	EdbInfoId         int       `description:"指标id"`
 	CreateTime        time.Time `description:"创建时间"`
@@ -33,17 +34,17 @@ type ChartEdbMapping struct {
 }
 
 func GetChartEdbMappingTotal() (total int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT COUNT(1) AS count FROM chart_edb_mapping `
-	err = o.Raw(sql).QueryRow(&total)
+	err = o.Raw(sql).Scan(&total).Error
 	return
 }
 
 func GetChartEdbMappingList(startSize, pageSize int) (items []*ChartEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM chart_edb_mapping WHERE 1=1 `
 	sql += " LIMIT ?,? "
-	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, startSize, pageSize).Find(&items).Error
 	return
 }
 
@@ -104,12 +105,12 @@ type ChartEdbInfoMapping struct {
 }
 
 func GetRelationEdbInfoListMappingByCondition(condition string, pars []interface{}) (item []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT a.* FROM edb_info AS a 
 	JOIN edb_info_calculate_mapping AS b on a.edb_info_id = b.edb_info_id WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = o.Raw(sql, pars...).Find(&item).Error
 	return
 }

models/data_manage/chart_info.go

@@ -1,13 +1,13 @@
 package data_manage
 
 import (
+	"eta/eta_task/global"
 	"eta/eta_task/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 type ChartInfo struct {
-	ChartInfoId     int    `orm:"column(chart_info_id);pk"`
+	ChartInfoId     int    `gorm:"column:chart_info_id;primaryKey;autoIncrement"`
 	ChartName       string `description:"来源名称"`
 	ChartClassifyId int    `description:"图表分类id"`
 	SysUserId       int
@@ -32,33 +32,33 @@ type ChartInfo struct {
 }
 
 func GetAllChartInfo() (list []*ChartInfo, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM chart_info  `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 func GetChartInfoEdbEndDate() (list []*ChartInfo, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT a.*,max(c.end_date) AS edb_end_date FROM  chart_info  AS a
 			INNER JOIN chart_edb_mapping AS b ON a.chart_info_id=b.chart_info_id
 			INNER JOIN edb_info AS c ON b.edb_info_id=c.edb_info_id
 			GROUP BY a.chart_info_id  `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 func ModifyChartInfoEdbEndDate(chartInfoId int, edbEndDate string) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` UPDATE chart_info SET edb_end_date=? WHERE chart_info_id=? `
-	_, err = o.Raw(sql, edbEndDate, chartInfoId).Exec()
+	err = o.Exec(sql, edbEndDate, chartInfoId).Error
 	return
 }
 
 // 根据chart_info_id数组获取图表信息
 func GetChartInfoByChartInfoIds(chartInfoIds []int) (list []*ChartInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM chart_info  WHERE chart_info_id IN (` + utils.GetOrmInReplace(len(chartInfoIds)) + `) `
-	_, err = o.Raw(sql, chartInfoIds).QueryRows(&list)
+	err = o.Raw(sql, chartInfoIds).Find(&list).Error
 	return
 }

models/data_manage/com_trade_data.go

@@ -1,13 +1,15 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	sql2 "database/sql"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"time"
 )
 
 // ComTradeData 联合国商品贸易数据表
 type ComTradeData struct {
-	ComTradeDataId     int       `orm:"column(com_trade_data_id);pk"`
+	ComTradeDataId     int       `gorm:"column:com_trade_data_id;primaryKey;autoIncrement"`
 	ComTradeId         int       `description:"指标id"`
 	IndexCode          string    `description:"联合国商品贸易编码"`
 	Flow               string    `description:"贸易流向：X（Export：出口）；M（Import：进口）"`
@@ -29,17 +31,19 @@ type ComTradeData struct {
 
 // GetAllComTradeDataList 获取联合国商品贸易数据列表
 func GetAllComTradeDataList(startDate string) (list []*ComTradeData, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM com_trade_data WHERE create_time>=?  ORDER BY com_trade_data_id ASC `
-	_, err = o.Raw(sql, startDate).QueryRows(&list)
-
+	err = o.Raw(sql, startDate).Find(&list).Error
 	return
 }
 
 // AddBaseFromComTradeData 添加数据
 func AddBaseFromComTradeData(item *ComTradeData) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.ComTradeDataId)
 	return
 }
 
@@ -49,16 +53,22 @@ func MultiAddBaseFromComTradeData(items []*ComTradeData) (lastId int64, err erro
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrm()
-	lastId, err = o.InsertMulti(num, items)
-
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 // GetBaseFromComTradeMaxDate 获取un数据中的最大日期数据
-func GetBaseFromComTradeMaxDate() (max_date time.Time, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT max(a.create_time)as max_date FROM com_trade_data as a `
-	err = o.Raw(sql).QueryRow(&max_date)
+func GetBaseFromComTradeMaxDate() (maxDate time.Time, err error) {
+	o := global.DbMap[utils.DbNameIndex]
+	sql := ` SELECT max(a.create_time) as max_date FROM com_trade_data as a `
+	var timeNull sql2.NullTime
+	err = o.Raw(sql).Scan(&timeNull).Error
+	if err != nil {
+		return
+	}
+	if timeNull.Valid {
+		maxDate = timeNull.Time
+	}
 	return
 }

models/data_manage/com_trade_index.go

@@ -1,14 +1,15 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_task/global"
+	"eta/eta_task/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
 // ComTradeIndex 联合国商品贸易数据指标表
 type ComTradeIndex struct {
-	ComTradeId  int       `orm:"column(com_trade_id);pk"`
+	ComTradeId  int       `gorm:"column:com_trade_id;primaryKey;autoIncrement"`
 	IndexCode   string    `description:"联合国商品贸易编码"`
 	IndexName   string    `description:"联合国商品名称"`
 	IndexNameCn string    `description:"联合国商品名称（中文）"`
@@ -18,24 +19,22 @@ type ComTradeIndex struct {
 
 // GetAllComTradeIndexList 获取指标数据列表
 func GetAllComTradeIndexList(startDate string) (list []*ComTradeIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM com_trade_index WHERE create_time>=?  ORDER BY com_trade_id DESC `
-	_, err = o.Raw(sql, startDate).QueryRows(&list)
-
+	err = o.Raw(sql, startDate).Find(&list).Error
 	return
 }
 
 func GetBaseFromComTradeCodeMappingAll(dateStr string) (list []*BaseFromEiaSteoIndex, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM com_trade_index WHERE create_time>=?`
-	_, err = o.Raw(sql, dateStr).QueryRows(&list)
+	err = o.Raw(sql, dateStr).Find(&list).Error
 	return
 }
 
 // AddBaseFromComTradeIndex 添加新的指标
 func AddBaseFromComTradeIndex(item *ComTradeIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }
 
@@ -50,17 +49,15 @@ type ComTradeCodeMapping struct {
 
 // GetAllComTradeCodeMappingList 获取联合国商品贸易数据指标编码与分类编码的关系列表
 func GetAllComTradeCodeMappingList(startDate string) (list []*ComTradeCodeMapping, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM com_trade_code_mapping WHERE create_time>=?  ORDER BY create_time ASC `
-	_, err = o.Raw(sql, startDate).QueryRows(&list)
-
+	err = o.Raw(sql, startDate).Find(&list).Error
 	return
 }
 
 // AddBaseFromComTradeCodeMapping 添加联合国商品贸易数据指标编码与分类编码的关系
 func AddBaseFromComTradeCodeMapping(item *ComTradeCodeMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
 	return
 }