查询修改

models/aimod/ai.go

@@ -1,9 +1,9 @@
 package aimod
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type AiChatTopic struct {
@@ -41,8 +41,8 @@ type ChatReq struct {
 
 func GetAiChatByAsk(askUuid string) (item *AiChat, err error) {
 	sql := `SELECT * FROM ai_chat WHERE ask_uuid=?`
-	o := orm.NewOrmUsingDB("ai")
-	err = o.Raw(sql, askUuid).QueryRow(&item)
+	o := global.DbMap[utils.DbNameAI]
+	err = o.Raw(sql, askUuid).First(&item).Error
 	return
 }
 
@@ -55,15 +55,23 @@ type ChatResp struct {
 
 // AddAiChatTopic 新增主题
 func AddAiChatTopic(item *AiChatTopic) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("ai")
-	lastId, err = o.Insert(item)
+	o := global.DbMap[utils.DbNameAI]
+	err = o.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.AiChatTopicId)
 	return
 }
 
 // AddAiChat 新增聊天
 func AddAiChat(item *AiChat) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("ai")
-	lastId, err = o.Insert(item)
+	o := global.DbMap[utils.DbNameAI]
+	err = o.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.AiChatId)
 	return
 }
 
@@ -78,8 +86,8 @@ type AiChatTopicView struct {
 
 func GetAiChatTopicList(sysUserId int) (item []*AiChatTopicView, err error) {
 	sql := ` SELECT * FROM ai_chat_topic WHERE sys_user_id=? ORDER BY create_time DESC `
-	o := orm.NewOrmUsingDB("ai")
-	_, err = o.Raw(sql, sysUserId).QueryRows(&item)
+	o := global.DbMap[utils.DbNameAI]
+	err = o.Raw(sql, sysUserId).Find(&item).Error
 	return
 }
 
@@ -108,8 +116,8 @@ var ModelViewMap = map[string]string{
 
 func GetAiChatList(aiChatTopicId int) (item []*AiChatView, err error) {
 	sql := ` SELECT * FROM ai_chat WHERE ai_chat_topic_id=? ORDER BY create_time ASC `
-	o := orm.NewOrmUsingDB("ai")
-	_, err = o.Raw(sql, aiChatTopicId).QueryRows(&item)
+	o := global.DbMap[utils.DbNameAI]
+	err = o.Raw(sql, aiChatTopicId).Find(&item).Error
 	return
 }
 
@@ -122,8 +130,8 @@ type TopicDeleteReq struct {
 }
 
 func DeleteTopic(topicId int) (err error) {
-	o := orm.NewOrmUsingDB("ai")
-	tx, err := o.Begin()
+	o := global.DbMap[utils.DbNameAI]
+	tx := o.Begin()
 	defer func() {
 		if err != nil {
 			tx.Rollback()
@@ -132,12 +140,12 @@ func DeleteTopic(topicId int) (err error) {
 		}
 	}()
 	sql := ` DELETE FROM ai_chat_topic WHERE  ai_chat_topic_id=? `
-	_, err = tx.Raw(sql, topicId).Exec()
+	err = tx.Exec(sql, topicId).Error
 	if err != nil {
 		return err
 	}
 	sql = ` DELETE FROM ai_chat WHERE  ai_chat_topic_id=? `
-	_, err = tx.Raw(sql, topicId).Exec()
+	err = tx.Exec(sql, topicId).Error
 	if err != nil {
 		return err
 	}
@@ -151,22 +159,22 @@ type TopicEditReq struct {
 
 func GetAiChatTopicByTopicName(topicName string) (item *AiChatTopicView, err error) {
 	sql := ` SELECT * FROM ai_chat_topic WHERE topic_name=? `
-	o := orm.NewOrmUsingDB("ai")
-	err = o.Raw(sql, topicName).QueryRow(&item)
+	o := global.DbMap[utils.DbNameAI]
+	err = o.Raw(sql, topicName).First(&item).Error
 	return
 }
 
 func EditTopic(topicId int, topicName string) (err error) {
-	o := orm.NewOrmUsingDB("ai")
+	o := global.DbMap[utils.DbNameAI]
 	sql := ` UPDATE ai_chat_topic SET topic_name=? WHERE  ai_chat_topic_id=? `
-	_, err = o.Raw(sql, topicName, topicId).Exec()
+	err = o.Exec(sql, topicName, topicId).Error
 	return err
 }
 
 func (obj *AiChatTopic) GetAiChatTopicById() (item *AiChatTopicView, err error) {
-	o := orm.NewOrmUsingDB("ai")
+	o := global.DbMap[utils.DbNameAI]
 	sql := ` SELECT * FROM ai_chat_topic WHERE ai_chat_topic_id=? `
-	err = o.Raw(sql, obj.AiChatTopicId).QueryRow(&item)
+	err = o.Raw(sql, obj.AiChatTopicId).First(&item).Error
 	return
 }
 
@@ -178,13 +186,15 @@ type HistoryChat struct {
 
 // 修改
 func (obj *AiChatTopic) Update(updateParams, whereParam map[string]interface{}) (err error) {
-	to := orm.NewOrmUsingDB("ai")
-	ptrStructOrTableName := "ai_chat_topic"
+	to := global.DbMap[utils.DbNameAI]
+	/*ptrStructOrTableName := "ai_chat_topic"
+
 
 	qs := to.QueryTable(ptrStructOrTableName)
 	for expr, exprV := range whereParam {
 		qs = qs.Filter(expr, exprV)
 	}
-	_, err = qs.Update(updateParams)
+	err = qs.Update(updateParams)*/
+	err = to.Model(obj).Where(whereParam).Updates(updateParams).Error
 	return
 }

models/aimod/file_upload_record.go

@@ -1,7 +1,8 @@
 package aimod
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
@@ -23,7 +24,8 @@ type FileUploadRecord struct {
 
 // AddAiChatTopic 新增上传文件记录
 func (obj *FileUploadRecord) AddFileUploadRecord() (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("ai")
-	lastId, err = o.Insert(obj)
+	o := global.DbMap[utils.DbNameAI]
+	err = o.Create(obj).Error
+	lastId = int64(obj.FileUploadRecordId)
 	return
 }

models/bi_dashboard/bi_dashboard.go

@@ -1,7 +1,8 @@
 package bi_dashboard
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
@@ -23,15 +24,19 @@ func (m *BiDashboard) TableName() string {
 }
 
 func (m *BiDashboard) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Select(cols).Updates(m).Error
 	return
 }
 
 // AddBiDashboard 新增看板
 func AddBiDashboard(item *BiDashboard) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BiDashboardId)
 	return
 }
 
@@ -42,13 +47,13 @@ func GetShareDashboard() (items []*BiDashboard, err error) {
 
 	sql += `ORDER BY create_time DESC`
 	//sql += `ORDER BY create_time DESC LIMIT ?,?`
-	//_, err = o.Raw(sql).QueryRows(&items)
+	//err = o.Raw(sql).Find(&items).Error
 	//err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
 	return
 }
 
 func GetBiDashboardList(condition string, pars []interface{}) (items []*BiDashboard, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameMaster]
 	sql := `SELECT * FROM bi_dashboard WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -56,25 +61,25 @@ func GetBiDashboardList(condition string, pars []interface{}) (items []*BiDashbo
 	//
 	sql += `ORDER BY modify_time DESC `
 	//sql += `ORDER BY create_time DESC LIMIT ?,?`
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 // GetDashboardById 获取看板
 func GetDashboardById(id int) (item *BiDashboard, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameMaster]
 	sql := `SELECT * FROM bi_dashboard WHERE bi_dashboard_id = ? limit 1`
 
 	//sql += `ORDER BY create_time DESC LIMIT ?,?`
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = o.Raw(sql, id).First(&item).Error
 	return
 }
 
 // del
 func DelDashboard(id int) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameMaster]
 	sql := `DELETE FROM bi_dashboard WHERE bi_dashboard_id = ?`
-	_, err = o.Raw(sql, id).Exec()
+	err = o.Exec(sql, id).Error
 	return
 }
 
@@ -113,9 +118,9 @@ type EditDashboardReq struct {
 
 // update
 func EditDashboard(item *BiDashboard) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameMaster]
 	sql := `UPDATE bi_dashboard SET bi_dashboard_name=?,modify_time=?,state=? WHERE bi_dashboard_id=?`
-	_, err = o.Raw(sql, item.BiDashboardName, time.Now(), item.State, item.BiDashboardId).Exec()
+	err = o.Exec(sql, item.BiDashboardName, time.Now(), item.State, item.BiDashboardId).Error
 	return
 }
 
@@ -134,14 +139,14 @@ func GetDashboradByIds(dashboradIds []int) (list []*BiDashboard, err error) {
 func GetAllGrantList(sysUserId int) (list []*BiDashboard, err error) {
 	sql := `SELECT a.* FROM bi_dashboard a JOIN bi_dashboard_grant b on a.bi_dashboard_id=b.bi_dashboard_id 
  WHERE b.grant_admin_id=?`
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, sysUserId).QueryRows(&list)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Raw(sql, sysUserId).Find(&list).Error
 	return
 }
 
 func SaveDashboard(item *BiDashboard) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(item)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Create(item).Error
 	return
 }
 
@@ -155,15 +160,15 @@ type BiDashboardEditingReq struct {
 func GetAllMyShareList(sysUserId int) (list []*BiDashboard, err error) {
 	sql := `SELECT a.* FROM bi_dashboard a JOIN bi_dashboard_grant b on a.bi_dashboard_id=b.bi_dashboard_id 
 WHERE a.sys_admin_id = ? GROUP BY a.bi_dashboard_id   `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, sysUserId).QueryRows(&list)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Raw(sql, sysUserId).Find(&list).Error
 	return
 }
 
 // getByName
 func GetDashboardByName(name string, adminId int) (item *BiDashboard, err error) {
 	sql := `SELECT * FROM bi_dashboard WHERE bi_dashboard_name = ? and sys_admin_id =? limit 1`
-	o := orm.NewOrm()
-	err = o.Raw(sql, name, adminId).QueryRow(&item)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Raw(sql, name, adminId).First(&item).Error
 	return
 }

models/bi_dashboard/bi_dashboard_classify.go

@@ -1,7 +1,8 @@
 package bi_dashboard
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
@@ -27,15 +28,19 @@ func (m *BiDashboardClassify) TableName() string {
 
 // add
 func AddBiDashboardClassify(item *BiDashboardClassify) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BiDashboardClassifyId)
 	return
 }
 
 // update
 func EditDashboardClassify(item *BiDashboardClassify) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Raw("UPDATE bi_dashboard_classify SET bi_dashboard_classify_name=?,sort=?,modify_time=? WHERE bi_dashboard_classify_id=?", item.BiDashboardClassifyName, item.Sort, item.ModifyTime, item.BiDashboardClassifyId).Exec()
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Exec("UPDATE bi_dashboard_classify SET bi_dashboard_classify_name=?,sort=?,modify_time=? WHERE bi_dashboard_classify_id=?", item.BiDashboardClassifyName, item.Sort, item.ModifyTime, item.BiDashboardClassifyId).Error
 	return
 }
 
@@ -80,15 +85,15 @@ type RespGroupDashboardListItem struct {
 
 func GetBiDashboardClassifyAllList() (list []*BiDashboardClassify, err error) {
 	//err = global.DEFAULT_DmSQL.Select("*").Find(&list).Error
-	o := orm.NewOrm()
-	_, err = o.Raw("SELECT * FROM bi_dashboard_classify").QueryRows(&list)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Raw("SELECT * FROM bi_dashboard_classify").Find(&list).Error
 	return
 }
 
 func GetBiDashboardClassifyById(id int) (item *BiDashboardClassify, err error) {
 	//err = global.DEFAULT_DmSQL.Where("bi_dashboard_classify_id = ?", id).First(&item).Error
-	o := orm.NewOrm()
-	err = o.Raw("SELECT * FROM bi_dashboard_classify where bi_dashboard_classify_id=?", id).QueryRow(&item)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Raw("SELECT * FROM bi_dashboard_classify where bi_dashboard_classify_id=?", id).First(&item).Error
 	return
 }
 
@@ -109,8 +114,8 @@ type DelDashboardClassifyReq struct {
 func GetBiDashboardClassifyMaxSort() (sort int, err error) {
 	sql := `SELECT COALESCE(Max(sort), 0) AS sort FROM bi_dashboard_classify `
 	//err = global.DEFAULT_DmSQL.Raw(sql).Scan(&sort).Error
-	o := orm.NewOrm()
-	err = o.Raw(sql).QueryRow(&sort)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Raw(sql).Scan(&sort).Error
 	return
 }
 
@@ -130,7 +135,7 @@ type RespPublicGroupListItem struct {
 // getByName
 func GetBiDashboardClassifyByName(classifyName string) (count int64, err error) {
 	//err = global.DEFAULT_DmSQL.Model(&BiDashboardClassify{}).Where("bi_dashboard_classify_name = ?", classifyName).Count(&count).Error
-	o := orm.NewOrm()
-	err = o.Raw("SELECT count(1) FROM bi_dashboard_classify where bi_dashboard_classify_name=?", classifyName).QueryRow(&count)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Raw("SELECT count(1) FROM bi_dashboard_classify where bi_dashboard_classify_name=?", classifyName).Scan(&count).Error
 	return
 }

models/bi_dashboard/bi_dashboard_detail.go

@@ -1,7 +1,8 @@
 package bi_dashboard
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
@@ -28,22 +29,22 @@ func (m *BiDashboardDetail) TableName() string {
 
 func GetBiDashboardDetailById(id int) (list []*BiDashboardDetail, err error) {
 	//err = global.DEFAULT_DmSQL.Table("bi_dashboard_detail").Where("bi_dashboard_id IN ?", id).Find(&list).Error
-	o := orm.NewOrm()
-	_, err = o.Raw("SELECT * FROM bi_dashboard_detail where bi_dashboard_id = ?", id).QueryRows(&list)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Raw("SELECT * FROM bi_dashboard_detail where bi_dashboard_id = ?", id).Find(&list).Error
 	return
 }
 
 // multiAdd
 func AddBiDashboardDetailMulti(items []*BiDashboardDetail) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(items), items)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
 // del
 func DeleteBiDashboardDetail(id int) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Raw("DELETE from bi_dashboard_detail where bi_dashboard_id=?", id).Exec()
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Exec("DELETE from bi_dashboard_detail where bi_dashboard_id=?", id).Error
 	return
 }
 
@@ -58,8 +59,8 @@ type MoveDashboardDetailReq struct {
 // update
 func EditBiDashboardDetail(item *BiDashboardDetail) (err error) {
 	//return global.DEFAULT_DmSQL.Model(item).Where("bi_dashboard_detail_id = ?", item.BiDashboardDetailId).Updates(item).Error
-	o := orm.NewOrm()
-	_, err = o.Raw("UPDATE bi_dashboard_detail SET bi_dashboard_id=?,type=?,unique_code=?,sort=?,modify_time=? WHERE bi_dashboard_detail_id=?", item.BiDashboardId, item.Type, item.UniqueCode, item.Sort, item.ModifyTime, item.BiDashboardDetailId).Exec()
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Exec("UPDATE bi_dashboard_detail SET bi_dashboard_id=?,type=?,unique_code=?,sort=?,modify_time=? WHERE bi_dashboard_detail_id=?", item.BiDashboardId, item.Type, item.UniqueCode, item.Sort, item.ModifyTime, item.BiDashboardDetailId).Error
 	return
 }
 
@@ -70,7 +71,7 @@ type DelDashboardDetailReq struct {
 // del
 func DeleteBiDashboardDetailByDetailId(id int) (err error) {
 	//return global.DEFAULT_DmSQL.Where("bi_dashboard_detail_id = ?", id).Delete(&BiDashboardDetail{}).Error
-	o := orm.NewOrm()
-	_, err = o.Raw("DELETE from bi_dashboard_detail where bi_dashboard_detail_id=?", id).Exec()
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Exec("DELETE from bi_dashboard_detail where bi_dashboard_detail_id=?", id).Error
 	return
 }

models/bi_dashboard/bi_dashboard_grant.go

@@ -1,7 +1,8 @@
 package bi_dashboard
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
@@ -25,8 +26,8 @@ type GrantDashboardReq struct {
 
 // MultiAddDashboardGrant 批量添加授权记录
 func MultiAddDashboardGrant(boardId int, list []*BiDashboardGrant) (err error) {
-	o := orm.NewOrm()
-	to, err := o.Begin()
+	o := global.DbMap[utils.DbNameMaster]
+	to := o.Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -36,14 +37,14 @@ func MultiAddDashboardGrant(boardId int, list []*BiDashboardGrant) (err error) {
 	}()
 
 	sql := "DELETE from bi_dashboard_grant where bi_dashboard_id=?"
-	_, err = to.Raw(sql, boardId).Exec()
+	err = to.Exec(sql, boardId).Error
 	if err != nil {
 		return
 	}
 
 	// 新增授权记录
 	if len(list) > 0 {
-		_, tmpErr := to.InsertMulti(len(list), list)
+		tmpErr := to.CreateInBatches(list, utils.MultiAddNum).Error
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -61,15 +62,15 @@ type PublicDashboardReq struct {
 // del
 func DeleteDashboardGrant(biDashboardId int) (err error) {
 	//return global.DEFAULT_DmSQL.Where("bi_dashboard_id=?", biDashboardId).Delete(&BiDashboardGrant{}).Error
-	o := orm.NewOrm()
-	_, err = o.Raw("DELETE from bi_dashboard_grant where bi_dashboard_id=?", biDashboardId).Exec()
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Exec("DELETE from bi_dashboard_grant where bi_dashboard_id=?", biDashboardId).Error
 	return
 }
 
 // get
 func GetDashboardGrantInfo(biDashboardId int) (list []*BiDashboardGrant, err error) {
 	//return list, global.DEFAULT_DmSQL.Where("bi_dashboard_id=?", biDashboardId).Find(&list).Error
-	o := orm.NewOrm()
-	_, err = o.Raw("SELECT * FROM bi_dashboard_grant where bi_dashboard_id=?", biDashboardId).QueryRows(&list)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Raw("SELECT * FROM bi_dashboard_grant where bi_dashboard_id=?", biDashboardId).Find(&list).Error
 	return
 }

models/bi_dashboard/bi_dashboard_home_page.go

@@ -1,7 +1,8 @@
 package bi_dashboard
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
@@ -23,19 +24,19 @@ func (m *BiDashboardHomePage) TableName() string {
 func GetBiDashboardHomePageById(id int) (item *BiDashboardHomePage, err error) {
 	sql := ` SELECT a.* FROM bi_dashboard_home_page AS a INNER JOIN bi_dashboard AS b 
 ON a.bi_dashboard_id = b.bi_dashboard_id WHERE a.admin_id = ? `
-	o := orm.NewOrm()
-	err = o.Raw(sql, id).QueryRow(&item)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Raw(sql, id).First(&item).Error
 	return
 }
 
 // save
 func SaveBiDashboardHomePage(item *BiDashboardHomePage) (err error) {
 	//return global.DEFAULT_DmSQL.Save(item).Error
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameMaster]
 	if item.BiDashboardHomePageId > 0 {
-		_, err = o.Raw("UPDATE bi_dashboard_home_page SET bi_dashboard_id=?,modify_time=? WHERE bi_dashboard_home_page_id=?", item.BiDashboardId, item.ModifyTime, item.BiDashboardHomePageId).Exec()
+		err = o.Exec("UPDATE bi_dashboard_home_page SET bi_dashboard_id=?,modify_time=? WHERE bi_dashboard_home_page_id=?", item.BiDashboardId, item.ModifyTime, item.BiDashboardHomePageId).Error
 	} else {
-		_, err = o.Insert(item)
+		err = o.Create(item).Error
 	}
 	return
 }

models/company/company.go

@@ -1,7 +1,8 @@
 package company
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
@@ -40,21 +41,21 @@ type Company struct {
 
 // 更新客户基础信息
 func (company *Company) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(company, cols...)
+	o := global.DbMap[utils.DbNameMaster]
+	err = o.Select(cols).Updates(company).Error
 	return
 }
 
 func ModifyCompanyGroupId(sellerId, groupId int) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameMaster]
 	sql := `UPDATE company_product SET group_id=? WHERE seller_id=? `
-	_, err = o.Raw(sql, groupId, sellerId).Exec()
+	err = o.Exec(sql, groupId, sellerId).Error
 	return
 }
 
 func ModifyCompanyDepartmentId(sellerId, departmentId int) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameMaster]
 	sql := `UPDATE company_product SET department_id=? WHERE seller_id=? `
-	_, err = o.Raw(sql, departmentId, sellerId).Exec()
+	err = o.Exec(sql, departmentId, sellerId).Error
 	return
 }

models/company/company_config.go

@@ -3,8 +3,8 @@ package company
 import (
 	"encoding/json"
 	"errors"
+	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 const (
@@ -17,24 +17,24 @@ type CrmConfig struct {
 }
 
 func GetConfigValueByCode(configCode string) (total int, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameMaster]
 	sql := ` SELECT config_value FROM crm_config WHERE config_code=? `
-	err = o.Raw(sql, configCode).QueryRow(&total)
+	err = o.Raw(sql, configCode).Scan(&total).Error
 	return
 }
 
 // 修改
 func CrmConfigUpdate(newValue, configCode string) (err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameMaster]
 	sql := `UPDATE crm_config SET  config_value=?   WHERE config_code=  ?`
-	_, err = o.Raw(sql, newValue, configCode).Exec()
+	err = o.Exec(sql, newValue, configCode).Error
 	return
 }
 
 func GetConfigDetailByCode(configCode string) (item CrmConfig, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameMaster]
 	sql := ` SELECT config_value FROM crm_config WHERE config_code=? `
-	err = o.Raw(sql, configCode).QueryRow(&item)
+	err = o.Raw(sql, configCode).First(&item).Error
 	return
 }
 

models/company/company_permission.go

@@ -1,7 +1,8 @@
 package company
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
@@ -55,9 +56,9 @@ type PermissionSetResp struct {
 }
 
 func GetPermissionSetItems(productId int, classifyName string) (items []*PermissionSetItem, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  AND permission_type=0 ORDER BY sort ASC `
-	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
+	err = o.Raw(sql, productId, classifyName).Find(&items).Error
 	return
 }
 
@@ -95,30 +96,30 @@ type PermissionVarietyList struct {
 }
 
 func GetPermissionVarietyItems(productId int, classifyName string) (items []*PermissionVarietyItem, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? GROUP BY permission_name ORDER BY sort ASC `
-	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
+	err = o.Raw(sql, productId, classifyName).Find(&items).Error
 	return
 }
 
 // GetChartPermissionListById 根据权限id获取产品权限详情
 func GetChartPermissionListById(chartPermissionId int) (item *ChartPermission, err error) {
-	o := orm.NewOrmUsingDB("rddp")
+	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id =? `
-	err = o.Raw(sql, chartPermissionId).QueryRow(&item)
+	err = o.Raw(sql, chartPermissionId).First(&item).Error
 	return
 }
 
 func GetParentIdFromGroup(gid int) (items *int, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameMaster]
 	sql := `SELECT parent_id FROM sys_group WHERE group_id=? `
-	err = o.Raw(sql, gid).QueryRow(&items)
+	err = o.Raw(sql, gid).Scan(&items).Error
 	return
 }
 
 func GetGroupNamesById(gid int) (items *string, err error) {
-	o := orm.NewOrm()
+	o := global.DbMap[utils.DbNameMaster]
 	sql := `SELECT group_name FROM sys_group WHERE group_id=? `
-	err = o.Raw(sql, gid).QueryRow(&items)
+	err = o.Raw(sql, gid).Scan(&items).Error
 	return
 }

models/data_source/base_from_sci99.go

@@ -1,7 +1,8 @@
 package data_source
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -68,77 +69,85 @@ type BaseFromSci99IndexList struct {
 
 // 添加数据
 func AddBaseFromSci99Index(item *BaseFromSci99Index) (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.BaseFromSciIndexId)
 	return
 }
 
 func AddBaseFromSci99Classify(item *BaseFromSci99Classify) (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.BaseFromSciClassifyId)
 	return
 }
 
 func AddBaseFromSci99DataMulti(item []*BaseFromSci99Data) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(1000, item)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(item, utils.MultiAddNum).Error
 	return
 }
 
 func GetBaseFromSci99Classify() (list []*BaseFromSci99Classify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_sci99_classify `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 func GetSci99Index(condition string, pars interface{}) (items []*BaseFromSci99IndexList, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM base_from_sci99_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY base_from_sci_index_id ASC `
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars).Find(&items).Error
 	return
 }
 
 func GetSci99IndexDataCount(indexCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT COUNT(1) AS count  FROM base_from_sci99_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&count)
+	err = o.Raw(sql, indexCode).Scan(&count).Error
 	return
 }
 
 func GetSci99IndexData(indexCode string, startSize, pageSize int) (items []*BaseFromSci99DataItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT *  FROM base_from_sci99_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, indexCode, startSize, pageSize).Find(&items).Error
 	return
 }
 
 func GetSci99DataMaxCount(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM base_from_icpi_index AS a
 				INNER JOIN base_from_icpi_data AS b ON a.base_from_icpi_index_id=b.base_from_icpi_index_id
 				WHERE a.base_from_icpi_classify_id=?
 				GROUP BY a.base_from_icpi_index_id
 			)AS t `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
+	err = o.Raw(sql, classifyId).Scan(&count).Error
 	return
 }
 
 func GetSci99IndexDataByCode(indexCode string) (items []*BaseFromSci99DataItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT *  FROM base_from_sci99_data WHERE index_code=? ORDER BY data_time DESC  `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = o.Raw(sql, indexCode).Find(&items).Error
 	return
 }
 
 func GetSci99IndexLatestDate(indexCode string) (ModifyTime string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT modify_time FROM base_from_sci99_data WHERE index_code=? ORDER BY modify_time DESC limit 1 `
-	err = o.Raw(sql, indexCode).QueryRow(&ModifyTime)
+	err = o.Raw(sql, indexCode).Scan(&ModifyTime).Error
 	return
 }

models/data_source/data_source.go

@@ -1,9 +1,9 @@
 package data_source
 
 import (
+	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"strings"
 	"time"
@@ -207,7 +207,7 @@ func (m *BaseFromRzdIndex) Format2SearchDataSource(origin *BaseFromRzdIndex) (it
 }
 
 func (m *BaseFromRzdIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromRzdIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -217,7 +217,7 @@ func (m *BaseFromRzdIndex) GetItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_rzd_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -283,7 +283,7 @@ func (m *BaseFromHisugarIndex) Format2SearchDataSource(origin *BaseFromHisugarIn
 }
 
 func (m *BaseFromHisugarIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromHisugarIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -293,7 +293,7 @@ func (m *BaseFromHisugarIndex) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_hisugar_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -357,7 +357,7 @@ func (m *BaseFromLyIndex) Format2SearchDataSource(origin *BaseFromLyIndex) (item
 }
 
 func (m *BaseFromLyIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromLyIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -367,7 +367,7 @@ func (m *BaseFromLyIndex) GetItemsByCondition(condition string, pars []interface
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_ly_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -434,7 +434,7 @@ func (m *BaseFromSciHqIndex) Format2SearchDataSource(origin *BaseFromSciHqIndex)
 }
 
 func (m *BaseFromSciHqIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromSciHqIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -444,7 +444,7 @@ func (m *BaseFromSciHqIndex) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_sci_hq_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -507,7 +507,7 @@ func (m *BaseFromOilchemIndex) Format2SearchDataSource(origin *BaseFromOilchemIn
 }
 
 func (m *BaseFromOilchemIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromOilchemIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -517,7 +517,7 @@ func (m *BaseFromOilchemIndex) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_oilchem_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -590,7 +590,7 @@ func (m *BaseFromThsHfIndex) Format2SearchDataSource(origin *BaseFromThsHfIndex)
 }
 
 func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromThsHfIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -600,7 +600,7 @@ func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_ths_hf_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -663,7 +663,7 @@ func (m *BaseFromCcfIndex) Format2SearchDataSource(origin *BaseFromCcfIndex) (it
 }
 
 func (m *BaseFromCcfIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromCcfIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -673,7 +673,7 @@ func (m *BaseFromCcfIndex) GetItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_ccf_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -736,7 +736,7 @@ func (m *BaseFromUsdaFasIndex) Format2SearchDataSource(origin *BaseFromUsdaFasIn
 }
 
 func (m *BaseFromUsdaFasIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromUsdaFasIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -746,7 +746,7 @@ func (m *BaseFromUsdaFasIndex) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s, end_value AS latest_value FROM base_from_usda_fas_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -809,7 +809,7 @@ func (m *BaseFromMysteelChemicalIndex) Format2SearchDataSource(origin *BaseFromM
 }
 
 func (m *BaseFromMysteelChemicalIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -819,7 +819,7 @@ func (m *BaseFromMysteelChemicalIndex) GetItemsByCondition(condition string, par
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s, end_value AS latest_value FROM base_from_mysteel_chemical_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -882,7 +882,7 @@ func (m *BaseFromSmmIndex) Format2SearchDataSource(origin *BaseFromSmmIndex) (it
 }
 
 func (m *BaseFromSmmIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -892,7 +892,7 @@ func (m *BaseFromSmmIndex) GetItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s, end_value AS latest_value FROM base_from_smm_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -955,7 +955,7 @@ func (m *BaseFromBaiinfoIndex) Format2SearchDataSource(origin *BaseFromBaiinfoIn
 }
 
 func (m *BaseFromBaiinfoIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromBaiinfoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -965,7 +965,7 @@ func (m *BaseFromBaiinfoIndex) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_baiinfo_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1028,7 +1028,7 @@ func (m *BaseFromSciIndex) Format2SearchDataSource(origin *BaseFromSciIndex) (it
 }
 
 func (m *BaseFromSciIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromSciIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1038,7 +1038,7 @@ func (m *BaseFromSciIndex) GetItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_sci_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1101,7 +1101,7 @@ func (m *BaseFromCoalmineMapping) Format2SearchDataSource(origin *BaseFromCoalmi
 }
 
 func (m *BaseFromCoalmineMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromCoalmineMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1111,7 +1111,7 @@ func (m *BaseFromCoalmineMapping) GetItemsByCondition(condition string, pars []i
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_coalmine_mapping WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1174,7 +1174,7 @@ func (m *BaseFromEiaSteoIndex) Format2SearchDataSource(origin *BaseFromEiaSteoIn
 }
 
 func (m *BaseFromEiaSteoIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromEiaSteoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1184,7 +1184,7 @@ func (m *BaseFromEiaSteoIndex) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_eia_steo_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1247,7 +1247,7 @@ func (m *BaseFromIcpiIndex) Format2SearchDataSource(origin *BaseFromIcpiIndex) (
 }
 
 func (m *BaseFromIcpiIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromIcpiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1257,7 +1257,7 @@ func (m *BaseFromIcpiIndex) GetItemsByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_icpi_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1320,7 +1320,7 @@ func (m *BaseFromYongyiIndex) Format2SearchDataSource(origin *BaseFromYongyiInde
 }
 
 func (m *BaseFromYongyiIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromYongyiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1330,7 +1330,7 @@ func (m *BaseFromYongyiIndex) GetItemsByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_yongyi_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1393,7 +1393,7 @@ func (m *BaseFromFenweiIndex) Format2SearchDataSource(origin *BaseFromFenweiInde
 }
 
 func (m *BaseFromFenweiIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromFenweiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1403,7 +1403,7 @@ 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...).Find(&items).Error
 	return
 }
 
@@ -1466,7 +1466,7 @@ func (m *BaseFromSci99Index) Format2SearchDataSource(origin *BaseFromSci99Index)
 }
 
 func (m *BaseFromSci99Index) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromSci99Index, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1476,7 +1476,7 @@ func (m *BaseFromSci99Index) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_sci99_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1538,7 +1538,7 @@ func (m *BaseFromGlIndex) Format2SearchDataSource(origin *BaseFromGlIndex) (item
 }
 
 func (m *BaseFromGlIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromGlIndex, err error) {
-	o := orm.NewOrmUsingDB("gl")
+	o := global.DbMap[utils.DbNameGL]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1548,7 +1548,7 @@ func (m *BaseFromGlIndex) GetItemsByCondition(condition string, pars []interface
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM mb_index_main_info WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1611,7 +1611,7 @@ func (m *BaseFromManualEdb) Format2SearchDataSource(origin *BaseFromManualEdb) (
 }
 
 func (m *BaseFromManualEdb) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromManualEdb, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1621,7 +1621,7 @@ func (m *BaseFromManualEdb) GetItemsByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM edbinfo WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1684,7 +1684,7 @@ func (m *BaseFromBusinessIndex) Format2SearchDataSource(origin *BaseFromBusiness
 }
 
 func (m *BaseFromBusinessIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromBusinessIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1694,7 +1694,7 @@ func (m *BaseFromBusinessIndex) GetItemsByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_business_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1757,7 +1757,7 @@ func (m *BaseFromBloombergIndex) Format2SearchDataSource(origin *BaseFromBloombe
 }
 
 func (m *BaseFromBloombergIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromBloombergIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1767,7 +1767,7 @@ func (m *BaseFromBloombergIndex) GetItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_bloomberg_index WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1830,7 +1830,7 @@ func (m *BaseFromMtjhMapping) Format2SearchDataSource(origin *BaseFromMtjhMappin
 }
 
 func (m *BaseFromMtjhMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromMtjhMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -1840,7 +1840,7 @@ func (m *BaseFromMtjhMapping) GetItemsByCondition(condition string, pars []inter
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM base_from_mtjh_mapping WHERE 1=1 %s %s`, fields, condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -1943,19 +1943,19 @@ func getCoalmineDataTableName(indexCode string) string {
 
 // GetBaseIndexDataMinMax 获取数据源极值
 func GetBaseIndexDataMinMax(source, subSource int, indexCode string) (item *BaseIndexDataMinMax, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	var sql string
 	var latestVal string
 
 	// 煤炭江湖
 	if source == utils.DATA_SOURCE_MTJH {
 		sql = `SELECT MIN(data_time) AS min_date, MAX(data_time) AS max_date FROM base_from_mtjh_index WHERE index_code = ?`
-		if err = o.Raw(sql, indexCode).QueryRow(&item); err != nil {
+		if err = o.Raw(sql, indexCode).First(&item).Error; err != nil {
 			return
 		}
 
 		sql = `SELECT deal_value AS latest_value FROM base_from_mtjh_index WHERE index_code = ? ORDER BY data_time DESC LIMIT 1`
-		if err = o.Raw(sql, indexCode).QueryRow(&latestVal); err != nil {
+		if err = o.Raw(sql, indexCode).Scan(&latestVal).Error; err != nil {
 			return
 		}
 		item.LatestValue = latestVal
@@ -1975,13 +1975,13 @@ func GetBaseIndexDataMinMax(source, subSource int, indexCode string) (item *Base
 		}
 		sql = `SELECT MIN(%s) AS min_date, MAX(%s) AS max_date FROM %s WHERE index_code = ?`
 		sql = fmt.Sprintf(sql, fieldDataTime, fieldDataTime, dataTable)
-		if err = o.Raw(sql, indexCode).QueryRow(&item); err != nil {
+		if err = o.Raw(sql, indexCode).First(&item).Error; err != nil {
 			return
 		}
 
 		sql = `SELECT deal_value AS latest_value FROM %s WHERE index_code = ? ORDER BY %s DESC LIMIT 1`
 		sql = fmt.Sprintf(sql, dataTable, fieldDataTime)
-		if err = o.Raw(sql, indexCode).QueryRow(&latestVal); err != nil {
+		if err = o.Raw(sql, indexCode).Scan(&latestVal).Error; err != nil {
 			return
 		}
 		item.LatestValue = latestVal
@@ -1997,13 +1997,13 @@ func GetBaseIndexDataMinMax(source, subSource int, indexCode string) (item *Base
 
 	sql = `SELECT MIN(data_time) AS min_date, MAX(data_time) AS max_date FROM %s WHERE index_code = ?`
 	sql = fmt.Sprintf(sql, dataTable)
-	if err = o.Raw(sql, indexCode).QueryRow(&item); err != nil {
+	if err = o.Raw(sql, indexCode).First(&item).Error; err != nil {
 		return
 	}
 
 	sql = `SELECT value AS latest_value FROM %s WHERE index_code = ? ORDER BY data_time DESC LIMIT 1`
 	sql = fmt.Sprintf(sql, dataTable)
-	if err = o.Raw(sql, indexCode).QueryRow(&latestVal); err != nil {
+	if err = o.Raw(sql, indexCode).Scan(&latestVal).Error; err != nil {
 		return
 	}
 	item.LatestValue = latestVal
@@ -2033,7 +2033,7 @@ func GetMtjhBaseInfoFromDataTable(codes []string) (items []*BaseFromMtjhIndex, e
 		return
 	}
 	sql := fmt.Sprintf(`SELECT * FROM base_from_mtjh_index WHERE index_code IN (%s) GROUP BY index_code`, utils.GetOrmInReplace(codeLens))
-	_, err = orm.NewOrmUsingDB("data").Raw(sql, codes).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, codes).Find(&items).Error
 	return
 }
 
@@ -2053,7 +2053,7 @@ func GetCoalmineBaseInfoFromDataTable(codes []string) (items []*BaseFromCoalmine
 	if codeLens == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	items = make([]*BaseFromCoalmineIndexBase, 0)
 	var jsmCodes, companyCodes, firmCodes, coastalCodes, inlandCodes []string
 	for _, code := range codes {
@@ -2077,7 +2077,7 @@ func GetCoalmineBaseInfoFromDataTable(codes []string) (items []*BaseFromCoalmine
 	itemsOnce := make([]*BaseFromCoalmineIndexBase, 0)
 	if len(jsmCodes) > 0 {
 		sql = fmt.Sprintf(`SELECT * FROM base_from_coalmine_jsm_index WHERE index_code IN (%s) GROUP BY index_code`, utils.GetOrmInReplace(len(jsmCodes)))
-		_, err = o.Raw(sql, jsmCodes).QueryRows(&itemsOnce)
+		err = o.Raw(sql, jsmCodes).Find(&itemsOnce).Error
 		if err != nil {
 			return
 		}
@@ -2085,7 +2085,7 @@ func GetCoalmineBaseInfoFromDataTable(codes []string) (items []*BaseFromCoalmine
 	}
 	if len(companyCodes) > 0 {
 		sql = fmt.Sprintf(`SELECT * FROM base_from_coalmine_company_index WHERE index_code IN (%s) GROUP BY index_code`, utils.GetOrmInReplace(len(companyCodes)))
-		_, err = o.Raw(sql, companyCodes).QueryRows(&itemsOnce)
+		err = o.Raw(sql, companyCodes).Find(&itemsOnce).Error
 		if err != nil {
 			return
 		}
@@ -2093,7 +2093,7 @@ func GetCoalmineBaseInfoFromDataTable(codes []string) (items []*BaseFromCoalmine
 	}
 	if len(firmCodes) > 0 {
 		sql = fmt.Sprintf(`SELECT * FROM base_from_coalmine_firm_index WHERE index_code IN (%s) GROUP BY index_code`, utils.GetOrmInReplace(len(firmCodes)))
-		_, err = o.Raw(sql, firmCodes).QueryRows(&itemsOnce)
+		err = o.Raw(sql, firmCodes).Find(&itemsOnce).Error
 		if err != nil {
 			return
 		}
@@ -2101,7 +2101,7 @@ func GetCoalmineBaseInfoFromDataTable(codes []string) (items []*BaseFromCoalmine
 	}
 	if len(coastalCodes) > 0 {
 		sql = fmt.Sprintf(`SELECT * FROM base_from_coalmine_coastal_index WHERE index_code IN (%s) GROUP BY index_code`, utils.GetOrmInReplace(len(coastalCodes)))
-		_, err = o.Raw(sql, coastalCodes).QueryRows(&itemsOnce)
+		err = o.Raw(sql, coastalCodes).Find(&itemsOnce).Error
 		if err != nil {
 			return
 		}
@@ -2109,7 +2109,7 @@ func GetCoalmineBaseInfoFromDataTable(codes []string) (items []*BaseFromCoalmine
 	}
 	if len(inlandCodes) > 0 {
 		sql = fmt.Sprintf(`SELECT * FROM base_from_coalmine_inland_index WHERE index_code IN (%s) GROUP BY index_code`, utils.GetOrmInReplace(len(inlandCodes)))
-		_, err = o.Raw(sql, inlandCodes).QueryRows(&itemsOnce)
+		err = o.Raw(sql, inlandCodes).Find(&itemsOnce).Error
 		if err != nil {
 			return
 		}

models/data_source/guagnzhouqihuo.go

@@ -1,7 +1,8 @@
 package data_source
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
@@ -55,23 +56,23 @@ type BaseFromTradeGuangzhouContract struct {
 }
 
 func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouClassifyAll() (list []*BaseFromTradeGuangzhouClassifyView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_trade_guangzhou_classify`
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return list, err
 }
 
 func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouMaxDate() (max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT MAX(a.end_date) AS max_date FROM base_from_trade_guangzhou_index AS a `
-	err = o.Raw(sql).QueryRow(&max_date)
+	err = o.Raw(sql).Scan(&max_date).Error
 	return max_date, err
 }
 
 func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouContract(classifyId int, tradeDate string) (list []*BaseFromTradeGuangzhouContract, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM base_from_trade_guangzhou_contract AS a WHERE base_from_trade_guangzhou_classify_id=? AND trade_date=? `
-	_, err = o.Raw(sql, classifyId, tradeDate).QueryRows(&list)
+	err = o.Raw(sql, classifyId, tradeDate).Find(&list).Error
 	return
 }
 
@@ -88,7 +89,7 @@ type BaseFromTradeGuangzhouIndexView struct {
 }
 
 func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouIndex(condition string, pars []interface{}, baseFromTradeGuangzhouContractId int) (list []*BaseFromTradeGuangzhouIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	if baseFromTradeGuangzhouContractId <= 0 {
 		sql := ` SELECT b.base_from_trade_guangzhou_index_id,b.index_code,b.index_name,b.unit,b.frequency,b.start_date,b.end_date,a.value,c.base_from_trade_guangzhou_contract_id 
  FROM base_from_trade_guangzhou_data AS a
@@ -99,7 +100,7 @@ WHERE `
 			sql += condition
 		}
 		sql += ` ORDER BY a.index_code ASC `
-		_, err = o.Raw(sql, pars).QueryRows(&list)
+		err = o.Raw(sql, pars...).Find(&list).Error
 		return
 	} else {
 		condition += ` AND a.base_from_trade_guangzhou_contract_id=? `
@@ -114,13 +115,13 @@ WHERE `
 			sql += condition
 		}
 		sql += ` ORDER BY a.index_code ASC `
-		_, err = o.Raw(sql, pars).QueryRows(&list)
+		err = o.Raw(sql, pars...).Find(&list).Error
 		return
 	}
 }
 
 func (obj *BaseFromTradeGuangzhouIndex) GetBaseFromTradeGuangzhouIndexDetail(condition string, pars []interface{}) (list []*BaseFromTradeGuangzhouIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT a.*
  FROM base_from_trade_guangzhou_index AS a
 WHERE `
@@ -129,6 +130,6 @@ WHERE `
 		sql += condition
 	}
 	sql += ` ORDER BY a.index_code ASC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = o.Raw(sql, pars...).Find(&list).Error
 	return
 }

models/data_source/icpi.go

@@ -1,7 +1,8 @@
 package data_source
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -40,9 +41,9 @@ type BaseFromIcpiClassify struct {
 }
 
 func (obj *BaseFromIcpiIndex) GetBaseFromIcpiClassifyAll() (list []*BaseFromIcpiClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_icpi_classify `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
@@ -72,45 +73,45 @@ type BaseFromIcpiIndexView struct {
 }
 
 func (obj *BaseFromIcpiIndex) GetIcpiIndex(condition string, pars interface{}) (items []*BaseFromIcpiIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM base_from_icpi_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY base_from_icpi_index_id ASC `
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars).Find(&items).Error
 	return
 }
 
 func (obj *BaseFromIcpiIndex) GetIcpiIndexDataCount(indexCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT COUNT(1) AS count  FROM base_from_icpi_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&count)
+	err = o.Raw(sql, indexCode).Scan(&count).Error
 	return
 }
 
 func (obj *BaseFromIcpiIndex) GetIcpiIndexData(indexCode string, startSize, pageSize int) (items []*BaseFromIcpiDataView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT *  FROM base_from_icpi_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, indexCode, startSize, pageSize).Find(&items).Error
 	return
 }
 
 func (obj *BaseFromIcpiIndex) GetIcpiDataMaxCount(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM base_from_icpi_index AS a
 				INNER JOIN base_from_icpi_data AS b ON a.base_from_icpi_index_id=b.base_from_icpi_index_id
 				WHERE a.base_from_icpi_classify_id=?
 				GROUP BY a.base_from_icpi_index_id
 			)AS t `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
+	err = o.Raw(sql, classifyId).Scan(&count).Error
 	return
 }
 
 func (obj *BaseFromIcpiIndex) GetIcpiIndexDataByCode(indexCode string) (items []*BaseFromIcpiDataView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT *  FROM base_from_icpi_data WHERE index_code=? ORDER BY data_time DESC  `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = o.Raw(sql, indexCode).Find(&items).Error
 	return
 }

models/data_source/longzhong.go

@@ -1,9 +1,9 @@
 package data_source
 
 import (
+	"eta/eta_api/global"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -18,20 +18,20 @@ type Longzhonginfo struct {
 
 func GetLongzhonginfoByClassifyId(classifyId int) (items []*Longzhonginfo, err error) {
 	sql := `SELECT * FROM longzhonginfo WHERE classify_id=? ORDER BY longzhonginfo_id ASC `
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	o := global.DbMap[utils.DbNameManualIndex]
+	err = o.Raw(sql, classifyId).Find(&items).Error
 	return
 }
 
 func GetLongzhongDataMaxCount(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM longzhonginfo AS a
 				INNER JOIN longzhongdata AS b ON a.longzhonginfo_id=b.longzhonginfo_id
 				WHERE a.classify_id=?
 				GROUP BY a.longzhonginfo_id
 			)AS t `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
+	err = o.Raw(sql, classifyId).Scan(&count).Error
 	return
 }
 
@@ -49,33 +49,33 @@ type Longzhongdata struct {
 }
 
 func GetLongzhongDataById(lzInfoId int) (items []*Longzhongdata, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 	sql := `SELECT * FROM longzhongdata WHERE longzhonginfo_id=? ORDER BY dt DESC `
-	_, err = o.Raw(sql, lzInfoId).QueryRows(&items)
+	err = o.Raw(sql, lzInfoId).Find(&items).Error
 	return
 }
 
 func GetLongzhongSurveyDataMaxCount(classifyName string) (count int, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM longzhong_survey_product AS a
 				INNER JOIN longzhong_survey_data AS b ON a.survey_product_id=b.survey_product_id
 				WHERE a.breed_name=?
 				GROUP BY a.survey_product_id
 			)AS t `
-	err = o.Raw(sql, classifyName).QueryRow(&count)
+	err = o.Raw(sql, classifyName).Scan(&count).Error
 	return
 }
 
 func GetLongzhongSurveyDataMaxCountByFrequency(classifyName string, frequency int) (count int, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM longzhong_survey_product AS a
 				INNER JOIN longzhong_survey_data AS b ON a.survey_product_id=b.survey_product_id
 				WHERE a.breed_name=? AND a.frequency=?
 				GROUP BY a.survey_product_id
 			)AS t `
-	err = o.Raw(sql, classifyName, frequency).QueryRow(&count)
+	err = o.Raw(sql, classifyName, frequency).Scan(&count).Error
 	return
 }
 
@@ -88,7 +88,7 @@ func GetExportLzSurveyDataMaxCount(breedIds []string) (items []ExportLzSurveyDat
 	if len(breedIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 	sql := ` SELECT
 				MAX(t.num) AS count,
 				t.breed_id
@@ -107,7 +107,7 @@ func GetExportLzSurveyDataMaxCount(breedIds []string) (items []ExportLzSurveyDat
 				) AS t
 			GROUP BY
 				t.breed_id `
-	_, err = o.Raw(sql, breedIds).QueryRows(&items)
+	err = o.Raw(sql, breedIds).Find(&items).Error
 	return
 }
 
@@ -115,10 +115,10 @@ func GetExportLzSurveyDataByBreedIds(breedIds []string) (items []*LongzhongSurve
 	if len(breedIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 	fields := ` survey_product_id, breed_id, input_value, data_time `
 	sql := `SELECT ` + fields + ` FROM longzhong_survey_data WHERE breed_id IN (` + utils.GetOrmInReplace(len(breedIds)) + `) ORDER BY breed_id ASC, survey_product_id ASC, data_time DESC `
-	_, err = o.Raw(sql, breedIds).QueryRows(&items)
+	err = o.Raw(sql, breedIds).Find(&items).Error
 	return
 }
 
@@ -157,18 +157,18 @@ type LongzhongSurveyData struct {
 }
 
 func GetLongzhongSurveyDataById(lzInfoId int) (items []*LongzhongSurveyData, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 	sql := `SELECT * FROM longzhong_survey_data WHERE survey_product_id=? ORDER BY data_time DESC `
-	_, err = o.Raw(sql, lzInfoId).QueryRows(&items)
+	err = o.Raw(sql, lzInfoId).Find(&items).Error
 	return
 }
 
 // GetLzItemList 模糊查询隆众数据库指标列表
 func GetLzItemList(keyword string) (items []*data_manage.LongzhongSurveyProduct, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 
 	sql := "SELECT * FROM longzhong_survey_product WHERE CONCAT(sample_name,breed_name,custom,quota_name,lz_code) LIKE ? "
-	_, err = o.Raw(sql, utils.GetLikeKeyword(keyword)).QueryRows(&items)
+	err = o.Raw(sql, utils.GetLikeKeyword(keyword)).Find(&items).Error
 	return
 
 }
@@ -180,27 +180,27 @@ type lzSurveyData struct {
 
 // GetLzItemListByCode 根据code查询隆众数据列表
 func GetLzItemListByCode(lzCode string) (items []*lzSurveyData, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 
 	sql := "SELECT * FROM longzhong_survey_data WHERE survey_product_id=? GROUP BY data_time DESC"
-	_, err = o.Raw(sql, lzCode).QueryRows(&items)
+	err = o.Raw(sql, lzCode).Find(&items).Error
 	return
 }
 
 // GetLzProductIdByCode 根据code查询隆众数据列表
 func GetLzProductIdByCode(lzCode string) (productId int, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 
 	sql := "SELECT survey_product_id FROM longzhong_survey_product WHERE lz_code=?"
-	err = o.Raw(sql, lzCode).QueryRow(&productId)
+	err = o.Raw(sql, lzCode).Scan(&productId).Error
 	return
 }
 
 // GetLzProductIdByCode 根据code查询隆众数据列表
 func GetLzSurveyDataMaxCountByProductId(surveyProductId int) (productId int, err error) {
-	o := orm.NewOrmUsingDB("edb")
+	o := global.DbMap[utils.DbNameManualIndex]
 
 	sql := "SELECT COUNT(1) FROM longzhong_survey_data WHERE survey_product_id=?"
-	err = o.Raw(sql, surveyProductId).QueryRow(&productId)
+	err = o.Raw(sql, surveyProductId).Scan(&productId).Error
 	return
 }

models/data_stat/edb_info_delete_log.go

@@ -1,7 +1,8 @@
 package data_stat
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
@@ -75,8 +76,12 @@ type EdbInfoDeleteLogItem struct {
 }
 
 func AddEdbDeleteLog(item *EdbInfoDeleteLog) (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.Id)
 	return
 }
 
@@ -86,7 +91,7 @@ type GetEdbDeleteLogResp struct {
 }
 
 func GetEdbDeleteLogByCondition(condition string, pars []interface{}, orderStr string, pageSize, startSize int) (item []*EdbInfoDeleteLog, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM edb_info_delete_log WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -98,17 +103,18 @@ func GetEdbDeleteLogByCondition(condition string, pars []interface{}, orderStr s
 	}
 
 	sql += ` LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&item)
+	pars = append(pars, startSize, pageSize)
+	err = o.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // GetEdbDeleteLogCount
 func GetEdbDeleteLogCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT count(*) FROM edb_info_delete_log WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars...).Scan(&count).Error
 	return
 }

models/data_stat/edb_info_stat_column.go

@@ -1,6 +1,9 @@
 package data_stat
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
+)
 
 // EdbInfoStatColumn 数据源统计表自定义列
 type EdbInfoStatColumn struct {
@@ -42,32 +45,26 @@ type EdbInfoStatColumnListReq struct {
 
 // GetStatColumn 获取自定义列
 func GetStatColumn(columnType int) (list []EdbInfoStatColumn, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM edb_info_stat_column WHERE type=? ORDER BY sort asc, id asc `
-	_, err = o.Raw(sql, columnType).QueryRows(&list)
+	err = o.Raw(sql, columnType).Find(&list).Error
 	return
 }
 
 // GetAllStatColumn 获取所有自定义列
 func GetAllStatColumn() (list []EdbInfoStatColumn, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM edb_info_stat_column ORDER BY sort asc, id asc  `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 // UpdateStatColumn 批量更新自定义列
 func UpdateStatColumn(list []*EdbInfoStatColumn) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	p, err := o.Raw("UPDATE edb_info_stat_column SET is_show = ?, sort=? WHERE id = ?").Prepare()
-	if err != nil {
-		return
-	}
-	defer func() {
-		_ = p.Close() // 别忘记关闭 statement
-	}()
+	o := global.DbMap[utils.DbNameIndex]
+	sql := "UPDATE edb_info_stat_column SET is_show = ?, sort=? WHERE id = ?"
 	for _, v := range list {
-		_, err = p.Exec(v.IsShow, v.Sort, v.Id)
+		err = o.Exec(sql, v.IsShow, v.Sort, v.Id).Error
 		if err != nil {
 			return
 		}

models/data_stat/edb_info_update_log.go

@@ -1,7 +1,8 @@
 package data_stat
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -67,8 +68,12 @@ type EdbInfoUpdateLogItem struct {
 }
 
 func AddEdbUpdateLog(item *EdbInfoUpdateLog) (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.Id)
 	return
 }
 
@@ -78,7 +83,7 @@ type GetEdbUpdateLogResp struct {
 }
 
 func GetEdbUpdateLogByCondition(condition string, pars []interface{}, orderStr string, pageSize, startSize int) (item []*EdbInfoUpdateLog, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM edb_info_update_log WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -90,17 +95,18 @@ func GetEdbUpdateLogByCondition(condition string, pars []interface{}, orderStr s
 	}
 
 	sql += ` LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&item)
+	pars = append(pars, startSize, pageSize)
+	err = o.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // GetEdbUpdateLogCount
 func GetEdbUpdateLogCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT count(*) FROM edb_info_update_log WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars...).Scan(&count).Error
 	return
 }

models/data_stat/edb_info_update_stat.go

@@ -1,7 +1,8 @@
 package data_stat
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -81,7 +82,7 @@ type GetEdbUpdateStatResp struct {
 }
 
 func GetEdbUpdateStatByCondition(condition string, pars []interface{}, orderStr string, pageSize, startSize int) (item []*EdbInfoUpdateStat, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM edb_info_update_stat WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -93,18 +94,19 @@ func GetEdbUpdateStatByCondition(condition string, pars []interface{}, orderStr
 	}
 
 	sql += ` LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&item)
+	pars = append(pars, startSize, pageSize)
+	err = o.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // GetEdbUpdateStatCount
 func GetEdbUpdateStatCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT count(*) FROM edb_info_update_stat WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -126,7 +128,7 @@ type GetEdbUpdateFailedResp struct {
 }
 
 func GetEdbUpdateStatFailedGroupByCondition(condition string, pars []interface{}) (item []*EdbUpdateFailedList, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT
 	terminal_code,
 	data_update_result as source_update_result,
@@ -145,6 +147,6 @@ WHERE
 	frequency,
 	data_update_failed_reason
 	ORDER BY count(*) desc`
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = o.Raw(sql, pars...).Find(&item).Error
 	return
 }

models/data_stat/edb_source_stat.go

@@ -1,7 +1,8 @@
 package data_stat
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -47,7 +48,7 @@ type GetEdbSourceStatResp struct {
 }
 
 func GetEdbSourceStatByCondition(condition string, pars []interface{}, orderStr string, pageSize, startSize int) (item []*EdbSourceStat, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM edb_source_stat WHERE 1=1 `
 	if condition != "" {
 		sql += condition
@@ -59,17 +60,18 @@ func GetEdbSourceStatByCondition(condition string, pars []interface{}, orderStr
 	}
 
 	sql += ` LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&item)
+	pars = append(pars, startSize, pageSize)
+	err = o.Raw(sql, pars...).Find(&item).Error
 	return
 }
 
 // GetEdbSourceStatCount
 func GetEdbSourceStatCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT count(*) FROM edb_source_stat WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars...).Scan(&count).Error
 	return
 }