改成gorm

models/data_manage/edb_info_calculate.go

@@ -1,12 +1,13 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
 
 	"strings"
 	"time"
 
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
@@ -31,7 +32,7 @@ type EdbInfoFromTag struct {
 }
 
 type EdbInfoCalculate struct {
-	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk"`
+	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk" gorm:"primaryKey"`
 	EdbInfoId          int       `description:"指标id"`
 	EdbCode            string    `description:"指标编码"`
 	FromEdbInfoId      int       `description:"计算指标id"`
@@ -46,8 +47,8 @@ type EdbInfoCalculate struct {
 }
 
 func AddEdbInfoCalculateMulti(items []*EdbInfoCalculate) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(1, items)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
@@ -58,7 +59,7 @@ type FromEdbInfoData struct {
 }
 
 type EdbInfoCalculateDetail struct {
-	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk"`
+	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk" gorm:"primaryKey"`
 	EdbInfoId          int       `description:"指标id"`
 	EdbCode            string    `description:"指标编码"`
 	FromEdbInfoId      int       `description:"计算指标id"`
@@ -84,7 +85,7 @@ type EdbInfoCalculateDetail struct {
 }
 
 func GetEdbInfoCalculateDetail(edbInfoId, source int) (list []*EdbInfoCalculateDetail, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 
 	//calculateTableName := GetEdbInfoCalculateTableName(source)
 	//sql := ` SELECT a.*,b.start_date,b.end_date,b.edb_type FROM %s AS a
@@ -97,7 +98,7 @@ func GetEdbInfoCalculateDetail(edbInfoId, source int) (list []*EdbInfoCalculateD
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? ORDER BY sort ASC `
 
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&list)
+	err = o.Raw(sql, edbInfoId).Find(&list).Error
 	return
 }
 
@@ -120,21 +121,21 @@ type EdbInfoCalculateEditReq struct {
 }
 
 func GetCalculateEdbInfo(edbInfoId int) (from_edb_info_id string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT GROUP_CONCAT(from_edb_info_id ORDER BY sort ASC SEPARATOR ',') AS from_edb_info_id 
 			FROM edb_info_calculate_mapping
 			WHERE edb_info_id=?
 			GROUP BY edb_info_id
 			 `
-	err = o.Raw(sql, edbInfoId).QueryRow(&from_edb_info_id)
+	err = o.Raw(sql, edbInfoId).Scan(&from_edb_info_id).Error
 	return
 }
 
 func DeleteCalculateEdbInfo(edbInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
+	o := global.DbMap[utils.DbNameIndex]
+	to := o.Begin()
+	if to.Error != nil {
+		return to.Error
 	}
 	defer func() {
 		if err != nil {
@@ -144,19 +145,19 @@ func DeleteCalculateEdbInfo(edbInfoId int) (err error) {
 		}
 	}()
 	sql := `DELETE FROM edb_data_calculate WHERE edb_info_id=?`
-	_, err = to.Raw(sql, edbInfoId).Exec()
+	err = to.Exec(sql, edbInfoId).Error
 	if err != nil {
 		return
 	}
 	sql = `DELETE FROM edb_info_calculate_mapping WHERE edb_info_id=?`
-	_, err = to.Raw(sql, edbInfoId).Exec()
+	err = to.Exec(sql, edbInfoId).Error
 	return
 }
 
 func DeleteCalculateData(edbInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `DELETE FROM edb_data_calculate WHERE edb_info_id=?`
-	_, err = o.Raw(sql, edbInfoId).Exec()
+	err = o.Exec(sql, edbInfoId).Error
 	return
 }
 
@@ -276,7 +277,7 @@ type EdbInfoCalculateBatchEditReqByEdbLib struct {
 }
 
 func GetEdbInfoCalculateMap(edbInfoId, source int) (list []*EdbInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 
 	//calculateTableName := GetEdbInfoCalculateTableName(source)
 
@@ -289,7 +290,7 @@ func GetEdbInfoCalculateMap(edbInfoId, source int) (list []*EdbInfo, err error)
 	sql := ` SELECT b.* FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? ORDER BY sort ASC `
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&list)
+	err = o.Raw(sql, edbInfoId).Find(&list).Error
 	return
 }
 

models/data_manage/edb_info_calculate_mapping.go

@@ -1,15 +1,14 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // EdbInfoCalculateMapping 计算指标于基础指标，关系表
 type EdbInfoCalculateMapping struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
+	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk" gorm:"primaryKey"`
 	EdbInfoId                 int       `description:"计算指标id"`
 	Source                    int       `description:"计算指标来源"`
 	SourceName                string    `description:"计算指标来源名称"`
@@ -26,26 +25,26 @@ type EdbInfoCalculateMapping struct {
 }
 
 func (e *EdbInfoCalculateMapping) Insert() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Insert(e)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Create(e).Error
 	return
 }
 
 func AddEdbInfoCalculateMappingMulti(items []*EdbInfoCalculateMapping) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(1, items)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 func GetEdbInfoCalculateMappingCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT COUNT(1) AS count FROM edb_info_calculate_mapping WHERE from_edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&count)
+	err = o.Raw(sql, edbInfoId).Scan(&count).Error
 	return
 }
 
 type EdbInfoCalculateMappingView struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
+	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk" gorm:"primaryKey"`
 	EdbInfoId                 int       `description:"计算指标id"`
 	Source                    int       `description:"计算指标来源"`
 	SourceName                string    `description:"计算指标来源名称"`
@@ -67,18 +66,18 @@ type EdbInfoCalculateMappingView struct {
 }
 
 func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMappingView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT a.*,b.start_date,b.end_date,b.calculate_formula,b.move_type,b.move_frequency FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = o.Raw(sql, edbInfoId).First(&item).Error
 	return
 }
 
 // EdbInfoCalculateMappingInfo
 // @Description: 计算指标与基础指标关系表
 type EdbInfoCalculateMappingInfo struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
+	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk" gorm:"primaryKey"`
 	EdbInfoId                 int       `description:"计算指标id"`
 	Source                    int       `description:"计算指标来源"`
 	SourceName                string    `description:"计算指标来源名称"`
@@ -101,27 +100,27 @@ type EdbInfoCalculateMappingInfo struct {
 }
 
 func (e *EdbInfoCalculateMappingInfo) Insert() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Insert(e)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Create(e).Error
 	return
 }
 
 // GetEdbInfoCalculateMappingListByEdbInfoId 根据生成的指标id获取来源的指标id列表
 func GetEdbInfoCalculateMappingListByEdbInfoId(edbInfoId int) (items []*EdbInfoCalculateMappingInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT a.*,b.edb_type as from_edb_type,b.edb_info_type as from_edb_info_type, b.unique_code AS from_unique_code, b.classify_id AS from_classify_id,b.no_update FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
+	err = o.Raw(sql, edbInfoId).Find(&items).Error
 	return
 }
 
 // GetEdbInfoCalculateMappingListByEdbInfoIds 根据生成的指标id获取来源的指标id列表
 func GetEdbInfoCalculateMappingListByEdbInfoIds(edbInfoIds []int) (items []*EdbInfoCalculateMappingInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT a.*,b.edb_type as from_edb_type,b.edb_info_type as from_edb_info_type, b.unique_code AS from_unique_code, b.classify_id AS from_classify_id,b.no_update FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id in (` + utils.GetOrmInReplace(len(edbInfoIds)) + `) `
-	_, err = o.Raw(sql, edbInfoIds).QueryRows(&items)
+	err = o.Raw(sql, edbInfoIds).Find(&items).Error
 	return
 }

models/data_manage/edb_info_log.go

@@ -1,12 +1,13 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
 type EdbInfoLog struct {
-	EdbInfoLogId    int `orm:"column(edb_info_log_id);pk"`
+	EdbInfoLogId    int `orm:"column(edb_info_log_id);pk" gorm:"primaryKey"`
 	EdbInfoId       int
 	SourceName      string `description:"来源名称"`
 	Source          int    `description:"来源id"`
@@ -22,7 +23,8 @@ type EdbInfoLog struct {
 }
 
 func AddEdbInfoLog(item *EdbInfoLog) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Create(item).Error
+	lastId = int64(item.EdbInfoLogId)
 	return
 }

models/data_manage/edb_info_no_permission_admin.go

@@ -1,69 +1,71 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
 // EdbInfoNoPermissionAdmin 指标不可见用户配置表
 type EdbInfoNoPermissionAdmin struct {
-	Id         int `orm:"column(id);pk"`
+	Id         int `orm:"column(id);pk" gorm:"primaryKey"`
 	EdbInfoId  int `orm:"column(edb_info_id);"`
 	AdminId    int `orm:"column(admin_id);"`
 	CreateTime time.Time
 }
 
 func AddEdbInfoNoPermissionAdmin(item *EdbInfoNoPermissionAdmin) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Create(item).Error
+	lastId = int64(item.Id)
 	return
 }
 
 // GetAllListByEdbInfoId 根据指标id获取所有的配置
 func (item EdbInfoNoPermissionAdmin) GetAllListByEdbInfoId(edbInfoId int) (items []*EdbInfoNoPermissionAdmin, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM edb_info_no_permission_admin WHERE edb_info_id = ? ORDER BY create_time desc`
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
+	err = o.Raw(sql, edbInfoId).Find(&items).Error
 	return
 }
 
 // GetAllListByAdminId 根据用户id获取该用户的所有配置
 func (item EdbInfoNoPermissionAdmin) GetAllListByAdminId(adminId int) (items []*EdbInfoNoPermissionAdmin, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM edb_info_no_permission_admin WHERE admin_id = ? ORDER BY create_time desc`
-	_, err = o.Raw(sql, adminId).QueryRows(&items)
+	err = o.Raw(sql, adminId).Find(&items).Error
 	return
 }
 
 // GetByEdbInfoIdAndAdminId 根据用户id和指标id获取配置
 func (item EdbInfoNoPermissionAdmin) GetByEdbInfoIdAndAdminId(adminId, edbInfoId int) (info *EdbInfoNoPermissionAdmin, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM edb_info_no_permission_admin WHERE admin_id = ? AND edb_info_id = ? ORDER BY create_time desc`
-	err = o.Raw(sql, adminId, edbInfoId).QueryRow(&info)
+	err = o.Raw(sql, adminId, edbInfoId).First(&info).Error
 	return
 }
 
 // DeleteAllByEdbInfoId 根据指标id删除所有的配置
 func (item EdbInfoNoPermissionAdmin) DeleteAllByEdbInfoId(edbInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `DELETE FROM edb_info_no_permission_admin WHERE edb_info_id = ? `
-	_, err = o.Raw(sql, edbInfoId).Exec()
+	err = o.Exec(sql, edbInfoId).Error
 	return
 }
 
 // DeleteByEdbInfoIdAndAdminId 根据指标id和用户id删除配置
 func (item EdbInfoNoPermissionAdmin) DeleteByEdbInfoIdAndAdminId(edbInfoId, adminId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `DELETE FROM edb_info_no_permission_admin WHERE edb_info_id = ? AND admin_id = ? `
-	_, err = o.Raw(sql, edbInfoId, adminId).Exec()
+	err = o.Exec(sql, edbInfoId, adminId).Error
 	return
 }
 
 // ModifyByEdbInfoId 根据指标id和用户ID列表 重新配置
 func (item EdbInfoNoPermissionAdmin) ModifyByEdbInfoId(edbInfoId int, adminIdList []int) (err error) {
-	to, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
+	to := global.DbMap[utils.DbNameIndex].Begin()
+	if to.Error != nil {
+		return to.Error
 	}
 	defer func() {
 		if err != nil {
@@ -73,7 +75,7 @@ func (item EdbInfoNoPermissionAdmin) ModifyByEdbInfoId(edbInfoId int, adminIdLis
 		}
 	}()
 	sql := `DELETE FROM edb_info_no_permission_admin WHERE edb_info_id = ? `
-	_, err = to.Raw(sql, edbInfoId).Exec()
+	err = to.Exec(sql, edbInfoId).Error
 	if err != nil {
 		return
 	}
@@ -88,16 +90,16 @@ func (item EdbInfoNoPermissionAdmin) ModifyByEdbInfoId(edbInfoId int, adminIdLis
 		})
 	}
 	if len(insertArr) > 0 {
-		_, err = to.InsertMulti(len(insertArr), insertArr)
+		err = to.CreateInBatches(insertArr, utils.MultiAddNum).Error
 	}
 	return
 }
 
 // AddByEdbInfoId 根据指标id和用户ID列表 添加配置
 func (item EdbInfoNoPermissionAdmin) AddByEdbInfoId(edbInfoId int, adminIdList []int) (err error) {
-	to, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
+	to := global.DbMap[utils.DbNameIndex].Begin()
+	if to.Error != nil {
+		return to.Error
 	}
 	defer func() {
 		if err != nil {
@@ -109,7 +111,7 @@ func (item EdbInfoNoPermissionAdmin) AddByEdbInfoId(edbInfoId int, adminIdList [
 
 	var items []*EdbInfoNoPermissionAdmin
 	sql := `SELECT * FROM edb_info_no_permission_admin WHERE edb_info_id = ? ORDER BY create_time desc`
-	_, err = to.Raw(sql, edbInfoId).QueryRows(&items)
+	err = to.Raw(sql, edbInfoId).Find(&items).Error
 	if err != nil {
 		return
 	}
@@ -131,7 +133,7 @@ func (item EdbInfoNoPermissionAdmin) AddByEdbInfoId(edbInfoId int, adminIdList [
 		}
 	}
 	if len(insertArr) > 0 {
-		_, err = to.InsertMulti(len(insertArr), insertArr)
+		err = to.CreateInBatches(insertArr, utils.MultiAddNum).Error
 	}
 	return
 }
@@ -143,20 +145,20 @@ type NoPermissionChart struct {
 
 // GetAllChartListByAdminId 根据用户id获取该用户的所有配置
 func (item EdbInfoNoPermissionAdmin) GetAllChartListByAdminId(adminId int) (items []*NoPermissionChart, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT a.admin_id,b.chart_info_id FROM edb_info_no_permission_admin AS a 
 			JOIN chart_edb_mapping AS b ON a.edb_info_id=b. edb_info_id
 			WHERE a.admin_id = ? ORDER BY a.create_time desc `
-	_, err = o.Raw(sql, adminId).QueryRows(&items)
+	err = o.Raw(sql, adminId).Find(&items).Error
 	return
 }
 
 // GetChartByEdbInfoIdAndAdminId 根据用户id和指标id获取配置
 func (item EdbInfoNoPermissionAdmin) GetChartByEdbInfoIdAndAdminId(adminId, edbInfoId int) (info *NoPermissionChart, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT a.admin_id,b.chart_info_id FROM edb_info_no_permission_admin AS a 
 			JOIN chart_edb_mapping AS b ON a.edb_info_id=b. edb_info_id
 			WHERE a.admin_id = ? AND a.edb_info_id = ? ORDER BY a.create_time desc`
-	err = o.Raw(sql, adminId, edbInfoId).QueryRow(&info)
+	err = o.Raw(sql, adminId, edbInfoId).First(&info).Error
 	return
 }

models/data_manage/edb_info_record.go

@@ -1,13 +1,13 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type EdbInfoRecord struct {
-	EdbInfoRecordId     int       `orm:"column(edb_info_record_id);pk"`
+	EdbInfoRecordId     int       `orm:"column(edb_info_record_id);pk" gorm:"primaryKey"`
 	EdbInfoId           int       `orm:"column(edb_info_id)"`
 	OldEdbName          string    `description:"旧的指标名称"`
 	OldFrequency        string    `description:"旧的频率"`
@@ -22,7 +22,7 @@ type EdbInfoRecord struct {
 }
 
 func AddEditEdbInfoRcord(edbRecord *EdbInfoRecord) (e error) {
-	o := orm.NewOrmUsingDB("data")
-	_, e = o.Insert(edbRecord)
+	o := global.DbMap[utils.DbNameIndex]
+	e = o.Create(edbRecord).Error
 	return
 }

models/data_manage/edb_info_relation.go

@@ -1,14 +1,15 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 type EdbInfoRelation struct {
-	EdbInfoRelationId  int       `orm:"column(edb_info_relation_id);pk"`
+	EdbInfoRelationId  int       `orm:"column(edb_info_relation_id);pk" gorm:"primaryKey"`
 	EdbInfoId          int       `description:"指标id"`
 	Source             int       `description:"来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,9:手工指标,10:隆众"`
 	EdbName            string    `description:"指标名称"`
@@ -32,41 +33,41 @@ func (e *EdbInfoRelation) TableName() string {
 
 // GetEdbInfoRelationByRelationIds 查询引用的指标ID
 func GetEdbInfoRelationByRelationIds(ids []int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	msql := ` SELECT * FROM edb_info_relation WHERE edb_info_relation_id in (` + utils.GetOrmInReplace(len(ids)) + `) `
-	_, err = o.Raw(msql, ids).QueryRows(&items)
+	err = o.Raw(msql, ids).Find(&items).Error
 	return
 }
 
 // GetEdbInfoRelationByReferObjectId 查询直接引用的指标ID
 func GetEdbInfoRelationByReferObjectId(referObjectId int, referObjectType int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	msql := ` SELECT * FROM edb_info_relation WHERE refer_object_id =? and relation_type=0 AND refer_object_type=?  GROUP BY edb_info_id `
-	_, err = o.Raw(msql, referObjectId, referObjectType).QueryRows(&items)
+	err = o.Raw(msql, referObjectId, referObjectType).Find(&items).Error
 	return
 }
 
 // GetEdbInfoRelationByReferObjectIds 查询引用的指标ID
 func GetEdbInfoRelationByReferObjectIds(referObjectIds []int, referObjectType int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	msql := ` SELECT * FROM edb_info_relation WHERE refer_object_id in (` + utils.GetOrmInReplace(len(referObjectIds)) + `) AND refer_object_type=? and relation_type=0`
-	_, err = o.Raw(msql, referObjectIds, referObjectType).QueryRows(&items)
+	err = o.Raw(msql, referObjectIds, referObjectType).Find(&items).Error
 	return
 }
 
 // GetEdbInfoRelationAllByReferObjectIds 查询引用的指标ID
 func GetEdbInfoRelationAllByReferObjectIds(referObjectIds []int, referObjectType int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	msql := ` SELECT * FROM edb_info_relation WHERE refer_object_id in (` + utils.GetOrmInReplace(len(referObjectIds)) + `) AND refer_object_type=?`
-	_, err = o.Raw(msql, referObjectIds, referObjectType).QueryRows(&items)
+	err = o.Raw(msql, referObjectIds, referObjectType).Find(&items).Error
 	return
 }
 
 // 新增记录
 func AddOrUpdateEdbInfoRelation(objectId, objectType int, relationList []*EdbInfoRelation, deleteEdbInfoIds []int, refreshEdbInfoIds []int, indexCodeList []string) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
+	o := global.DbMap[utils.DbNameIndex].Begin()
+	if o.Error != nil {
+		return o.Error
 	}
 	defer func() {
 		if err != nil {
@@ -78,13 +79,13 @@ func AddOrUpdateEdbInfoRelation(objectId, objectType int, relationList []*EdbInf
 
 	if len(deleteEdbInfoIds) > 0 {
 		sql := ` DELETE FROM edb_info_relation WHERE refer_object_id = ? AND refer_object_type=? AND edb_info_id in (` + utils.GetOrmInReplace(len(deleteEdbInfoIds)) + `) AND relation_type=0`
-		_, err = o.Raw(sql, objectId, objectType, deleteEdbInfoIds).Exec()
+		err = o.Exec(sql, objectId, objectType, deleteEdbInfoIds).Error
 		if err != nil {
 			return
 		}
 		// 同时删除相关连的间接引用的指标ID
 		sql = ` DELETE FROM edb_info_relation WHERE refer_object_id = ? AND refer_object_type=? AND root_edb_info_id in (` + utils.GetOrmInReplace(len(deleteEdbInfoIds)) + `) AND relation_type=1 `
-		_, err = o.Raw(sql, objectId, objectType, deleteEdbInfoIds).Exec()
+		err = o.Exec(sql, objectId, objectType, deleteEdbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -96,7 +97,7 @@ func AddOrUpdateEdbInfoRelation(objectId, objectType int, relationList []*EdbInf
 				relationCodesMap[relation.RelationCode] = struct{}{}
 			}
 		}
-		_, err = o.InsertMulti(len(relationList), relationList)
+		err = o.CreateInBatches(relationList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -105,7 +106,7 @@ func AddOrUpdateEdbInfoRelation(objectId, objectType int, relationList []*EdbInf
 	if len(refreshEdbInfoIds) > 0 {
 		//todo 是否需要所有指标的刷新状态
 		sql := ` UPDATE edb_info SET no_update = 0, set_update_time=? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) `
-		_, err = o.Raw(sql, time.Now(), refreshEdbInfoIds).Exec()
+		err = o.Exec(sql, time.Now(), refreshEdbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -115,7 +116,7 @@ func AddOrUpdateEdbInfoRelation(objectId, objectType int, relationList []*EdbInf
 	if len(indexCodeList) > 0 {
 		// 更改数据源的更新状态
 		sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = 0 WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodeList)) + `) and is_stop=1`
-		_, err = o.Raw(sql, indexCodeList).Exec()
+		err = o.Exec(sql, indexCodeList).Error
 		if err != nil {
 			return
 		}
@@ -134,7 +135,7 @@ SET e1.parent_relation_id = e2.edb_info_relation_id
 WHERE  
     e1.relation_type = 1   
     AND e2.relation_type = 0 AND e1.parent_relation_id !=e2.edb_info_relation_id AND e1.relation_code in (` + utils.GetOrmInReplace(len(relationCodes)) + `)`
-			_, err = o.Raw(sql, relationCodes).Exec()
+			err = o.Exec(sql, relationCodes).Error
 			if err != nil {
 				return
 			}
@@ -145,9 +146,9 @@ WHERE
 
 // 新增记录
 func AddOrUpdateEdbInfoRelationMulti(relationList []*EdbInfoRelation, refreshEdbInfoIds []int, indexCodeList []string) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
+	o := global.DbMap[utils.DbNameIndex].Begin()
+	if o.Error != nil {
+		return o.Error
 	}
 	defer func() {
 		if err != nil {
@@ -164,7 +165,7 @@ func AddOrUpdateEdbInfoRelationMulti(relationList []*EdbInfoRelation, refreshEdb
 				relationCodesMap[relation.RelationCode] = struct{}{}
 			}
 		}
-		_, err = o.InsertMulti(len(relationList), relationList)
+		err = o.CreateInBatches(relationList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -173,7 +174,7 @@ func AddOrUpdateEdbInfoRelationMulti(relationList []*EdbInfoRelation, refreshEdb
 	if len(refreshEdbInfoIds) > 0 {
 		// todo 更新指标的刷新状态
 		sql := ` UPDATE edb_info SET no_update = 0, set_update_time=? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) `
-		_, err = o.Raw(sql, time.Now(), refreshEdbInfoIds).Exec()
+		err = o.Exec(sql, time.Now(), refreshEdbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -183,7 +184,7 @@ func AddOrUpdateEdbInfoRelationMulti(relationList []*EdbInfoRelation, refreshEdb
 	if len(indexCodeList) > 0 {
 		// 更改数据源的更新状态
 		sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = 0 WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodeList)) + `) and is_stop=1`
-		_, err = o.Raw(sql, indexCodeList).Exec()
+		err = o.Exec(sql, indexCodeList).Error
 		if err != nil {
 			return
 		}
@@ -202,7 +203,7 @@ SET e1.parent_relation_id = e2.edb_info_relation_id
 WHERE  
     e1.relation_type = 1   
     AND e2.relation_type = 0 AND e1.parent_relation_id !=e2.edb_info_relation_id AND e1.relation_code in (` + utils.GetOrmInReplace(len(relationCodes)) + `)`
-			_, err = o.Raw(sql, relationCodes).Exec()
+			err = o.Exec(sql, relationCodes).Error
 			if err != nil {
 				return
 			}
@@ -213,17 +214,17 @@ WHERE
 
 // 删除指标引用内容
 func DeleteEdbRelationByObjectIds(referObjectIds []int, referObjectType int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` DELETE FROM edb_info_relation WHERE refer_object_id in (` + utils.GetOrmInReplace(len(referObjectIds)) + `) AND refer_object_type=?`
-	_, err = o.Raw(sql, referObjectIds, referObjectType).Exec()
+	err = o.Exec(sql, referObjectIds, referObjectType).Error
 	return
 }
 
 // DeleteEdbRelationByObjectId 删除指标引用内容
 func DeleteEdbRelationByObjectId(referObjectId int, referObjectType int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` DELETE FROM edb_info_relation WHERE refer_object_id =? AND refer_object_type=?`
-	_, err = o.Raw(sql, referObjectId, referObjectType).Exec()
+	err = o.Exec(sql, referObjectId, referObjectType).Error
 	return
 }
 
@@ -247,7 +248,7 @@ type BaseRelationEdbInfoResp struct {
 }
 
 type EdbInfoRelationDetail struct {
-	EdbInfoRelationId   int    `orm:"column(edb_info_relation_id);pk"`
+	EdbInfoRelationId   int    `orm:"column(edb_info_relation_id);pk" gorm:"primaryKey"`
 	EdbInfoId           int    `description:"指标id"`
 	ReferObjectId       int    `description:"引用对象ID（图表ID，ETA逻辑ID等）"`
 	ReferObjectTypeName string `description:"引用对象类型"`
@@ -263,7 +264,7 @@ type BaseRelationEdbInfoDetailResp struct {
 
 // 查询指标引用列表
 func GetEdbInfoRelationList(condition string, pars []interface{}, addFieldStr, joinTableStr, orderBy string, startSize, pageSize int) (total int, items []*BaseRelationEdbInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	// 数量汇总
 	totalSql := ` SELECT count(1) FROM edb_info e LEFT JOIN (
 SELECT count(edb_info_id) as relation_num, edb_info_id, max(relation_time) as relation_time FROM edb_info_relation GROUP BY edb_info_id) r on e.edb_info_id=r.edb_info_id  `
@@ -275,7 +276,7 @@ SELECT count(edb_info_id) as relation_num, edb_info_id, max(relation_time) as re
 	if condition != "" {
 		totalSql += condition
 	}
-	err = o.Raw(totalSql, pars).QueryRow(&total)
+	err = o.Raw(totalSql, pars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -299,17 +300,18 @@ SELECT count(edb_info_id) as relation_num, edb_info_id, max(relation_time) as re
 		sql += ` ORDER BY edb_info_id ASC `
 	}
 	sql += `  LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	pars = append(pars, startSize, pageSize)
+	err = o.Raw(sql, pars...).Find(&items).Error
 
 	return
 }
 
 // GetEdbInfoRelationDetailList 查询指标引用详情列表
 func GetEdbInfoRelationDetailList(edbInfoId int, startSize, pageSize int) (total int, items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	// 数量汇总
 	totalSql := ` SELECT count(*) FROM edb_info_relation where edb_info_id=?`
-	err = o.Raw(totalSql, edbInfoId).QueryRow(&total)
+	err = o.Raw(totalSql, edbInfoId).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -317,17 +319,17 @@ func GetEdbInfoRelationDetailList(edbInfoId int, startSize, pageSize int) (total
 	// 列表数据
 	sql := ` SELECT *FROM edb_info_relation where edb_info_id=? ORDER BY relation_time desc, edb_info_id ASC `
 	sql += `  LIMIT ?,? `
-	_, err = o.Raw(sql, edbInfoId, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, edbInfoId, startSize, pageSize).Find(&items).Error
 
 	return
 }
 
 // 查询相关的指标记录总数
 func GetReplaceChildEdbInfoRelationTotal(edbInfoId int) (total int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	// 数量汇总
 	totalSql := ` SELECT count(*) FROM edb_info_relation where  relation_type=1 and (child_edb_info_id=? or edb_info_id=? ) group by parent_relation_id`
-	err = o.Raw(totalSql, edbInfoId, edbInfoId).QueryRow(&total)
+	err = o.Raw(totalSql, edbInfoId, edbInfoId).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -336,19 +338,19 @@ func GetReplaceChildEdbInfoRelationTotal(edbInfoId int) (total int, err error) {
 
 // 查询相关的指标记录列表
 func GetReplaceChildEdbInfoRelationList(edbInfoId int, startSize, pageSize int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	// 列表数据
 	sql := ` SELECT * FROM edb_info_relation where  relation_type=1 and (child_edb_info_id=? or edb_info_id=? )  group by parent_relation_id ORDER BY edb_info_relation_id ASC  LIMIT ?,? `
-	_, err = o.Raw(sql, edbInfoId, edbInfoId, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, edbInfoId, edbInfoId, startSize, pageSize).Find(&items).Error
 	return
 }
 
 // 查询相关的指标记录总数
 func GetReplaceEdbInfoRelationTotal(edbInfoId int) (total int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	// 数量汇总
 	totalSql := ` SELECT count(*) FROM edb_info_relation where edb_info_id=? and relation_type = 0`
-	err = o.Raw(totalSql, edbInfoId).QueryRow(&total)
+	err = o.Raw(totalSql, edbInfoId).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -357,18 +359,18 @@ func GetReplaceEdbInfoRelationTotal(edbInfoId int) (total int, err error) {
 
 // 查询相关的指标记录列表
 func GetReplaceEdbInfoRelationList(edbInfoId int, startSize, pageSize int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	// 列表数据
 	sql := ` SELECT * FROM edb_info_relation where edb_info_id=? and relation_type = 0 ORDER BY edb_info_relation_id ASC LIMIT ?,? `
-	_, err = o.Raw(sql, edbInfoId, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, edbInfoId, startSize, pageSize).Find(&items).Error
 	return
 }
 
 // 替换指标引用表中直接引用的指标
 func ReplaceRelationEdbInfoId(oldEdbInfo, newEdbInfo *EdbInfo, edbRelationIds []int, relationList []*EdbInfoRelation, refreshEdbInfoIds []int, indexCodeList []string) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
+	o := global.DbMap[utils.DbNameIndex].Begin()
+	if o.Error != nil {
+		return o.Error
 	}
 	defer func() {
 		if err != nil {
@@ -381,7 +383,7 @@ func ReplaceRelationEdbInfoId(oldEdbInfo, newEdbInfo *EdbInfo, edbRelationIds []
 	now := time.Now()
 	// 删除相关的间接引用
 	sql := ` DELETE FROM edb_info_relation WHERE root_edb_info_id=?  and relation_type=1 and parent_relation_id in (` + utils.GetOrmInReplace(len(edbRelationIds)) + `)`
-	_, err = o.Raw(sql, oldEdbInfo.EdbInfoId, edbRelationIds).Exec()
+	err = o.Exec(sql, oldEdbInfo.EdbInfoId, edbRelationIds).Error
 	if err != nil {
 		return
 	}
@@ -389,14 +391,14 @@ func ReplaceRelationEdbInfoId(oldEdbInfo, newEdbInfo *EdbInfo, edbRelationIds []
 	sourceWhere := ` and (refer_object_type in (1,2,5) or (refer_object_type=4 and refer_object_sub_type !=5) )` //平衡表和事件日历中的直接引用无需替换，
 	// 替换edb_info_id
 	sql = ` UPDATE edb_info_relation SET edb_info_id=?, source=?, edb_name=?, edb_code=?, modify_time=?, relation_time=?  WHERE edb_info_id=? ` + sourceWhere + ` and relation_type=0 and edb_info_relation_id in (` + utils.GetOrmInReplace(len(edbRelationIds)) + `)`
-	_, err = o.Raw(sql, newEdbInfo.EdbInfoId, newEdbInfo.Source, newEdbInfo.EdbName, newEdbInfo.EdbCode, now, now, oldEdbInfo.EdbInfoId, edbRelationIds).Exec()
+	err = o.Exec(sql, newEdbInfo.EdbInfoId, newEdbInfo.Source, newEdbInfo.EdbName, newEdbInfo.EdbCode, now, now, oldEdbInfo.EdbInfoId, edbRelationIds).Error
 	if err != nil {
 		return
 	}
 
 	// 更新code值
 	sql = ` UPDATE edb_info_relation SET relation_code=CONCAT_WS("_", edb_info_id,refer_object_id,refer_object_type,refer_object_sub_type)  WHERE relation_type=0 ` + sourceWhere + `  and edb_info_relation_id in (` + utils.GetOrmInReplace(len(edbRelationIds)) + `)`
-	_, err = o.Raw(sql, edbRelationIds).Exec()
+	err = o.Exec(sql, edbRelationIds).Error
 	if err != nil {
 		return
 	}
@@ -408,7 +410,7 @@ func ReplaceRelationEdbInfoId(oldEdbInfo, newEdbInfo *EdbInfo, edbRelationIds []
 				relationCodesMap[relation.RelationCode] = struct{}{}
 			}
 		}
-		_, err = o.InsertMulti(len(relationList), relationList)
+		err = o.CreateInBatches(relationList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -417,7 +419,7 @@ func ReplaceRelationEdbInfoId(oldEdbInfo, newEdbInfo *EdbInfo, edbRelationIds []
 	if len(refreshEdbInfoIds) > 0 {
 		// todo 更新指标的刷新状态
 		sql := ` UPDATE edb_info SET no_update = 0, set_update_time=? WHERE  edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) `
-		_, err = o.Raw(sql, time.Now(), refreshEdbInfoIds).Exec()
+		err = o.Exec(sql, time.Now(), refreshEdbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -427,7 +429,7 @@ func ReplaceRelationEdbInfoId(oldEdbInfo, newEdbInfo *EdbInfo, edbRelationIds []
 	if len(indexCodeList) > 0 {
 		// 更改数据源的更新状态
 		sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = 0 WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodeList)) + `) and is_stop=1`
-		_, err = o.Raw(sql, indexCodeList).Exec()
+		err = o.Exec(sql, indexCodeList).Error
 		if err != nil {
 			return
 		}
@@ -445,7 +447,7 @@ SET e1.parent_relation_id = e2.edb_info_relation_id
 WHERE  
     e1.relation_type = 1   
     AND e2.relation_type = 0 AND e1.parent_relation_id !=e2.edb_info_relation_id AND e1.relation_code in (` + utils.GetOrmInReplace(len(relationCodes)) + `)`
-			_, err = o.Raw(sql, relationCodes).Exec()
+			err = o.Exec(sql, relationCodes).Error
 			if err != nil {
 				return
 			}
@@ -456,9 +458,9 @@ WHERE
 
 // UpdateSecondRelationEdbInfoId 更新指标替换后的间接引用记录
 func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfoRelation, refreshEdbInfoIds []int, indexCodeList []string) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
+	o := global.DbMap[utils.DbNameIndex].Begin()
+	if o.Error != nil {
+		return o.Error
 	}
 	defer func() {
 		if err != nil {
@@ -469,7 +471,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 	}()
 	// 删除相关的间接引用
 	sql := ` DELETE FROM edb_info_relation WHERE relation_type=1 and parent_relation_id in (` + utils.GetOrmInReplace(len(edbRelationIds)) + `)`
-	_, err = o.Raw(sql, edbRelationIds).Exec()
+	err = o.Exec(sql, edbRelationIds).Error
 	if err != nil {
 		return
 	}
@@ -482,7 +484,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 				relationCodesMap[relation.RelationCode] = struct{}{}
 			}
 		}
-		_, err = o.InsertMulti(len(relationList), relationList)
+		err = o.CreateInBatches(relationList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -491,7 +493,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 	if len(refreshEdbInfoIds) > 0 {
 		// todo 更新指标的刷新状态
 		sql = ` UPDATE edb_info SET no_update = 0, set_update_time=? WHERE  edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) `
-		_, err = o.Raw(sql, time.Now(), refreshEdbInfoIds).Exec()
+		err = o.Exec(sql, time.Now(), refreshEdbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -501,7 +503,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 	if len(indexCodeList) > 0 {
 		// 更改数据源的更新状态
 		sql = ` UPDATE base_from_mysteel_chemical_index SET is_stop = 0 WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodeList)) + `) and is_stop=1`
-		_, err = o.Raw(sql, indexCodeList).Exec()
+		err = o.Exec(sql, indexCodeList).Error
 		if err != nil {
 			return
 		}
@@ -519,7 +521,7 @@ SET e1.parent_relation_id = e2.edb_info_relation_id
 WHERE  
     e1.relation_type = 1   
     AND e2.relation_type = 0 AND e1.parent_relation_id !=e2.edb_info_relation_id AND e1.relation_code in (` + utils.GetOrmInReplace(len(relationCodes)) + `)`
-			_, err = o.Raw(sql, relationCodes).Exec()
+			err = o.Exec(sql, relationCodes).Error
 			if err != nil {
 				return
 			}

models/data_manage/edb_info_updates.go

@@ -1,7 +1,8 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
@@ -12,12 +13,12 @@ type UpdatesStatisticalItem struct {
 }
 
 func GetUpdatesStatistical(condition string, pars []interface{}) (list []*UpdatesStatisticalItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT COUNT(1) AS total,source,edb_type FROM edb_info
 			WHERE 1=1 `
 	sql += condition
 	sql += ` GROUP BY source  `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = o.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -91,30 +92,31 @@ DATA_SOURCE_THS                 = iota + 1 //同花顺
 */
 
 func GetUpdatesList(condition string, pars []interface{}, startSize, pageSize int) (list []*EdbInfoView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM edb_info
 			WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	pars = append(pars, startSize, pageSize)
+	err = o.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
 // GetAllUpdatesList 获取所有待更新的指标
 func GetAllUpdatesList() (list []*EdbInfoView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM edb_info
 			WHERE 1=1 AND  is_update=? AND no_update=? AND edb_info_type = ? ORDER BY edb_type ASC `
-	_, err = o.Raw(sql, 1, 0, 0).QueryRows(&list)
+	err = o.Raw(sql, 1, 0, 0).Find(&list).Error
 	return
 }
 
 func GetUpdatesListTotal(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT COUNT(1) AS count FROM edb_info
 			WHERE 1=1 `
 	sql += condition
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

models/data_manage/edb_python_code.go

@@ -1,13 +1,14 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
 // EdbPythonCode python指标运算代码
 type EdbPythonCode struct {
-	EdbPythonCodeId int    `orm:"column(edb_python_code_id);pk"`
+	EdbPythonCodeId int    `orm:"column(edb_python_code_id);pk" gorm:"primaryKey"`
 	EdbInfoId       int    `description:"指标id"`
 	EdbCode         string `description:"指标编码"`
 	PythonCode      string `description:"python代码"`
@@ -17,22 +18,26 @@ type EdbPythonCode struct {
 
 // Update 更新EdbPythonCode信息
 func (edbPythonCode *EdbPythonCode) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(edbPythonCode, cols...)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Model(edbPythonCode).Select(cols).Updates(edbPythonCode).Error
 	return
 }
 
 // AddEdbPythonCode python指标运算代码
 func AddEdbPythonCode(item *EdbPythonCode) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.EdbPythonCodeId)
 	return
 }
 
 // GetEdbPythonCodeById 根据指标id获取python代码
 func GetEdbPythonCodeById(edbInfoId int) (item *EdbPythonCode, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM edb_python_code WHERE edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = o.Raw(sql, edbInfoId).First(&item).Error
 	return
 }

models/data_manage/edb_source.go

@@ -13,7 +13,7 @@ var (
 
 // EdbSource 指标来源表
 type EdbSource struct {
-	EdbSourceId      int    `orm:"column(edb_source_id);pk"`
+	EdbSourceId      int    `orm:"column(edb_source_id);pk" gorm:"primaryKey"`
 	SourceName       string `description:"指标来源名称"`
 	SourceNameEn     string `description:"指标来源名称英文"`
 	TableName        string `description:"数据表名"`
@@ -38,14 +38,14 @@ func GetEdbSourceItemsByCondition(condition string, pars []interface{}, fieldArr
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM edb_source WHERE 1=1 %s %s`, fields, condition, order)
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars).Find(&items).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
 
 	return
 }
 
 // EdbSourceChild 指标来源表
 type EdbSourceChild struct {
-	EdbSourceId int    `orm:"column(edb_source_id);pk"`
+	EdbSourceId int    `orm:"column(edb_source_id);pk" gorm:"primaryKey"`
 	SourceName  string `description:"指标来源名称"`
 	TableName   string `description:"数据表名"`
 	IsBase      int    `description:"是否为基础指标: 2-否; 1-是"`
@@ -55,7 +55,7 @@ type EdbSourceChild struct {
 // GetEdbSourceItemByCondition 获取指标来源
 func GetEdbSourceItemByCondition(condition string, pars []interface{}) (item *EdbSource, err error) {
 	sql := fmt.Sprintf(`SELECT * FROM edb_source WHERE 1=1 %s`, condition)
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars).First(&item).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).First(&item).Error
 
 	return
 }

models/data_manage/edb_terminal.go

@@ -1,14 +1,15 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // EdbTerminal 指标终端
 type EdbTerminal struct {
-	TerminalId   int       `orm:"column(terminal_id);pk"`
+	TerminalId   int       `orm:"column(terminal_id);pk" gorm:"primaryKey"`
 	Source       int       `orm:"column(source)" description:"指标来源类型"`
 	Name         string    `description:"终端名称"`
 	TerminalCode string    `description:"终端编码，用于配置在机器上"`
@@ -22,7 +23,7 @@ type EdbTerminal struct {
 }
 
 type EdbTerminalItem struct {
-	TerminalId   int    `orm:"column(terminal_id);pk"`
+	TerminalId   int    `orm:"column(terminal_id);pk" gorm:"primaryKey"`
 	Source       int    `description:"指标来源类型"`
 	Name         string `description:"终端别名"`
 	TerminalCode string `description:"终端编码，用于配置在机器上"`
@@ -43,9 +44,9 @@ type EdbTerminalCode struct {
 
 // GetEdbTerminalListBySource 根据指标来源类型获取所有的终端列表
 func GetEdbTerminalListBySource(source int) (items []*EdbTerminal, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT *  FROM edb_terminal WHERE source = ? and status=1 ORDER BY terminal_id ASC `
-	_, err = o.Raw(sql, source).QueryRows(&items)
+	err = o.Raw(sql, source).Find(&items).Error
 	return
 }
 
@@ -81,58 +82,58 @@ type SetEdbTerminalStatusReq struct {
 
 // GetBaseIndexTerminalCode 获取数据源的终端code
 func GetBaseIndexTerminalCode(edbCode, tableName string) (item BaseIndexTerminalCode, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := fmt.Sprintf(`select terminal_code, index_name from %s where index_code = ? `, tableName)
-	err = o.Raw(sql, edbCode).QueryRow(&item)
+	err = o.Raw(sql, edbCode).First(&item).Error
 	return
 }
 
 // GetEdbTerminalById 主键获取终端
 func GetEdbTerminalById(id int) (item *EdbTerminal, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM edb_terminal WHERE terminal_id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = o.Raw(sql, id).First(&item).Error
 	return
 }
 
 func GetEdbTerminalByTerminalCode(terminalCode string) (item *EdbTerminal, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM edb_terminal WHERE terminal_code = ? LIMIT 1`
-	err = o.Raw(sql, terminalCode).QueryRow(&item)
+	err = o.Raw(sql, terminalCode).First(&item).Error
 	return
 }
 
 func GetEdbTerminalList() (item []*EdbTerminalItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM edb_terminal ORDER BY terminal_id ASC`
-	_, err = o.Raw(sql).QueryRows(&item)
+	err = o.Raw(sql).Find(&item).Error
 	return
 }
 
 func GetEdbTerminalBySource(source int) (item []*EdbTerminalItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM edb_terminal where source=? ORDER BY terminal_id ASC`
-	_, err = o.Raw(sql, source).QueryRows(&item)
+	err = o.Raw(sql, source).Find(&item).Error
 	return
 }
 
 func (item *EdbTerminal) Add() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Insert(item)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Create(item).Error
 	return
 }
 
 func (item *EdbTerminal) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(item, cols...)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Model(item).Select(cols).Updates(item).Error
 	return
 }
 
 // GetEdbTerminalByCode 根据终端编码获取终端信息
 func GetEdbTerminalByCode(terminalCode string) (item *EdbTerminal, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT *  FROM edb_terminal WHERE terminal_code = ? `
-	err = o.Raw(sql, terminalCode).QueryRow(&item)
+	err = o.Raw(sql, terminalCode).First(&item).Error
 	return
 }
 
@@ -143,9 +144,9 @@ type TerminalCodeCountGroup struct {
 
 // GetEdbCountGroupByTerminal 获取终端code分组总数
 func GetEdbCountGroupByTerminal(source int) (list []TerminalCodeCountGroup, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `select terminal_code,count(1) total from edb_info where source = ? AND no_update=0 AND terminal_code != "" group by terminal_code; `
-	_, err = o.Raw(sql, source).QueryRows(&list)
+	err = o.Raw(sql, source).Find(&list).Error
 	return
 }
 

models/data_manage/excel_style.go

@@ -1,13 +1,13 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type ExcelStyle struct {
-	ExcelId          int `orm:"column(excel_id);pk"`
+	ExcelId          int `orm:"column(excel_id);pk" gorm:"primaryKey"`
 	Name             string
 	Color            string
 	Row              int
@@ -164,7 +164,7 @@ type Rowlen struct {
 }
 
 type ExcelEdbdataMapping struct {
-	MappingId  int `orm:"column(mapping_id);pk"`
+	MappingId  int `orm:"column(mapping_id);pk" gorm:"primaryKey"`
 	ExcelId    int64
 	ClassifyId int
 	Frequency  string
@@ -173,29 +173,29 @@ type ExcelEdbdataMapping struct {
 }
 
 func AddExcelEdbdataMapping(item *ExcelEdbdataMapping) (err error) {
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.Insert(item)
+	o := global.DbMap[utils.DbNameManualIndex]
+	err = o.Create(item).Error
 	return
 }
 
 func GetExcelEdbdataMappingByTradeCode(classifyId int, frequency string) (excelId *int, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 	sql := `SELECT excel_id FROM excel_edbdata_mapping WHERE classify_id = ? AND frequency=?`
-	err = o.Raw(sql, classifyId, frequency).QueryRow(&excelId)
+	err = o.Raw(sql, classifyId, frequency).Scan(&excelId).Error
 	return
 }
 
 func GetExcelStyleById(excelId int) (item *ExcelStyle, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 	sql := `SELECT * FROM excel_style WHERE excel_id = ? `
-	err = o.Raw(sql, excelId).QueryRow(&item)
+	err = o.Raw(sql, excelId).First(&item).Error
 	return
 }
 
 func GetExcelEdbdataMappingCount(classifyId int, tradeCode, frequency string) (count int, err error) {
 	sql := `SELECT COUNT(1) AS count FROM excel_edbdata_mapping WHERE classify_id=? AND trade_code=? AND frequency=? `
-	o := orm.NewOrmUsingDB("edb")
-	err = o.Raw(sql, classifyId, tradeCode, frequency).QueryRow(&count)
+	o := global.DbMap[utils.DbNameManualIndex]
+	err = o.Raw(sql, classifyId, tradeCode, frequency).Scan(&count).Error
 	return
 }