Merge branch 'dm' of http://8.136.199.33:3000/eta_gn_server/eta_api into dm

models/data_manage/baiinfo_data.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
@@ -13,8 +13,8 @@ type BaiinfoClassify struct {
 
 func GetBaiinfoClassify() (items []*BaiinfoClassify, err error) {
 	sql := `SELECT CONCAT(type_2,type_3) AS type_name,CONCAT(type_2,'#',type_3) type_code  FROM base_from_baiinfo_index GROUP BY CONCAT(type_2,type_3) ORDER BY CONCAT(type_2,type_3) ASC `
-	o := orm.NewOrmUsingDB("data")
-	o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
+
 	return
 }
 
@@ -23,10 +23,10 @@ type BaiinfoFrequency struct {
 }
 
 func GetBaiinfoFrequencyByClassifyId(classifyId int) (items []*GlFrequency, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT frequency FROM base_from_baiinfo_index WHERE classify_id = ? `
 	sql += ` GROUP BY frequency ORDER BY frequency ASC `
-	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&items).Error
+
 	return
 }
 
@@ -50,13 +50,13 @@ type BaiinfoIndex struct {
 }
 
 func GetBaiinfoIndex(condition string, pars interface{}) (items []*BaiinfoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_baiinfo_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY sort ASC, base_from_baiinfo_index_id asc`
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
@@ -76,23 +76,23 @@ func GetExportBaiinfoIndex(typeCodes []string) (items []*BaiinfoExportIndex, err
 	if len(typeCodes) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *,CONCAT(type_2, "#", type_3) AS type_name FROM base_from_baiinfo_index WHERE CONCAT(type_2, "#", type_3) IN (` + utils.GetOrmInReplace(len(typeCodes)) + `) ORDER BY frequency ASC,index_code ASC`
-	_, err = o.Raw(sql, typeCodes).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, typeCodes).Scan(&items).Error
+
 	return
 }
 
 func GetBaiinfoFrequency(classifyId int) (items []*string, err error) {
 	sql := `SELECT DISTINCT frequency FROM base_from_baiinfo_index WHERE classify_id=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&items).Error
+
 	return
 }
 
 func GetBaiinfoFrequencyByCode(code string) (items []*string, err error) {
 	sql := `SELECT DISTINCT frequency FROM base_from_baiinfo_index WHERE index_code=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, code).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, code).Scan(&items).Error
+
 	return
 }
 
@@ -122,43 +122,43 @@ type BaiinfoIndexData struct {
 }
 
 func GetBaiinfoIndexData(indexCode string, startSize, pageSize int) (items []*BaiinfoIndexData, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_baiinfo_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 func GetBaiinfoIndexDataCount(indexCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count  FROM base_from_baiinfo_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
+
 	return
 }
 
 // GetBaiinfoItemList 模糊查询Baiinfo数据库指标列表
 func GetBaiinfoItemList(keyword string) (items []*BaiinfoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT * FROM base_from_baiinfo_index WHERE CONCAT(index_name,index_code) LIKE ? "
-	_, err = o.Raw(sql, utils.GetLikeKeyword(keyword)).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword)).Scan(&items).Error
+
 	return
 }
 
 func GetBaiinfoIndexDataByCode(indexCode string) (items []*BaiinfoIndexData, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_baiinfo_data WHERE index_code=? ORDER BY data_time DESC  `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&items).Error
+
 	return
 }
 
 func GetBaiinfoDataMaxCount(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM base_from_baiinfo_index AS a
 				INNER JOIN base_from_baiinfo_data AS b ON a.index_code=b.index_code
 				WHERE a.classify_id=?
 				GROUP BY a.base_from_baiinfo_index_id
 			)AS t `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&count).Error
+
 	return
 }
 
@@ -171,7 +171,6 @@ func GetExportBaiinfoDataMaxCount(typeCodes []string) (items []*ExportBaiinfoDat
 	if len(typeCodes) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT
 				MAX(t.num) AS count,
 				t.type_name
@@ -190,7 +189,7 @@ func GetExportBaiinfoDataMaxCount(typeCodes []string) (items []*ExportBaiinfoDat
 				) AS t
 			GROUP BY
 				type_name `
-	_, err = o.Raw(sql, typeCodes).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, typeCodes).Scan(&items).Error
 
 	return
 }
@@ -205,8 +204,8 @@ func GetExportBaiinfoIndexDataByCodes(indexCodes []string) (items []*ExportBaiin
 	if len(indexCodes) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT index_code,data_time,value FROM base_from_baiinfo_data WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodes)) + `) ORDER BY data_time DESC  `
-	_, err = o.Raw(sql, indexCodes).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCodes).Scan(&items).Error
+
 	return
 }

models/data_manage/base_from_baiinfo.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -33,26 +33,6 @@ type BaseFromBaiinfo struct {
 	AuthDurType       string
 }
 
-func AddBaseFromBaiinfo(item *BaseFromBaiinfo) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
-func GetBaseFromBaiinfoList() (list []*BaseFromBaiinfo, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_baiinfo `
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
-func GetBaseFromBaiinfoByBaiinfoCode(baiinfoCode string) (item *BaseFromBaiinfo, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_baiinfo WHERE interface=?`
-	err = o.Raw(sql, baiinfoCode).QueryRow(&item)
-	return
-}
-
 type BaseFromBaiinfoIndex struct {
 	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk"`
 	ClassifyId             int
@@ -66,19 +46,6 @@ type BaseFromBaiinfoIndex struct {
 	ModifyTime             time.Time
 }
 
-func AddBaseFromBaiinfoIndex(item *BaseFromBaiinfoIndex) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
-func GetBaseFromBaiinfoIndex() (list []*BaseFromBaiinfoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_baiinfo_index `
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
 type BaseFromBaiinfoData struct {
 	BaiinfoDataId          int `orm:"column(baiinfo_data_id);pk"`
 	BaseFromBaiinfoIndexId int
@@ -90,111 +57,67 @@ type BaseFromBaiinfoData struct {
 	DataTimestamp          int64
 }
 
-func AddBaseFromBaiinfoData(item *BaseFromBaiinfoData) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
-func GetBaseFromBaiinfoDataAll() (list []*BaseFromBaiinfoData, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_baiinfo_data `
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
-func ModifyBaseFromBaiinfoData(baiinfoDataId int, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_baiinfo_data SET value=?,modify_time=NOW() WHERE baiinfo_data_id=? `
-	_, err = o.Raw(sql, value, baiinfoDataId).Exec()
-	return
-}
-
-func GetBaseFromBaiinfoIndexByBaiinfoCode(baiinfoCode string) (list []*BaseFromBaiinfoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_baiinfo_index WHERE interface=? `
-	_, err = o.Raw(sql, baiinfoCode).QueryRows(&list)
-	return
-}
-
-func GetBaseFromBaiinfoMaxOrMinDate(indexCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM base_from_baiinfo_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&min_date, &max_date)
-	return
-}
-
-func ModifyBaseFromBaiinfoMinDateAndMaxDate(baseFromBaiinfoIndexId int, minDate, maxDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` UPDATE base_from_baiinfo_index SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_baiinfo_index_id=? `
-	_, err = o.Raw(sql, minDate, maxDate, baseFromBaiinfoIndexId).Exec()
-	return
-}
-
-func GetBaseFromBaiinfoDataAllByIndexCode(indexCode string) (list []*BaseFromBaiinfoData, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_baiinfo_data WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
-	return
-}
-
-func GetBaseFromBaiinfoIndexByIndexCode(indexCode string) (list *BaseFromBaiinfoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+func GetBaseFromBaiinfoIndexByIndexCode(indexCode string) (item *BaseFromBaiinfoIndex, err error) {
 	sql := ` SELECT * FROM base_from_baiinfo_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&list)
+	err = global.DmSQL["data"].Raw(sql, indexCode).First(&item).Error
+
 	return
 }
 
 // GetBaseFromBaiinfoIndexCountByClassifyIds 获取分类下指标的个数
 func GetBaseFromBaiinfoIndexCountByClassifyIds(classifyIds []int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	num := len(classifyIds)
 	if num <= 0 {
 		return
 	}
 	sql := `SELECT COUNT(1) AS count FROM base_from_baiinfo_index WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = o.Raw(sql, classifyIds).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, classifyIds).Scan(&count).Error
+
 	return
 }
 
 // GetBaseFromBaiinfoIndexByClassifyId 获取根据分类查询指标
 func GetBaseFromBaiinfoIndexByClassifyId(classifyId int) (list []*BaseFromBaiinfoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_baiinfo_index WHERE classify_id =? ORDER BY sort ASC, base_from_baiinfo_index_id ASC `
-	_, err = o.Raw(sql, classifyId).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&list).Error
+
 	return
 }
 
 // GetBaiinfoIndexAll 用于分类展示
 func GetBaiinfoIndexAll() (items []*BaseFromBaiinfoClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT base_from_baiinfo_index_id, classify_id, index_name as classify_name, index_code as base_from_baiinfo_index_code
             FROM base_from_baiinfo_index ORDER BY sort ASC, base_from_baiinfo_index_id ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }
 
 // GetBaseFromBaiinfoIndexByIndexId 根据指标id获取指标信息
 func GetBaseFromBaiinfoIndexByIndexId(indexId int) (item *BaseFromBaiinfoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_baiinfo_index WHERE base_from_baiinfo_index_id=? `
-	err = o.Raw(sql, indexId).QueryRow(&item)
+	err = o.Raw(sql, indexId).First(&item).Error
+
 	return
 }
 
 // GetBaseFromBaiinfoIndexMaxSortByClassifyId 根据指标id获取指标信息
 func GetBaseFromBaiinfoIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT max(sort) FROM base_from_baiinfo_index WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = o.Raw(sql, classifyId).Scan(&sort).Error
+
 	return
 }
 
 // GetBaseFromBaiinfoIndexMinSortByClassifyId 获取最小不等于0的排序
 func GetBaseFromBaiinfoIndexMinSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT min(sort) FROM base_from_baiinfo_index WHERE classify_id=? and sort <> 0 `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = o.Raw(sql, classifyId).Scan(&sort).Error
+
 	return
 }
 
@@ -205,72 +128,75 @@ type BaseFromBaiinfoIndexType struct {
 
 // GetBaseFromBaiinfoIndexType 获取历史指标信息类型
 func GetBaseFromBaiinfoIndexType() (list []BaseFromBaiinfoIndexType, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT type_2, type_3 from base_from_baiinfo_index where type_2 <> "" GROUP BY type_2, type_3`
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Scan(&list).Error
+
 	return
 }
 
 // MoveBaseFromBaiinfoIndex 移动指标分类
 func MoveBaseFromBaiinfoIndex(chartInfoId, classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` UPDATE base_from_baiinfo_index
 			SET
 			  classify_id = ?, modify_time=NOW() 
 			WHERE base_from_baiinfo_index_id = ?`
-	_, err = o.Raw(sql, classifyId, chartInfoId).Exec()
+	err = o.Exec(sql, classifyId, chartInfoId).Error
+
 	return
 }
 
 // UpdateBaseFromBaiinfoIndexByClassifyId 根据指标id更新排序
 func UpdateBaseFromBaiinfoIndexByClassifyId(classifyId, nowSort, prevIndexInfoId int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` update base_from_baiinfo_index set sort = ` + updateSort + ` WHERE classify_id=? AND  `
 	if prevIndexInfoId > 0 {
 		sql += ` ( sort > ? or (base_from_baiinfo_index_id > ` + fmt.Sprint(prevIndexInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
 	}
-	_, err = o.Raw(sql, classifyId, nowSort).Exec()
+	err = o.Exec(sql, classifyId, nowSort).Error
+
 	return
 }
 
 // MoveUpBaiinfoIndexBySort 往上移动
 func MoveUpBaiinfoIndexBySort(classifyId, nextSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `update base_from_baiinfo_index set sort = sort + 1 where classify_id=? and sort >= ? and sort< ?`
-	_, err = o.Raw(sql, classifyId, nextSort, currentSort).Exec()
+	err = o.Exec(sql, classifyId, nextSort, currentSort).Error
+
 	return
 }
 
 // MoveDownBaiinfoIndexBySort 往下移动
 func MoveDownBaiinfoIndexBySort(classifyId, prevSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `update base_from_baiinfo_index set sort = sort - 1 where classify_id=? and sort <= ? and sort> ? `
-	_, err = o.Raw(sql, classifyId, prevSort, currentSort).Exec()
+	err = o.Exec(sql, classifyId, prevSort, currentSort).Error
+
 	return
 }
 
 // GetFirstBaseFromBaiinfoIndexByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstBaseFromBaiinfoIndexByClassifyId(classifyId int) (item *BaseFromBaiinfoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_baiinfo_index WHERE classify_id=? order by sort asc,base_from_baiinfo_index_id asc limit 1`
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).First(&item).Error
+
 	return
 }
 
 // Update 更新Baiinfo指标基础信息
 func (item *BaseFromBaiinfoIndex) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(item, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(item).Error
+
 	return
 }
 
 // DeleteBaseFromBaiinfoIndexById 根据指标id删除对应的指标、指标数据
 func DeleteBaseFromBaiinfoIndexById(baiinfoIndexId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	o := global.DmSQL["data"]
+	to := o.Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -281,14 +207,14 @@ func DeleteBaseFromBaiinfoIndexById(baiinfoIndexId int) (err error) {
 
 	//删除指标
 	sql := `DELETE FROM base_from_baiinfo_index WHERE base_from_baiinfo_index_id = ? `
-	_, err = to.Raw(sql, baiinfoIndexId).Exec()
+	err = to.Exec(sql, baiinfoIndexId).Error
 	if err != nil {
 		return
 	}
 
 	//删除指标数据
 	sql = `DELETE FROM base_from_baiinfo_data WHERE base_from_baiinfo_index_id = ? `
-	_, err = to.Raw(sql, baiinfoIndexId).Exec()
+	err = to.Exec(sql, baiinfoIndexId).Error
 	if err != nil {
 		return
 	}

models/data_manage/base_from_baiinfo_classify.go

@@ -1,9 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -23,16 +22,21 @@ type BaseFromBaiinfoClassify struct {
 
 // AddBaseFromBaiinfoClassify 添加SMM原始数据分类
 func AddBaseFromBaiinfoClassify(item *BaseFromBaiinfoClassify) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	err = global.DmSQL["data"].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.ClassifyId)
+
 	return
 }
 
 // GetBaseFromBaiinfoClassifyCount 获取分类名称的个数
 func GetBaseFromBaiinfoClassifyCount(classifyName string, parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) AS count FROM base_from_baiinfo_classify WHERE classify_name=? AND parent_id=? `
-	err = o.Raw(sql, classifyName, parentId).QueryRow(&count)
+	err = o.Raw(sql, classifyName, parentId).Scan(&count).Error
+
 	return
 }
 
@@ -45,25 +49,28 @@ func GetBaseFromBaiinfoClassifyCount(classifyName string, parentId int) (count i
 // @return count int
 // @return err error
 func GetBaseFromBaiinfoClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) AS count FROM base_from_baiinfo_classify WHERE classify_name_en = ? AND parent_id=? `
-	err = o.Raw(sql, classifyNameEn, parentId).QueryRow(&count)
+	err = o.Raw(sql, classifyNameEn, parentId).Scan(&count).Error
+
 	return
 }
 
 // GetBaseFromBaiinfoClassifyById 通过分类id的获取分类信息
 func GetBaseFromBaiinfoClassifyById(classifyId int) (item *BaseFromBaiinfoClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_baiinfo_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).First(&item).Error
+
 	return
 }
 
 // EditBaseFromBaiinfoClassify 修改SMM原始数据分类
 func EditBaseFromBaiinfoClassify(classifyId int, classifyName string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `UPDATE base_from_baiinfo_classify SET classify_name=?,modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyName, classifyId).Exec()
+	err = o.Exec(sql, classifyName, classifyId).Error
+
 	return
 }
 
@@ -75,17 +82,19 @@ func EditBaseFromBaiinfoClassify(classifyId int, classifyName string) (err error
 // @param classifyNameEn string
 // @return err error
 func EditBaseFromBaiinfoClassifyEn(classifyId int, classifyNameEn string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `UPDATE base_from_baiinfo_classify SET classify_name_en = ?,modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyNameEn, classifyId).Exec()
+	err = o.Exec(sql, classifyNameEn, classifyId).Error
+
 	return
 }
 
 // UpdateBaseFromBaiinfoClassifySort 修改SMM原始数据分类的排序
 func UpdateBaseFromBaiinfoClassifySort(classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `UPDATE base_from_baiinfo_classify SET sort=classify_id, modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyId).Exec()
+	err = o.Exec(sql, classifyId).Error
+
 	return
 }
 
@@ -128,17 +137,19 @@ type BaseFromBaiinfoClassifyItemsButton struct {
 
 // GetBaseFromBaiinfoClassifyByParentId 根据上级id获取当下的分类列表数据
 func GetBaseFromBaiinfoClassifyByParentId(parentId int) (items []*BaseFromBaiinfoClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_baiinfo_classify WHERE parent_id=? order by sort asc,classify_id asc`
-	_, err = o.Raw(sql, parentId).QueryRows(&items)
+	err = o.Raw(sql, parentId).Scan(&items).Error
+
 	return
 }
 
 // GetAllBaseFromBaiinfoClassify 获取所有的分类列表数据
 func GetAllBaseFromBaiinfoClassify() (items []*BaseFromBaiinfoClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_baiinfo_classify WHERE parent_id <> 0 order by sort asc,classify_id asc`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }
 
@@ -158,53 +169,38 @@ type BaseFromBaiinfoClassifySimplify struct {
 	ParentId     int
 }
 
-// GetFirstBaseFromBaiinfoClassify 获取当前分类下，且排序数相同 的排序第一条的数据
-func GetFirstBaseFromBaiinfoClassify() (item *BaseFromBaiinfoClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_baiinfo_classify order by sort asc,classify_id asc limit 1`
-	err = o.Raw(sql).QueryRow(&item)
-	return
-}
-
-// UpdateBaseFromBaiinfoClassifySortByClassifyId 根据分类id更新排序
-func UpdateBaseFromBaiinfoClassifySortByClassifyId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` update base_from_baiinfo_classify set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? `
-	if classifyId > 0 {
-		sql += ` or ( classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
-	}
-	_, err = o.Raw(sql, parentId, nowSort).Exec()
-	return
-}
-
 // MoveUpBaiinfoIndexClassifyBySort 往上移动
 func MoveUpBaiinfoIndexClassifyBySort(parentId, nextSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `update base_from_baiinfo_classify set sort = sort + 1 where parent_id=? and sort >= ? and sort< ?`
-	_, err = o.Raw(sql, parentId, nextSort, currentSort).Exec()
+	err = o.Exec(sql, parentId, nextSort, currentSort).Error
+
 	return
 }
 
 // MoveDownBaiinfoIndexClassifyBySort 往下移动
 func MoveDownBaiinfoIndexClassifyBySort(parentId, prevSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `update base_from_baiinfo_classify set sort = sort - 1 where parent_id=? and sort <= ? and sort> ? `
-	_, err = o.Raw(sql, parentId, prevSort, currentSort).Exec()
+	err = o.Exec(sql, parentId, prevSort, currentSort).Error
+
 	return
 }
 
 // GetBaiinfoIndexClassifyMinSort 获取最小不等于0的排序
 func GetBaiinfoIndexClassifyMinSort(parentId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `select min(sort) from base_from_baiinfo_classify where parent_id=? and sort <> 0 `
-	err = o.Raw(sql, parentId).QueryRow(&sort)
+	err = o.Raw(sql, parentId).Scan(&sort).Error
+
 	return
 }
 
 // Update 更新分类基础信息
 func (BaseFromBaiinfoClassify *BaseFromBaiinfoClassify) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(BaseFromBaiinfoClassify, cols...)
+	o := global.DmSQL["data"]
+	err = o.Select(cols).Updates(BaseFromBaiinfoClassify).Error
+
 	return
 }
 
@@ -214,36 +210,38 @@ type AddBaiinfoClassifyResp struct {
 
 // DeleteBaiinfoClassifyByClassifyId 根据分类id删除对应的指标分类
 func DeleteBaiinfoClassifyByClassifyId(classifyIdList []int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	num := len(classifyIdList)
 	if num <= 0 {
 		return
 	}
 	//删除分类
 	sql := `DELETE FROM base_from_baiinfo_classify WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, classifyIdList).Exec()
+	err = o.Exec(sql, classifyIdList).Error
+
 	return
 }
 
 // AddBaiinfoClassifyMulti 批量新增SMM类别
 func AddBaiinfoClassifyMulti(list []*BaseFromBaiinfoClassify) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(1, list)
+	o := global.DmSQL["data"]
+	err = o.CreateInBatches(list, utils.MultiAddNum).Error
+
 	return
 }
 
 // InitBaiinfoClassifySort 初始化sort值
 func InitBaiinfoClassifySort() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_baiinfo_classify 
-SET modify_time=NOW(), sort = classify_id`
-	_, err = o.Raw(sql).Exec()
+	o := global.DmSQL["data"]
+	sql := `UPDATE base_from_baiinfo_classify SET modify_time=NOW(), sort = classify_id`
+	err = o.Exec(sql).Error
+
 	return
 }
 
 // InitBaiinfoIndexClassifyId 历史数据的classifyId值
 func InitBaiinfoIndexClassifyId() (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `UPDATE base_from_baiinfo_index s
 LEFT JOIN (
 SELECT
@@ -254,6 +252,7 @@ FROM
 	LEFT JOIN base_from_baiinfo_classify c2 ON c1.parent_id = c2.classify_id 
 	) AS t ON CONCAT( s.type_2, s.type_3 ) = t.type_name
 	SET s.classify_id = t.classify_id, s.modify_time=NOW() where s.type_2 <>""`
-	_, err = o.Raw(sql).Exec()
+	err = o.Exec(sql).Error
+
 	return
 }

models/data_manage/base_from_bloomberg_index.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"strings"
 	"time"
@@ -74,12 +74,8 @@ func (m *BaseFromBloombergIndex) PrimaryId() string {
 }
 
 func (m *BaseFromBloombergIndex) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.BaseFromBloombergIndexId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -87,21 +83,23 @@ func (m *BaseFromBloombergIndex) CreateMulti(items []*BaseFromBloombergIndex) (e
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *BaseFromBloombergIndex) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	o := global.DmSQL["data"]
+	err = o.Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *BaseFromBloombergIndex) Del() (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	_, err = o.Raw(sql, m.BaseFromBloombergIndexId).Exec()
+	err = o.Exec(sql, m.BaseFromBloombergIndexId).Error
+
 	return
 }
 
@@ -109,39 +107,43 @@ func (m *BaseFromBloombergIndex) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	_, err = o.Raw(sql, menuIds).Exec()
+	err = o.Exec(sql, menuIds).Error
+
 	return
 }
 
 func (m *BaseFromBloombergIndex) GetItemById(id int) (item *BaseFromBloombergIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = o.Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *BaseFromBloombergIndex) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *BaseFromBloombergIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = o.Raw(sql, pars).First(&item).Error
+
 	return
 }
 
 func (m *BaseFromBloombergIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func (m *BaseFromBloombergIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, limit int) (items []*BaseFromBloombergIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -154,12 +156,13 @@ func (m *BaseFromBloombergIndex) GetItemsByCondition(condition string, pars []in
 	if limit > 0 {
 		sql += fmt.Sprintf(` LIMIT %d`, limit)
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 func (m *BaseFromBloombergIndex) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BaseFromBloombergIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -169,7 +172,8 @@ func (m *BaseFromBloombergIndex) GetPageItemsByCondition(condition string, pars
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
@@ -235,9 +239,10 @@ type BloombergSourceListResp struct {
 
 // UpdateEdbExist 标记已添加指标库
 func (m *BaseFromBloombergIndex) UpdateEdbExist(indexCode string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`UPDATE %s SET %s = ? WHERE %s = ? LIMIT 1`, m.TableName(), BaseFromBloombergIndexCols.EdbExist, BaseFromBloombergIndexCols.IndexCode)
-	_, err = o.Raw(sql, 1, indexCode).Exec()
+	err = o.Exec(sql, 1, indexCode).Error
+
 	return
 }
 
@@ -266,7 +271,7 @@ type BloombergSourceBatchAddCheckReq struct {
 //}
 //
 //func (m *BaseFromBloombergData) Create() (err error) {
-//	o := orm.NewOrmUsingDB("data")
+//	o := global.DmSQL["data"]
 //	id, err := o.Insert(m)
 //	if err != nil {
 //		return
@@ -279,7 +284,7 @@ type BloombergSourceBatchAddCheckReq struct {
 //	if len(items) == 0 {
 //		return
 //	}
-//	o := orm.NewOrmUsingDB("data")
+//	o := global.DmSQL["data"]
 //	_, err = o.InsertMulti(len(items), items)
 //	return
 //}

models/data_manage/base_from_business_data.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -66,8 +66,6 @@ type WhereParams struct {
 // @return result []BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) GetAllDataList(condition string, pars []interface{}, order string) (result []*BaseFromBusinessData, err error) {
-	o := orm.NewOrmUsingDB("data")
-
 	sql := `SELECT * FROM base_from_business_data WHERE 1=1 `
 	if condition != `` {
 		sql += ` ` + condition
@@ -77,7 +75,7 @@ func (m *BaseFromBusinessData) GetAllDataList(condition string, pars []interface
 		sql += ` ORDER BY ` + order
 	}
 
-	_, err = o.Raw(sql, pars).QueryRows(&result)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&result).Error
 
 	return
 }
@@ -92,7 +90,7 @@ func (m *BaseFromBusinessData) GetAllDataList(condition string, pars []interface
 // @return result []*BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) GetLimitDataList(condition string, pars []interface{}, order string, size int64) (result []*BaseFromBusinessData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_business_data WHERE 1=1 `
 	if condition != `` {
 		sql += ` ` + condition
@@ -104,7 +102,7 @@ func (m *BaseFromBusinessData) GetLimitDataList(condition string, pars []interfa
 
 	sql += fmt.Sprintf(` LIMIT %d`, size)
 
-	_, err = o.Raw(sql, pars).QueryRows(&result)
+	err = o.Raw(sql, pars).Scan(&result).Error
 
 	return
 }
@@ -121,7 +119,6 @@ func (m *BaseFromBusinessData) GetLimitDataList(condition string, pars []interfa
 // @return result []*BaseFromBusinessData
 // @return err error
 func (m *BaseFromBusinessData) GetPageDataList(condition []string, pars []interface{}, order string, startSize, size int64) (result []*BaseFromBusinessData, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_business_data `
 	if len(condition) > 0 {
 		sql += ` WHERE ` + strings.Join(condition, " AND ")
@@ -133,7 +130,7 @@ func (m *BaseFromBusinessData) GetPageDataList(condition []string, pars []interf
 
 	sql += fmt.Sprintf(` LIMIT %d,%d`, startSize, size)
 
-	_, err = o.Raw(sql, pars).QueryRows(&result)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&result).Error
 
 	return
 }
@@ -147,12 +144,11 @@ func (m *BaseFromBusinessData) GetPageDataList(condition []string, pars []interf
 // @return count int64
 // @return err error
 func (m *BaseFromBusinessData) GetCountDataList(condition []string, pars []interface{}) (count int64, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COUNT(1) FROM base_from_business_data `
 	if len(condition) > 0 {
 		sql += ` WHERE ` + strings.Join(condition, " AND ")
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
 
 	return
 }
@@ -165,8 +161,7 @@ func (m *BaseFromBusinessData) GetCountDataList(condition []string, pars []inter
 // @param addData interface{}
 // @return err error
 func (m *BaseFromBusinessData) InsertDataByColl(addData interface{}) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Insert(addData)
+	err = global.DmSQL["data"].Create(addData).Error
 
 	return
 }
@@ -180,8 +175,7 @@ func (m *BaseFromBusinessData) InsertDataByColl(addData interface{}) (err error)
 // @param dataList []interface{}
 // @return err error
 func (m *BaseFromBusinessData) BatchInsertData(bulk int, dataList []interface{}) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(bulk, dataList)
+	err = global.DmSQL["data"].CreateInBatches(dataList, bulk).Error
 
 	return
 }
@@ -195,8 +189,7 @@ func (m *BaseFromBusinessData) BatchInsertData(bulk int, dataList []interface{})
 // @param updateParams interface{}
 // @return err error
 func (m *BaseFromBusinessData) UpdateData(updateCols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, updateCols...)
+	err = global.DmSQL["data"].Select(updateCols).Updates(m).Error
 	if err != nil {
 		fmt.Println("UpdateDataByColl:Err:" + err.Error())
 		return
@@ -214,17 +207,17 @@ func (m *BaseFromBusinessData) UpdateData(updateCols []string) (err error) {
 // @return result EdbInfoMaxAndMinInfo
 // @return err error
 func (m *BaseFromBusinessData) GetEdbInfoMaxAndMinInfo(indexCode string) (result EdbInfoMaxAndMinInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ``
 	sql = ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date,MIN(value) AS min_value,MAX(value) AS max_value FROM base_from_business_data WHERE index_code = ? `
-	err = o.Raw(sql, indexCode).QueryRow(&result)
+	err = o.Raw(sql, indexCode).Scan(&result).Error
 	if err != nil {
 		return
 	}
 
 	var latestValue float64
 	sql = ` SELECT value AS latest_value FROM base_from_business_data WHERE index_code = ? ORDER BY data_time DESC LIMIT 1 `
-	err = o.Raw(sql, indexCode).QueryRow(&latestValue)
+	err = o.Raw(sql, indexCode).Scan(&latestValue).Error
 	result.LatestValue = latestValue
 
 	return

models/data_manage/base_from_business_index.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -75,9 +75,9 @@ type EdbBusinessSource struct {
 // @return item *EdbBusinessSource
 // @return err error
 func (m *EdbBusinessSource) GetEdbBusinessSourceItem(sourceName string) (item *EdbBusinessSource, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_business_source WHERE source_name = ? `
-	err = o.Raw(sql, sourceName).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, sourceName).First(&item).Error
+
 	return
 }
 
@@ -89,9 +89,9 @@ func (m *EdbBusinessSource) GetEdbBusinessSourceItem(sourceName string) (item *E
 // @return items []*EdbBusinessSource
 // @return err error
 func (m *EdbBusinessSource) GetAllList() (items []*EdbBusinessSource, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM edb_business_source order by  edb_business_source_id desc `
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
 
 	return
 }
@@ -110,8 +110,7 @@ func (m *BaseFromBusinessIndex) GetListCount(condition string, pars []interface{
 	if condition != "" {
 		sql += condition
 	}
-	o := orm.NewOrmUsingDB("data")
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
 
 	return
 }
@@ -133,8 +132,7 @@ func (m *BaseFromBusinessIndex) GetList(condition string, pars []interface{}, st
 		sql += condition
 	}
 	sql += ` order by a.base_from_business_index_id desc limit ?,? `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars, startSize, pageSize).Scan(&items).Error
 
 	return
 }
@@ -180,8 +178,7 @@ func (m *BaseFromBusinessIndex) GetPageItemsByCondition(condition string, pars [
 		sql += ` order by ` + orderRule
 	}
 	sql += ` limit ?,? `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, utils.DATA_SOURCE_BUSINESS, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, utils.DATA_SOURCE_BUSINESS, pars, startSize, pageSize).Scan(&items).Error
 
 	return
 }
@@ -212,8 +209,7 @@ func (m *BaseFromBusinessIndex) GeItemsByCondition(condition string, pars []inte
 		pars = append(pars, limitSize)
 	}
 
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, utils.DATA_SOURCE_BUSINESS, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, utils.DATA_SOURCE_BUSINESS, pars).Scan(&items).Error
 
 	return
 }
@@ -228,8 +224,8 @@ func (m *BaseFromBusinessIndex) GeItemsByCondition(condition string, pars []inte
 // @return err error
 func (m *BaseFromBusinessIndex) GetDetailByEdbCode(edbCode string) (item *BaseFromBusinessIndex, err error) {
 	sql := `select *  FROM base_from_business_index  WHERE index_code = ? `
-	o := orm.NewOrmUsingDB("data")
-	err = o.Raw(sql, edbCode).QueryRow(&item)
+	o := global.DmSQL["data"]
+	err = o.Raw(sql, edbCode).First(&item).Error
 
 	return
 }

models/data_manage/base_from_ccf.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -51,20 +51,21 @@ type CCFSingleData struct {
 }
 
 func GetCCFIndex(condition string, pars interface{}) (items []*BaseFromCCFIndexList, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_ccf_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_ccf_index_id asc`
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 func GetCCFIndexDataCount(indexCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT COUNT(1) AS count FROM base_from_ccf_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&count)
+	err = o.Raw(sql, indexCode).Scan(&count).Error
+
 	return
 }
 
@@ -77,16 +78,16 @@ func GetCCFIndexDataCountGroup(indexCodes []string) (items []*CCFIndexDataCountG
 	if len(indexCodes) <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count, index_code FROM base_from_ccf_data WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodes)) + `) GROUP BY index_code`
-	_, err = o.Raw(sql, indexCodes).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCodes).Scan(&items).Error
+
 	return
 }
 
 func GetCCFIndexData(indexCode string, startSize, pageSize int) (items []*BaseFromCCFData, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_ccf_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
@@ -94,9 +95,9 @@ func GetCCFIndexDataByCodes(indexCode []string) (items []*BaseFromCCFData, err e
 	if len(indexCode) <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_ccf_data WHERE index_code in (` + utils.GetOrmInReplace(len(indexCode)) + `) ORDER BY data_time DESC  `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&items).Error
+
 	return
 }
 
@@ -120,25 +121,25 @@ type BaseFromCCFIndexSearchItem struct {
 
 // GetCCFItemList 模糊查询CCF数据库指标列表
 func GetCCFItemList(condition string) (items []*BaseFromCCFIndexSearchItem, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT * FROM base_from_ccf_index WHERE 1=1"
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
+
 	return
 }
 
 func GetCCFIndexDataByCode(indexCode string) (list []*BaseFromCCFData, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_ccf_data WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&list).Error
+
 	return
 }
 
 func GetBaseFromCCFIndexByIndexCode(indexCode string) (list *BaseFromCCFIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_ccf_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&list)
+	err = global.DmSQL["data"].Raw(sql, indexCode).First(&list).Error
+
 	return
 }

models/data_manage/base_from_ccf_classify.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -21,9 +21,9 @@ type BaseFromCCFClassify struct {
 
 // GetBaseFromCCFClassify 获取所有分类
 func GetBaseFromCCFClassify() (items []*BaseFromCCFClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_ccf_classify ORDER BY parent_id ASC, sort ASC, base_from_ccf_classify_id ASC`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
+
 	return
 }
 

models/data_manage/base_from_changes_visitors_covid.go

@@ -1,11 +1,13 @@
 package data_manage
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta_gn/eta_api/global"
+)
 
 func GetVisitorsCovidLastDate() (last_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT max(a.day) AS last_date FROM base_from_changes_visitors_covid AS a `
-	err = o.Raw(sql).QueryRow(&last_date)
+	err = global.DmSQL["data"].Raw(sql).Scan(&last_date).Error
+
 	return
 }
 
@@ -27,10 +29,10 @@ type BaseFromChangesVisitorsCovid struct {
 }
 
 func GetVisitorsCovidList(day string) (list []*BaseFromChangesVisitorsCovid, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_changes_visitors_covid WHERE day=? `
 
 	sql += ` ORDER BY entity ASC `
-	_, err = o.Raw(sql, day).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, day).Scan(&list).Error
+
 	return
 }

models/data_manage/base_from_edb_mapping.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -55,12 +55,11 @@ func (m *BaseFromEdbMapping) Cols() BaseFromEdbMappingCols {
 }
 
 func (m *BaseFromEdbMapping) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
+	err = global.DmSQL["data"].Create(m).Error
 	if err != nil {
 		return
 	}
-	m.Id = int(id)
+
 	return
 }
 
@@ -68,21 +67,21 @@ func (m *BaseFromEdbMapping) CreateMulti(items []*BaseFromEdbMapping) (err error
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *BaseFromEdbMapping) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *BaseFromEdbMapping) Remove() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.Id).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.Id).Error
+
 	return
 }
 
@@ -90,9 +89,9 @@ func (m *BaseFromEdbMapping) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DmSQL["data"].Exec(sql, ids).Error
+
 	return
 }
 
@@ -100,39 +99,38 @@ func (m *BaseFromEdbMapping) RemoveByCondition(condition string, pars []interfac
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = global.DmSQL["data"].Exec(sql, pars).Error
+
 	return
 }
 
 func (m *BaseFromEdbMapping) GetItemById(id int) (item *BaseFromEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *BaseFromEdbMapping) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *BaseFromEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+
 	return
 }
 
 func (m *BaseFromEdbMapping) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func (m *BaseFromEdbMapping) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -142,12 +140,12 @@ func (m *BaseFromEdbMapping) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).First(&items).Error
+
 	return
 }
 
 func (m *BaseFromEdbMapping) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BaseFromEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -157,6 +155,7 @@ func (m *BaseFromEdbMapping) GetPageItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars, startSize, pageSize).Scan(&items).Error
+
 	return
 }

models/data_manage/base_from_eia_stero.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -83,8 +83,8 @@ type BaseFromEiaSteoDataItem struct {
 // GetEiaSteoClassifyList 获取分类列表
 func GetEiaSteoClassifyList() (items []*BaseFromEiaSteoClassify, err error) {
 	sql := ` SELECT * FROM base_from_eia_steo_classify  ORDER BY base_from_eia_steo_classify_id ASC `
-	o := orm.NewOrmUsingDB("data")
-	o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
+
 	return
 }
 
@@ -108,16 +108,16 @@ func GetEiaSteoIndexList(condition string, pars []interface{}) (items []*BaseFro
 	sql := ` SELECT *  FROM base_from_eia_steo_index WHERE 1=1  `
 	sql += condition
 	sql += ` ORDER BY base_from_eia_steo_index_id ASC `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 // GetEiaSteoIndexDataCount 获取指标数据总数
 func GetEiaSteoIndexDataCount(indexCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COUNT(1) AS count FROM base_from_eia_steo_data where index_code = ? `
-	err = o.Raw(sql, indexCode).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
+
 	return
 }
 
@@ -125,16 +125,16 @@ func GetEiaSteoIndexDataCount(indexCode string) (count int, err error) {
 func GetEiaSteoIndexDataList(indexCode string, startSize, pageSize int) (items []*BaseFromEiaSteoDataItem, err error) {
 	//sql := ` SELECT *  FROM mb_index_main_data WHERE INDEX_CODE=? ORDER BY DATA_DATE DESC,PUBLISH_TIME DESC LIMIT ?,?`
 	sql := ` SELECT * FROM base_from_eia_steo_data AS a WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 // GetEiaSteoItemList 模糊查询EiaSteo数据库指标列表
 func GetEiaSteoItemList(keyword string) (items []*BaseFromEiaSteoIndexItem, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT * FROM base_from_eia_steo_index WHERE index_name LIKE ?  OR index_code like ?"
-	_, err = o.Raw(sql, utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword)).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword)).Scan(&items).Error
+
 	return
 }
 
@@ -146,16 +146,15 @@ func GetEiaSteoDateList(indexCodeList []string) (items []*BaseFromEiaSteoDataIte
 	}
 
 	sql := ` SELECT data_time FROM base_from_eia_steo_data WHERE index_code IN(` + utils.GetOrmInReplace(num) + `)  GROUP BY data_time ORDER BY data_time DESC `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, indexCodeList).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCodeList).Scan(&items).Error
 
 	return
 }
 
 // GetBaseFromEiaSteoIndexByCode 根据指标code获取指标信息
 func GetBaseFromEiaSteoIndexByCode(indexCode string) (item *BaseFromEiaSteoIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_eia_steo_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, indexCode).First(&item).Error
+
 	return
 }

models/data_manage/base_from_fenwei.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -92,20 +92,13 @@ type BaseFromFenWeiIndexPage struct {
 }
 
 func GetFenweiIndex(condition string, pars interface{}) (items []*BaseFromFenweiIndexList, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_fenwei_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, fenwei_index_id asc`
-	_, err = o.Raw(sql, pars).QueryRows(&items)
-	return
-}
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
 
-func GetFenweiIndexDataCount(indexCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT COUNT(1) AS count FROM base_from_fenwei_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&count)
 	return
 }
 
@@ -118,16 +111,16 @@ func GetFenweiIndexDataCountGroup(indexCodes []string) (items []*FenweiIndexData
 	if len(indexCodes) <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count, index_code FROM base_from_fenwei_data WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodes)) + `) GROUP BY index_code`
-	_, err = o.Raw(sql, indexCodes).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCodes).Scan(&items).Error
+
 	return
 }
 
 func GetFenweiIndexData(indexCode string, startSize, pageSize int) (items []*BaseFromFenweiData, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_fenwei_data WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
@@ -135,9 +128,9 @@ func GetFenweiIndexDataByCodes(indexCode []string) (items []*BaseFromFenweiData,
 	if len(indexCode) <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_fenwei_data WHERE index_code in (` + utils.GetOrmInReplace(len(indexCode)) + `) ORDER BY data_time DESC  `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&items).Error
+
 	return
 }
 
@@ -161,26 +154,26 @@ type BaseFromFenweiIndexSearchItem struct {
 
 // GetFenweiItemList 模糊查询汾渭数据库指标列表
 func GetFenweiItemList(condition string) (items []*BaseFromFenweiIndexSearchItem, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT * FROM base_from_fenwei_index WHERE 1=1"
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
+
 	return
 }
 
 func GetFenweiIndexDataByCode(indexCode string) (list []*BaseFromFenweiData, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_fenwei_data WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&list).Error
+
 	return
 }
 
 func GetBaseFromFenweiIndexByIndexCode(indexCode string) (list *BaseFromFenweiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_fenwei_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&list)
+	err = global.DmSQL["data"].Raw(sql, indexCode).First(&list).Error
+
 	return
 }
 
@@ -197,11 +190,10 @@ func GetFenWeiIndexFrequency(classifyId int) (items []*string, err error) {
 
 	sql += ` ORDER BY FIELD(frequency, '日度', '周度', '月度', '季度', '半年度', '年度')`
 
-	o := orm.NewOrmUsingDB("data")
 	if classifyId > 0 {
-		_, err = o.Raw(sql, classifyId).QueryRows(&items)
+		err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&items).Error
 	} else {
-		_, err = o.Raw(sql).QueryRows(&items)
+		err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
 	}
 
 	return items, err
@@ -209,7 +201,6 @@ func GetFenWeiIndexFrequency(classifyId int) (items []*string, err error) {
 
 // GetFenWeiIndexByCodeAndClassify 根据指标编码和分类查询 indexCode非必传
 func GetFenWeiIndexByCodeAndClassify(indexCode string, classifyId int, frequency *string) (items []*BaseFromFenweiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 
 	// SQL 查询语句
 	sql := `SELECT a.index_code, a.index_name, a.frequency, a.unit, MAX(b.modify_time) AS modify_time
@@ -237,7 +228,7 @@ func GetFenWeiIndexByCodeAndClassify(indexCode string, classifyId int, frequency
 
 	sql += ` GROUP BY a.index_code, a.index_name, a.frequency, a.unit`
 
-	_, err = o.Raw(sql, params...).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, params...).Scan(&items).Error
 	if err != nil {
 		return nil, err
 	}
@@ -247,39 +238,28 @@ func GetFenWeiIndexByCodeAndClassify(indexCode string, classifyId int, frequency
 // GetBaseFromFenWeiDataByIndexCode 根据指标编码查询
 func GetBaseFromFenWeiDataByIndexCode(indexCode string) (items []*BaseFromFenweiData, err error) {
 	sql := `SELECT * FROM base_from_fenwei_data WHERE index_code=? ORDER BY data_time desc`
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&items).Error
+
 	return
 }
 
 // GetFenWeiDataListByIndexCodes 根据指标编码查询
 func GetFenWeiDataListByIndexCodes(IndexCodes string) (items []string, err error) {
 	sql := ` SELECT data_time FROM base_from_fenwei_data WHERE index_code IN(` + IndexCodes + `)  GROUP BY data_time DESC `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
+
 	return
 }
 
 // GetFenWeiIndexInfoPage 分页查询指标信息
 func GetFenWeiIndexInfoPage(condition string, pars []interface{}) (items []*BaseFromFenweiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_fenwei_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY fenwei_index_id asc`
-	_, err = o.Raw(sql, pars).QueryRows(&items)
-	return
-
-}
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
 
-// GetFenWeiIndexInfoCount 查询指标信息总数
-func GetFenWeiIndexInfoCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT COUNT(1) AS count FROM base_from_fenwei_index WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
-	err = o.Raw(sql, pars).QueryRow(&count)
 	return
+
 }

models/data_manage/base_from_fenwei_classify.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -21,9 +21,9 @@ type BaseFromFenweiClassify struct {
 
 // GetBaseFromFenweiClassify 获取所有分类
 func GetBaseFromFenweiClassify() (items []*BaseFromFenweiClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_fenwei_classify ORDER BY parent_id ASC, sort ASC, classify_id ASC`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
+
 	return
 }
 
@@ -56,13 +56,13 @@ func (y *BaseFromFenweiClassify) Format2Item(origin *BaseFromFenweiClassify) (it
 
 // GetFenweiClassifyItemByClassifyId 根据分类id查询分类信息
 func GetFenweiClassifyItemByClassifyId(classifyId int) (item *BaseFromFenweiClassifyItem, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_fenwei_classify WHERE classify_id = ?`
 	var origin BaseFromFenweiClassify
-	err = o.Raw(sql, classifyId).QueryRow(&origin)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&origin).Error
 	if err != nil {
 		return
 	}
 	item = origin.Format2Item(&origin)
+
 	return
 }

models/data_manage/base_from_mtjh.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -49,59 +49,10 @@ type BaseFromMtjhIndexItem struct {
 	ModifyTime          string `description:"修改时间"`
 }
 
-// 查询指标
-func GetBaseFromMtjhMapping() (items []*BaseFromMtjhMapping, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_mtjh_mapping`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// 查询指标
-func GetBaseFromMtjhIndex() (items []*BaseFromMtjhIndex, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_mtjh_index`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// 添加数据
-func AddBaseFromMtjhIndex(item *BaseFromMtjhIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	return
-}
-
-func AddBaseFromMtjhIndexMuti(items []*BaseFromMtjhIndex) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertMulti(500, items)
-	return
-}
-
-// 添加指标
-func AddBaseFromMtjhMapping(item *BaseFromMtjhMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	return
-}
-
-func AddBaseFromMtjhMappingMuti(items []*BaseFromMtjhMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.InsertMulti(500, items)
-	return
-}
-
-func UpdateBaseFromMtjhIndex(item *BaseFromMtjhIndex) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE base_from_mtjh_index SET deal_value=?  WHERE index_name=?  AND  data_time = ?`
-	_, err = o.Raw(sql, item.DealValue, item.IndexName, item.DataTime).Exec()
-	return
-}
-
 func GetMtjhClassifyList() (list []*BaseFromMtjhMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT * FROM base_from_mtjh_mapping group by area"
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql).Scan(&list).Error
+
 	return
 }
 
@@ -118,13 +69,13 @@ type BaseFromMtjhMappingItem struct {
 }
 
 func GetMtjhMapping(condition string, pars interface{}) (items []*BaseFromMtjhMappingItem, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_mtjh_mapping WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY base_from_mtjh_mapping_id asc`
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
@@ -144,60 +95,61 @@ type BaseFromMtjhIndexList struct {
 }
 
 func GetMtjhIndexDataCount(indexCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count  FROM base_from_mtjh_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&count).Error
+
 	return
 }
 
 func GetMtjhIndexData(indexCode string, startSize, pageSize int) (items []*BaseFromMtjhIndexItem, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_mtjh_index WHERE index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	_, err = o.Raw(sql, indexCode, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCode, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 // GetMtjhItemList 模糊查询煤炭江湖数据库指标列表
 func GetMtjhItemList(keyword string) (items []*BaseFromMtjhMappingItem, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT * FROM base_from_mtjh_mapping WHERE CONCAT(index_name,index_code) LIKE ? "
-	_, err = o.Raw(sql, utils.GetLikeKeyword(keyword)).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword)).Scan(&items).Error
+
 	return
 }
 
 // 查询数据
 func GetBaseFromMtjhIndexByCode(indexCode string) (items []*BaseFromMtjhIndexItem, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_mtjh_index WHERE index_code=? ORDER BY data_time DESC `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&items).Error
+
 	return
 }
 
 // GetMtjhMappingItemByCode
 func GetMtjhMappingItemByCode(indexCode string) (item *BaseFromMtjhMappingItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_mtjh_mapping WHERE index_code=? "
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = o.Raw(sql, indexCode).First(&item).Error
+
 	return
 }
 
 // GetMtjhFrequencyByArea
 func GetMtjhFrequencyByArea(area string) (items []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT frequency FROM base_from_mtjh_index WHERE area=?  group by area "
-	_, err = o.Raw(sql, area).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, area).Scan(&items).Error
+
 	return
 }
 
 func GetClassifyMtjhByArea(area string) (items []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT DISTINCT index_code FROM base_from_mtjh_index WHERE area=? `
-	_, err = o.Raw(sql, area).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, area).Scan(&items).Error
+
 	return
 }
 
 func GetCoalMtjhMaxCount(area string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT
 	MAX( t.num ) AS count 
 FROM
@@ -210,25 +162,28 @@ FROM
 		area =? 
 GROUP BY
 	index_name ) AS t `
-	err = o.Raw(sql, area).QueryRow(&count)
+	err = o.Raw(sql, area).Scan(&count).Error
+
 	return
 }
 
 func GetMtjhCount(indexCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT
 		COUNT( 1 ) AS num 
 	FROM
 		base_from_mtjh_index
 	WHERE
 		index_code =? `
-	err = o.Raw(sql, indexCode).QueryRow(&count)
+	err = o.Raw(sql, indexCode).Scan(&count).Error
+
 	return
 }
 
 func GetMtjhIndexLatestDate(indexCode string) (ModifyTime string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT modify_time FROM base_from_mtjh_index 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_manage/base_from_national_statistics_classify.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -25,12 +26,8 @@ func (m *BaseFromNationalStatisticsClassify) TableName() string {
 }
 
 func (m *BaseFromNationalStatisticsClassify) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.BaseFromNationalStatisticsClassifyId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -38,49 +35,48 @@ func (m *BaseFromNationalStatisticsClassify) CreateMulti(items []*BaseFromNation
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsClassify) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsClassify) Del() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `DELETE FROM base_from_national_statistics_classify WHERE base_from_national_statistics_classify_id = ? LIMIT 1`
-	_, err = o.Raw(sql, m.BaseFromNationalStatisticsClassifyId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.BaseFromNationalStatisticsClassifyId).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsClassify) GetItemById(id int) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_national_statistics_classify WHERE base_from_national_statistics_classify_id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&m)
+	err = global.DmSQL["data"].Raw(sql, id).First(&m).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsClassify) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_national_statistics_classify WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	err = o.Raw(sql, pars).QueryRow(&m)
+	err = global.DmSQL["data"].Raw(sql, pars).First(&m).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsClassify) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsClassify) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromNationalStatisticsClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -90,7 +86,8 @@ func (m *BaseFromNationalStatisticsClassify) GetItemsByCondition(condition strin
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 

models/data_manage/base_from_national_statistics_data.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -23,12 +24,8 @@ func (m *BaseFromNationalStatisticsData) TableName() string {
 }
 
 func (m *BaseFromNationalStatisticsData) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.BaseFromNationalStatisticsDataId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -36,49 +33,48 @@ func (m *BaseFromNationalStatisticsData) CreateMulti(items []*BaseFromNationalSt
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsData) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsData) Del() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `DELETE FROM base_from_national_statistics_data WHERE base_from_national_statistics_data_id = ? LIMIT 1`
-	_, err = o.Raw(sql, m.BaseFromNationalStatisticsDataId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.BaseFromNationalStatisticsDataId).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsData) GetItemById(id int) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_national_statistics_data WHERE base_from_national_statistics_data_id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&m)
+	err = global.DmSQL["data"].Raw(sql, id).First(&m).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsData) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_national_statistics_data WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	err = o.Raw(sql, pars).QueryRow(&m)
+	err = global.DmSQL["data"].Raw(sql, pars).First(&m).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsData) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsData) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromNationalStatisticsData, err error) {
-	o := orm.NewOrmUsingDB("data")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -88,6 +84,7 @@ func (m *BaseFromNationalStatisticsData) GetItemsByCondition(condition string, p
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }

models/data_manage/base_from_national_statistics_index.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -29,12 +29,8 @@ func (m *BaseFromNationalStatisticsIndex) TableName() string {
 }
 
 func (m *BaseFromNationalStatisticsIndex) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.BaseFromNationalStatisticsIndexId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -42,49 +38,48 @@ func (m *BaseFromNationalStatisticsIndex) CreateMulti(items []*BaseFromNationalS
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsIndex) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsIndex) Del() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `DELETE FROM base_from_national_statistics_index WHERE base_from_national_statistics_index_id = ? LIMIT 1`
-	_, err = o.Raw(sql, m.BaseFromNationalStatisticsIndexId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.BaseFromNationalStatisticsIndexId).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsIndex) GetItemById(id int) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_national_statistics_index WHERE base_from_national_statistics_index_id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&m)
+	err = global.DmSQL["data"].Raw(sql, id).First(&m).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsIndex) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_national_statistics_index WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	err = o.Raw(sql, pars).QueryRow(&m)
+	err = global.DmSQL["data"].Raw(sql, pars).First(&m).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func (m *BaseFromNationalStatisticsIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, limitNum int) (items []*BaseFromNationalStatisticsIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -98,7 +93,8 @@ func (m *BaseFromNationalStatisticsIndex) GetItemsByCondition(condition string,
 		limit += fmt.Sprintf(` LIMIT %d`, limitNum)
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s %s`, fields, m.TableName(), condition, order, limit)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
@@ -109,101 +105,6 @@ type SaveNationalStatisticsIndexAndDataReq struct {
 	DataList   []*BaseFromNationalStatisticsData `description:"新增的指标数据"`
 }
 
-// SaveNationalStatisticsIndexAndData 保存指标和值
-func SaveNationalStatisticsIndexAndData(req *SaveNationalStatisticsIndexAndDataReq) (err error) {
-	if req.Index == nil {
-		return
-	}
-	o := orm.NewOrmUsingDB("data")
-	tx, err := o.Begin()
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			_ = tx.Rollback()
-			return
-		}
-		_ = tx.Commit()
-	}()
-
-	if !req.IndexExist {
-		id, e := tx.Insert(req.Index)
-		if e != nil {
-			return e
-		}
-		req.Index.BaseFromNationalStatisticsIndexId = int(id)
-	}
-	indexId := req.Index.BaseFromNationalStatisticsIndexId
-	if req.DataList != nil && len(req.DataList) > 0 {
-		for _, d := range req.DataList {
-			d.BaseFromNationalStatisticsIndexId = indexId
-		}
-		_, e := tx.InsertMulti(len(req.DataList), req.DataList)
-		if e != nil {
-			return e
-		}
-	}
-	return
-}
-
-// BatchSaveNationalStatisticsIndexAndData 批量保存指标和值
-func BatchSaveNationalStatisticsIndexAndData(indexArr []*BaseFromNationalStatisticsIndex, indexDataMap map[string][]*BaseFromNationalStatisticsData) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	tx, err := o.Begin()
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			_ = tx.Rollback()
-			return
-		}
-		_ = tx.Commit()
-	}()
-
-	// 指标
-	for _, v := range indexArr {
-		id, e := tx.Insert(v)
-		if e != nil {
-			return e
-		}
-		indexId := int(id)
-
-		// 数据
-		dataList := indexDataMap[v.IndexCode]
-		if dataList != nil && len(dataList) > 0 {
-			for _, d := range dataList {
-				d.BaseFromNationalStatisticsIndexId = indexId
-			}
-			_, e = tx.InsertMulti(len(dataList), dataList)
-			if e != nil {
-				return e
-			}
-		}
-	}
-	return
-}
-
-// UpdateNationalStatisticsIndexStartEndDate 更新指标开始结束日期
-func UpdateNationalStatisticsIndexStartEndDate() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_national_statistics_index AS a
-			JOIN (
-				SELECT
-					index_code,
-					MIN(data_time) AS min_time,
-					MAX(data_time) AS max_time
-				FROM
-					base_from_national_statistics_data
-				GROUP BY
-					index_code
-			) AS b ON a.index_code = b.index_code
-			SET a.start_date = b.min_time, a.end_date = b.max_time`
-	_, err = o.Raw(sql).Exec()
-	return
-}
-
 type BaseFromNationalStatisticsIndexItem struct {
 	IndexId          int    `description:"指标ID"`
 	ClassifyId       int    `description:"指标分类ID"`
@@ -253,8 +154,8 @@ type BaseFromNationalStatisticsIndexDetailData struct {
 }
 
 func GetBaseFromNationalStatisticsIndexByIndexCode(indexCode string) (item *BaseFromNationalStatisticsIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_national_statistics_index WHERE index_code = ? LIMIT 1`
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, indexCode).First(&item).Error
+
 	return
 }

models/data_manage/base_from_oilchem.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
@@ -40,9 +40,9 @@ type BaseFromOilchemData struct {
 }
 
 func GetOilchemClassifyList() (list []*BaseFromOilchemClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT * FROM base_from_oilchem_classify ORDER BY sort ASC"
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql).Scan(&list).Error
+
 	return
 }
 
@@ -67,73 +67,55 @@ type BaseFromOilchemIndexListResp struct {
 	Paging *paging.PagingItem `description:"分页数据"`
 }
 
-func GetOilchemIndexById(indexId int) (item *BaseFromOilchemIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_oilchem_index WHERE 1=1 base_from_oilchem_index_id = ? `
-	sql += `ORDER BY base_from_oilchem_index_id ASC `
-	err = o.Raw(sql, indexId).QueryRow(&item)
-	return
-}
 func GetOilchemIndexByCode(indexCode string) (item *BaseFromOilchemIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT a.*,CASE WHEN e.edb_info_id IS NULL THEN 0 ELSE 1 END AS edb_exist
 	FROM base_from_oilchem_index as a 
 LEFT JOIN edb_info AS e ON a.index_code=e.edb_code AND e.source=89 
 	WHERE 1=1 and a.index_code = ? `
 	sql += `ORDER BY a.base_from_oilchem_index_id ASC `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
-	return
-}
-
-func GetOilchemIndexList(condition string, pars interface{}, startSize, pageSize int) (items []*BaseFromOilchemIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_oilchem_index WHERE 1=1  `
-	if condition != "" {
-		sql += condition
-	}
+	err = o.Raw(sql, indexCode).Scan(&item).Error
 
-	sql += `group BY index_code ASC order by create_time DESC LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
 
 func GetOilchemIndexListCount(condition string, pars interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM base_from_oilchem_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func GetOilchemDataListCount(condition string, pars interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM base_from_oilchem_data WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func GetOilchemIndexData(condition string, pars interface{}, startSize, pageSize int) (items []*BaseFromOilchemData, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_oilchem_data WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 
 	sql += ` order by data_time DESC LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 // GetOilchemItemList 模糊查询隆众资讯数据库指标列表
 func GetOilchemItemList(keyword string) (items []*BaseFromOilchemIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT * FROM base_from_oilchem_index WHERE CONCAT(index_name,index_code) LIKE ? "
-	_, err = o.Raw(sql, utils.GetLikeKeyword(keyword)).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword)).Scan(&items).Error
+
 	return
 }
 
@@ -147,14 +129,14 @@ type OilchemDataBatchListReq struct {
 
 // GetOilchemIndexByCondition 根据条件获取隆众资讯指标列表
 func GetOilchemIndexByCondition(condition string, pars []interface{}) (items []*BaseFromOilchemIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_oilchem_index WHERE 1=1 `
 
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_oilchem_index_id ASC`
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
@@ -165,14 +147,14 @@ type OilchemDataBatchAddCheckReq struct {
 
 // GetOilchemIndexAndEdbInfoByCondition 根据条件获取隆众资讯index和指标库的信息
 func GetOilchemIndexAndEdbInfoByCondition(condition string, pars []interface{}) (items []*BaseFromOilchemIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT b.*, e.edb_info_id, e.unique_code, e.classify_id AS edb_classify_id FROM base_from_oilchem_index AS b LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=? WHERE 1=1 `
 
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC `
-	_, err = o.Raw(sql, utils.DATA_SOURCE_OILCHEM, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, utils.DATA_SOURCE_OILCHEM, pars).Scan(&items).Error
+
 	return
 }
 
@@ -205,7 +187,6 @@ type ExportOilchemExcelReq struct {
 
 // GetOilchemIndexByConditionAndFrequency 根据条件获取隆众资讯指标列表
 func GetOilchemIndexByConditionAndFrequency(condition, frequency string, pars []interface{}) (items []*BaseFromOilchemIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_oilchem_index WHERE 1=1 `
 
 	if condition != "" {
@@ -213,26 +194,15 @@ func GetOilchemIndexByConditionAndFrequency(condition, frequency string, pars []
 	}
 	sql += ` AND frequency=?`
 	sql += ` ORDER BY sort ASC, base_from_oilchem_index_id ASC`
-	_, err = o.Raw(sql, pars, frequency).QueryRows(&items)
-	return
-}
+	err = global.DmSQL["data"].Raw(sql, pars, frequency).Scan(&items).Error
 
-func GetOilchemDataMaxCount(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT MAX(t.num) AS count FROM (
-				SELECT COUNT(1) AS num  FROM base_from_oilchem_index AS a
-				INNER JOIN base_from_oilchem_data AS b ON a.index_code=b.index_code
-				WHERE a.classify_id=?
-				GROUP BY a.base_from_oilchem_index_id
-			)AS t `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
 	return
 }
 
 func GetOilchemIndexDataByCode(indexCode string) (items []*BaseFromOilchemData, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM base_from_oilchem_data WHERE index_code=? ORDER BY data_time DESC  `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&items).Error
+
 	return
 }
 
@@ -242,14 +212,14 @@ func GetOilchemFrequencyByCondition(condition string, pars []interface{}) (items
 		sql += condition
 	}
 	sql += ` ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
 // GetOilchemIndexViewList 根据分类id获取隆众资讯指标列表
 func GetOilchemIndexViewList(condition string, pars []interface{}, startSize, pageSize int) (items []*BaseFromOilchemIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT b.*, e.edb_info_id,
 	CASE WHEN e.edb_info_id IS NULL THEN 0 ELSE 1 END AS edb_exist
 	FROM base_from_oilchem_index AS b
@@ -259,13 +229,14 @@ func GetOilchemIndexViewList(condition string, pars []interface{}, startSize, pa
 		sql += condition
 	}
 	sql += ` ORDER BY b.modify_time ASC LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 // GetOilchemIndexViewListCount 根据分类id获取隆众资讯指标列表
 func GetOilchemIndexViewListCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT COUNT(1) AS count
 	FROM base_from_oilchem_index AS b
 	LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=89
@@ -274,15 +245,16 @@ func GetOilchemIndexViewListCount(condition string, pars []interface{}) (count i
 		sql += condition
 	}
 	sql += ` ORDER BY b.modify_time ASC `
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 // GetOilchemDataViewList 根据指标id获取隆众资讯指标列表
 func GetOilchemDataViewList(indexIds []int) (items []*BaseFromOilchemData, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_oilchem_data WHERE base_from_oilchem_index_id IN (` + utils.GetOrmInReplace(len(indexIds)) + `)ORDER BY data_time desc  `
-	_, err = o.Raw(sql, indexIds).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexIds).Scan(&items).Error
+
 	return
 }
 
@@ -291,8 +263,8 @@ func GetOilchemDataDataTimeByIndexId(indexIdList []int) (items []string, err err
 	if len(indexIdList) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT DISTINCT data_time FROM base_from_oilchem_data WHERE base_from_oilchem_index_id IN (` + utils.GetOrmInReplace(len(indexIdList)) + `) ORDER BY data_time DESC`
-	_, err = o.Raw(sql, indexIdList).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, indexIdList).Scan(&items).Error
+
 	return
 }

models/data_manage/base_from_sci.go

@@ -1,11 +1,10 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type BaseFromSci struct {
@@ -34,26 +33,6 @@ type BaseFromSci struct {
 	AuthDurType   string
 }
 
-func AddBaseFromSci(item *BaseFromSci) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
-func GetBaseFromSciList() (list []*BaseFromSci, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_sci `
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
-func GetBaseFromSciBySciCode(sciCode string) (item *BaseFromSci, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_sci WHERE interface=?`
-	err = o.Raw(sql, sciCode).QueryRow(&item)
-	return
-}
-
 type BaseFromSciIndex struct {
 	BaseFromSciIndexId int `orm:"column(base_from_sci_index_id);pk"`
 	ClassifyId         int
@@ -67,19 +46,6 @@ type BaseFromSciIndex struct {
 	ModifyTime         time.Time
 }
 
-func AddBaseFromSciIndex(item *BaseFromSciIndex) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
-func GetBaseFromSciIndex() (list []*BaseFromSciIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_sci_index `
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
 type BaseFromSciData struct {
 	SciDataId          int `orm:"column(sci_data_id);pk"`
 	BaseFromSciIndexId int
@@ -91,111 +57,63 @@ type BaseFromSciData struct {
 	DataTimestamp      int64
 }
 
-func AddBaseFromSciData(item *BaseFromSciData) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
-func GetBaseFromSciDataAll() (list []*BaseFromSciData, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_sci_data `
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
-func ModifyBaseFromSciData(sciDataId int, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_sci_data SET value=?,modify_time=NOW() WHERE sci_data_id=? `
-	_, err = o.Raw(sql, value, sciDataId).Exec()
-	return
-}
-
-func GetBaseFromSciIndexBySciCode(sciCode string) (list []*BaseFromSciIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_sci_index WHERE interface=? `
-	_, err = o.Raw(sql, sciCode).QueryRows(&list)
-	return
-}
-
-func GetBaseFromSciMaxOrMinDate(indexCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM base_from_sci_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&min_date, &max_date)
-	return
-}
-
-func ModifyBaseFromSciMinDateAndMaxDate(baseFromSciIndexId int, minDate, maxDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` UPDATE base_from_sci_index SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_sci_index_id=? `
-	_, err = o.Raw(sql, minDate, maxDate, baseFromSciIndexId).Exec()
-	return
-}
-
-func GetBaseFromSciDataAllByIndexCode(indexCode string) (list []*BaseFromSciData, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_sci_data WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
-	return
-}
-
 func GetBaseFromSciIndexByIndexCode(indexCode string) (list *BaseFromSciIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_sci_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&list)
+	err = global.DmSQL["data"].Raw(sql, indexCode).First(&list).Error
+
 	return
 }
 
 // GetBaseFromSciIndexCountByClassifyIds 获取分类下指标的个数
 func GetBaseFromSciIndexCountByClassifyIds(classifyIds []int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	num := len(classifyIds)
 	if num <= 0 {
 		return
 	}
 	sql := `SELECT COUNT(1) AS count FROM base_from_sci_index WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = o.Raw(sql, classifyIds).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, classifyIds).Scan(&count).Error
+
 	return
 }
 
 // GetBaseFromSciIndexByClassifyId 获取根据分类查询指标
 func GetBaseFromSciIndexByClassifyId(classifyId int) (list []*BaseFromSciIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_sci_index WHERE classify_id =? ORDER BY sort ASC, base_from_sci_index_id ASC `
-	_, err = o.Raw(sql, classifyId).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&list).Error
+
 	return
 }
 
 // GetSciIndexAll 用于分类展示
 func GetSciIndexAll() (items []*BaseFromSciClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT base_from_sci_index_id, classify_id, index_name as classify_name, index_code as base_from_sci_index_code
             FROM base_from_sci_index ORDER BY sort ASC, base_from_sci_index_id ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
+
 	return
 }
 
 // GetBaseFromSciIndexByIndexId 根据指标id获取指标信息
 func GetBaseFromSciIndexByIndexId(indexId int) (item *BaseFromSciIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_sci_index WHERE base_from_sci_index_id=? `
-	err = o.Raw(sql, indexId).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, indexId).First(&item).Error
+
 	return
 }
 
 // GetBaseFromSciIndexMaxSortByClassifyId 根据指标id获取指标信息
 func GetBaseFromSciIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT max(sort) FROM base_from_sci_index WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&sort).Error
+
 	return
 }
 
 // GetBaseFromSciIndexMinSortByClassifyId 获取最小不等于0的排序
 func GetBaseFromSciIndexMinSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT min(sort) FROM base_from_sci_index WHERE classify_id=? and sort <> 0 `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&sort).Error
+
 	return
 }
 
@@ -206,72 +124,74 @@ type BaseFromSciIndexType struct {
 
 // GetBaseFromSciIndexType 获取历史指标信息类型
 func GetBaseFromSciIndexType() (list []BaseFromSciIndexType, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT type_2, type_3 from base_from_sci_index where type_2 <> "" GROUP BY type_2, type_3`
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Scan(&list).Error
+
 	return
 }
 
 // MoveBaseFromSciIndex 移动指标分类
 func MoveBaseFromSciIndex(chartInfoId, classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` UPDATE base_from_sci_index
 			SET
 			  classify_id = ?, modify_time=NOW() 
 			WHERE base_from_sci_index_id = ?`
-	_, err = o.Raw(sql, classifyId, chartInfoId).Exec()
+	err = o.Exec(sql, classifyId, chartInfoId).Error
+
 	return
 }
 
 // UpdateBaseFromSciIndexByClassifyId 根据指标id更新排序
 func UpdateBaseFromSciIndexByClassifyId(classifyId, nowSort, prevIndexInfoId int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` update base_from_sci_index set sort = ` + updateSort + ` WHERE classify_id=? AND  `
 	if prevIndexInfoId > 0 {
 		sql += ` ( sort > ? or (base_from_sci_index_id > ` + fmt.Sprint(prevIndexInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
 	}
-	_, err = o.Raw(sql, classifyId, nowSort).Exec()
+	err = o.Exec(sql, classifyId, nowSort).Error
+
 	return
 }
 
 // MoveUpSciIndexBySort 往上移动
 func MoveUpSciIndexBySort(classifyId, nextSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `update base_from_sci_index set sort = sort + 1 where classify_id=? and sort >= ? and sort< ?`
-	_, err = o.Raw(sql, classifyId, nextSort, currentSort).Exec()
+	err = o.Exec(sql, classifyId, nextSort, currentSort).Error
+
 	return
 }
 
 // MoveDownSciIndexBySort 往下移动
 func MoveDownSciIndexBySort(classifyId, prevSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `update base_from_sci_index set sort = sort - 1 where classify_id=? and sort <= ? and sort> ? `
-	_, err = o.Raw(sql, classifyId, prevSort, currentSort).Exec()
+	err = o.Exec(sql, classifyId, prevSort, currentSort).Error
+
 	return
 }
 
 // GetFirstBaseFromSciIndexByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstBaseFromSciIndexByClassifyId(classifyId int) (item *BaseFromSciIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_sci_index WHERE classify_id=? order by sort asc,base_from_sci_index_id asc limit 1`
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).First(&item).Error
+
 	return
 }
 
 // Update 更新Sci指标基础信息
 func (item *BaseFromSciIndex) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(item, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(item).Error
+
 	return
 }
 
 // DeleteBaseFromSciIndexById 根据指标id删除对应的指标、指标数据
 func DeleteBaseFromSciIndexById(sciIndexId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -282,14 +202,14 @@ func DeleteBaseFromSciIndexById(sciIndexId int) (err error) {
 
 	//删除指标
 	sql := `DELETE FROM base_from_sci_index WHERE base_from_sci_index_id = ? `
-	_, err = to.Raw(sql, sciIndexId).Exec()
+	err = to.Exec(sql, sciIndexId).Error
 	if err != nil {
 		return
 	}
 
 	//删除指标数据
 	sql = `DELETE FROM base_from_sci_data WHERE base_from_sci_index_id = ? `
-	_, err = to.Raw(sql, sciIndexId).Exec()
+	err = to.Exec(sql, sciIndexId).Error
 	if err != nil {
 		return
 	}

models/data_manage/base_from_sci_classify.go

@@ -1,9 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -23,16 +22,21 @@ type BaseFromSciClassify struct {
 
 // AddBaseFromSciClassify 添加SMM原始数据分类
 func AddBaseFromSciClassify(item *BaseFromSciClassify) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	err = global.DmSQL["data"].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.ClassifyId)
+
 	return
 }
 
 // GetBaseFromSciClassifyCount 获取分类名称的个数
 func GetBaseFromSciClassifyCount(classifyName string, parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) AS count FROM base_from_sci_classify WHERE classify_name=? AND parent_id=? `
-	err = o.Raw(sql, classifyName, parentId).QueryRow(&count)
+	err = o.Raw(sql, classifyName, parentId).Scan(&count).Error
+
 	return
 }
 
@@ -45,25 +49,27 @@ func GetBaseFromSciClassifyCount(classifyName string, parentId int) (count int,
 // @return count int
 // @return err error
 func GetBaseFromSciClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) AS count FROM base_from_sci_classify WHERE classify_name_en=? AND parent_id=? `
-	err = o.Raw(sql, classifyNameEn, parentId).QueryRow(&count)
+	err = o.Raw(sql, classifyNameEn, parentId).Scan(&count).Error
+
 	return
 }
 
 // GetBaseFromSciClassifyById 通过分类id的获取分类信息
 func GetBaseFromSciClassifyById(classifyId int) (item *BaseFromSciClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_sci_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).First(&item).Error
+
 	return
 }
 
 // EditBaseFromSciClassify 修改SMM原始数据分类
 func EditBaseFromSciClassify(classifyId int, classifyName string) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE base_from_sci_classify SET classify_name=?,modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyName, classifyId).Exec()
+	err = global.DmSQL["data"].Exec(sql, classifyName, classifyId).Error
+
 	return
 }
 
@@ -75,17 +81,16 @@ func EditBaseFromSciClassify(classifyId int, classifyName string) (err error) {
 // @param classifyNameEn string
 // @return err error
 func EditBaseFromSciClassifyEn(classifyId int, classifyNameEn string) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE base_from_sci_classify SET classify_name_en = ?,modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyNameEn, classifyId).Exec()
+	err = global.DmSQL["data"].Exec(sql, classifyNameEn, classifyId).Error
 	return
 }
 
 // UpdateBaseFromSciClassifySort 修改SMM原始数据分类的排序
 func UpdateBaseFromSciClassifySort(classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE base_from_sci_classify SET sort=classify_id, modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyId).Exec()
+	err = global.DmSQL["data"].Exec(sql, classifyId).Error
+
 	return
 }
 
@@ -128,17 +133,18 @@ type BaseFromSciClassifyItemsButton struct {
 
 // GetBaseFromSciClassifyByParentId 根据上级id获取当下的分类列表数据
 func GetBaseFromSciClassifyByParentId(parentId int) (items []*BaseFromSciClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_sci_classify WHERE parent_id=? order by sort asc,classify_id asc`
-	_, err = o.Raw(sql, parentId).QueryRows(&items)
+	err = o.Raw(sql, parentId).Scan(&items).Error
+
 	return
 }
 
 // GetAllBaseFromSciClassify 获取所有的分类列表数据
 func GetAllBaseFromSciClassify() (items []*BaseFromSciClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_sci_classify WHERE parent_id <> 0 order by sort asc,classify_id asc`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql).Scan(&items).Error
+
 	return
 }
 
@@ -158,53 +164,36 @@ type BaseFromSciClassifySimplify struct {
 	ParentId     int
 }
 
-// GetFirstBaseFromSciClassify 获取当前分类下，且排序数相同 的排序第一条的数据
-func GetFirstBaseFromSciClassify() (item *BaseFromSciClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_sci_classify order by sort asc,classify_id asc limit 1`
-	err = o.Raw(sql).QueryRow(&item)
-	return
-}
-
-// UpdateBaseFromSciClassifySortByClassifyId 根据分类id更新排序
-func UpdateBaseFromSciClassifySortByClassifyId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` update base_from_sci_classify set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? `
-	if classifyId > 0 {
-		sql += ` or ( classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
-	}
-	_, err = o.Raw(sql, parentId, nowSort).Exec()
-	return
-}
-
 // MoveUpSciIndexClassifyBySort 往上移动
 func MoveUpSciIndexClassifyBySort(parentId, nextSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `update base_from_sci_classify set sort = sort + 1 where parent_id=? and sort >= ? and sort< ?`
-	_, err = o.Raw(sql, parentId, nextSort, currentSort).Exec()
+	err = global.DmSQL["data"].Exec(sql, parentId, nextSort, currentSort).Error
+
 	return
 }
 
 // MoveDownSciIndexClassifyBySort 往下移动
 func MoveDownSciIndexClassifyBySort(parentId, prevSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `update base_from_sci_classify set sort = sort - 1 where parent_id=? and sort <= ? and sort> ? `
-	_, err = o.Raw(sql, parentId, prevSort, currentSort).Exec()
+	err = o.Exec(sql, parentId, prevSort, currentSort).Error
+
 	return
 }
 
 // GetSciIndexClassifyMinSort 获取最小不等于0的排序
 func GetSciIndexClassifyMinSort(parentId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `select min(sort) from base_from_sci_classify where parent_id=? and sort <> 0 `
-	err = o.Raw(sql, parentId).QueryRow(&sort)
+	err = o.Raw(sql, parentId).Scan(&sort).Error
+
 	return
 }
 
 // Update 更新分类基础信息
 func (BaseFromSciClassify *BaseFromSciClassify) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(BaseFromSciClassify, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(BaseFromSciClassify).Error
+
 	return
 }
 
@@ -214,36 +203,36 @@ type AddSciClassifyResp struct {
 
 // DeleteSciClassifyByClassifyId 根据分类id删除对应的指标分类
 func DeleteSciClassifyByClassifyId(classifyIdList []int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	num := len(classifyIdList)
 	if num <= 0 {
 		return
 	}
 	//删除分类
 	sql := `DELETE FROM base_from_sci_classify WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, classifyIdList).Exec()
+	err = o.Exec(sql, classifyIdList).Error
+
 	return
 }
 
 // AddSciClassifyMulti 批量新增SMM类别
 func AddSciClassifyMulti(list []*BaseFromSciClassify) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(1, list)
+	err = global.DmSQL["data"].CreateInBatches(list, utils.MultiAddNum).Error
+
 	return
 }
 
 // InitSciClassifySort 初始化sort值
 func InitSciClassifySort() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE base_from_sci_classify 
 SET modify_time=NOW(), sort = classify_id`
-	_, err = o.Raw(sql).Exec()
+	err = global.DmSQL["data"].Exec(sql).Error
+
 	return
 }
 
 // InitSciIndexClassifyId 历史数据的classifyId值
 func InitSciIndexClassifyId() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE base_from_sci_index s
 LEFT JOIN (
 SELECT
@@ -254,6 +243,7 @@ FROM
 	LEFT JOIN base_from_sci_classify c2 ON c1.parent_id = c2.classify_id 
 	) AS t ON CONCAT( s.type_2, s.type_3 ) = t.type_name
 	SET s.classify_id = t.classify_id, s.modify_time=NOW() where s.type_2 <>""`
-	_, err = o.Raw(sql).Exec()
+	err = global.DmSQL["data"].Exec(sql).Error
+
 	return
 }

models/data_manage/base_from_sci_hq_classify.go

@@ -1,10 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 // BaseFromSciHqClassify 卓创红期原始数据分类表
@@ -38,76 +37,89 @@ type BaseFromSciHqClassifyMaxSort struct {
 }
 
 func (t *BaseFromSciHqClassify) Add() (insertId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	insertId, err = o.Insert(t)
+	err = global.DmSQL["data"].Create(t).Error
+	if err != nil {
+		return
+	}
+	insertId = int64(t.ClassifyId)
+
 	return
 }
 
 func (t *BaseFromSciHqClassify) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(t, cols...)
+	o := global.DmSQL["data"]
+	err = o.Select(cols).Updates(t).Error
+
 	return
 }
 
 func BatchAddSciHqClassify(items []*BaseFromSciHqClassify) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	o := global.DmSQL["data"]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 // 获取所有分类
 func GetSciHqClassifyAll() (items []*BaseFromSciHqClassifyItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_sci_hq_classify ORDER BY sort ASC, classify_id ASC`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }
 
 // GetChildSciHqClassifyListById 获取子分类列表
 func GetChildSciHqClassifyListById(classifyId int) (items []*BaseFromSciHqClassifyItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_sci_hq_classify WHERE parent_id=? `
-	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	err = o.Raw(sql, classifyId).Scan(&items).Error
+
 	return
 }
 
 // GetChildSciHqClassifyIdsById 获取子分类的id集合
 func GetChildSciHqClassifyIdsById(classifyId int) (items []int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT classify_id FROM base_from_sci_hq_classify WHERE parent_id=? `
-	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	err = o.Raw(sql, classifyId).Scan(&items).Error
+
 	return
 }
 
 // GetChildSciHqClassifyMaxSortById 获取子分类最大排序
 func GetChildSciHqClassifyMaxSortById(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT MAX(sort) AS sort FROM base_from_sci_hq_classify WHERE parent_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = o.Raw(sql, classifyId).Scan(&sort).Error
+
 	return
 }
 
 // GetSciHqClassifyCountById 获取分类数量
 func GetSciHqClassifyCountById(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT COUNT(*) AS count FROM base_from_sci_hq_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
+	err = o.Raw(sql, classifyId).Scan(&count).Error
+
 	return
 }
 
 // GetSciHqClassifyById 通过分类id获取分类
 func GetSciHqClassifyById(classifyId int) (item *BaseFromSciHqClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_sci_hq_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).First(&item).Error
+
 	return
 }
 
 // GetSciHqChildClassifyById 通过分类id获取子分类
 func GetSciHqChildClassifyIdsById(classifyId int) (items []int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT classify_id FROM base_from_sci_hq_classify WHERE parent_id=? `
-	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	err = o.Raw(sql, classifyId).Scan(&items).Error
+
 	return
 }
 
@@ -116,102 +128,80 @@ func GetSciHqClassifyListByIds(classifyIds []int) (items []*BaseFromSciHqClassif
 	if len(classifyIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_sci_hq_classify WHERE classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
-	_, err = o.Raw(sql, classifyIds).QueryRows(&items)
+	err = o.Raw(sql, classifyIds).Scan(&items).Error
+
 	return
 }
 
 // GetSciHqClassifyCountByName 通过分类名称获取分类
 func GetSciHqClassifyCountByName(classifyName string, lang string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT COUNT(*) AS count FROM base_from_sci_hq_classify WHERE 1=1`
 	if lang == utils.EnLangVersion {
 		sql += ` AND classify_name_en=? `
 	} else {
 		sql += ` AND classify_name=? `
 	}
-	err = o.Raw(sql, classifyName).QueryRow(&count)
+	err = o.Raw(sql, classifyName).Scan(&count).Error
+
 	return
 }
 
 func GetBaseFromSciHqClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) AS count FROM base_from_sci_hq_classify WHERE classify_name_en=? AND parent_id=? `
-	err = o.Raw(sql, classifyNameEn, parentId).QueryRow(&count)
+	err = o.Raw(sql, classifyNameEn, parentId).Scan(&count).Error
+
 	return
 }
 
 func GetBaseFromSciHqClassifyCount(classifyName string, parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) AS count FROM base_from_sci_hq_classify WHERE classify_name=? AND parent_id=? `
-	err = o.Raw(sql, classifyName, parentId).QueryRow(&count)
-	return
-}
-
-func DeleteSciHqClassifyById(classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` DELETE FROM base_from_sci_hq_classify WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyId).Exec()
-	return
-}
-
-// BatchDeleteSciHqClassifyById 批量删除分类
-func BatchDeleteSciHqClassifyById(classifyId []int) (err error) {
-	if len(classifyId) == 0 {
-		return
-	}
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-	sql := ` DELETE FROM base_from_sci_hq_classify WHERE classify_id IN (` + utils.GetOrmInReplace(len(classifyId)) + `) `
-	_, err = o.Raw(sql, classifyId).Exec()
+	err = o.Raw(sql, classifyName, parentId).Scan(&count).Error
 
 	return
 }
 
 // DeleteSciHqClassifyByClassifyId 根据分类id删除对应的指标分类
 func DeleteSciHqClassifyByClassifyId(classifyIdList []int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	num := len(classifyIdList)
 	if num <= 0 {
 		return
 	}
 	//删除分类
 	sql := `DELETE FROM base_from_sci_hq_classify WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, classifyIdList).Exec()
+	err = o.Exec(sql, classifyIdList).Error
+
 	return
 }
 
 // GetSciHqIndexClassifyMinSort 获取最小不等于0的排序
 func GetSciHqIndexClassifyMinSort(parentId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT MIN(sort) FROM base_from_sci_hq_classify WHERE parent_id=? AND sort <> 0 `
-	err = o.Raw(sql, parentId).QueryRow(&sort)
+	err = o.Raw(sql, parentId).Scan(&sort).Error
+
 	return
 }
 
 // MoveUpSciHqIndexClassifyBySort 往上移动
 func MoveUpSciHqIndexClassifyBySort(parentId, nextSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `update base_from_sci_hq_classify set sort = sort + 1 where parent_id=? and sort >= ? and sort< ?`
-	_, err = o.Raw(sql, parentId, nextSort, currentSort).Exec()
+	err = o.Exec(sql, parentId, nextSort, currentSort).Error
+
 	return
 }
 
 // MoveDownSciHqIndexClassifyBySort 往下移动
 func MoveDownSciHqIndexClassifyBySort(parentId, prevSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `update base_from_sci_hq_classify set sort = sort - 1 where parent_id=? and sort <= ? and sort> ? `
-	_, err = o.Raw(sql, parentId, prevSort, currentSort).Exec()
+	err = o.Exec(sql, parentId, prevSort, currentSort).Error
+
 	return
 }

models/data_manage/base_from_sci_hq_index.go

@@ -1,6 +1,7 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"time"
 
@@ -44,27 +45,27 @@ type BaseFromSciHqIndexView struct {
 }
 
 func (b *BaseFromSciHqIndex) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(b, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(b).Error
+
 	return
 }
 
 // GetSciHqIndexByCondition 根据条件获取卓创红期指标列表
 func GetSciHqIndexByCondition(condition string, pars []interface{}) (items []*BaseFromSciHqIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_sci_hq_index WHERE 1=1 `
 
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_sci_hq_index_id ASC`
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 // GetSciHqIndexByCondition 根据条件获取卓创红期指标列表
 func GetSciHqIndexByConditionAndFrequency(condition, frequency string, pars []interface{}) (items []*BaseFromSciHqIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_sci_hq_index WHERE 1=1 `
 
 	if condition != "" {
@@ -72,48 +73,53 @@ func GetSciHqIndexByConditionAndFrequency(condition, frequency string, pars []in
 	}
 	sql += ` AND frequency=?`
 	sql += ` ORDER BY sort ASC, base_from_sci_hq_index_id ASC`
-	_, err = o.Raw(sql, pars, frequency).QueryRows(&items)
+	err = o.Raw(sql, pars, frequency).Scan(&items).Error
+
 	return
 }
 
 func GetSciHqIndexCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT COUNT(*) AS count FROM base_from_sci_hq_index WHERE 1=1 `
 
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, base_from_sci_hq_index_id ASC`
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 // GetSciHqIndexAndEdbInfoByCondition 根据条件获取卓创红期index和指标库的信息
 func GetSciHqIndexAndEdbInfoByCondition(condition string, pars []interface{}) (items []*BaseFromSciHqIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT b.*, e.edb_info_id FROM base_from_sci_hq_index AS b LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=? WHERE 1=1 `
 
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC `
-	_, err = o.Raw(sql, utils.DATA_SOURCE_SCI_HQ, pars).QueryRows(&items)
+	err = o.Raw(sql, utils.DATA_SOURCE_SCI_HQ, pars).Scan(&items).Error
+
 	return
 }
 
 // GetSciHqIndexByIndexCode 根据指标编码获取指标信息
 func GetSciHqIndexByIndexCode(indexCode string) (item *BaseFromSciHqIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_sci_hq_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = o.Raw(sql, indexCode).First(&item).Error
+
 	return
 }
 
 // GetSciHqIndexByIndexId 根据指标id获取指标信息
 func GetSciHqIndexByIndexId(indexId int) (item *BaseFromSciHqIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_sci_hq_index WHERE base_from_sci_hq_index_id=? `
-	err = o.Raw(sql, indexId).QueryRow(&item)
+	err = o.Raw(sql, indexId).First(&item).Error
+
 	return
 }
 
@@ -122,33 +128,36 @@ func GetSciHqIndexListByIndexIds(indexIds []int) (items []*BaseFromSciHqIndex, e
 	if len(indexIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_sci_hq_index WHERE base_from_sci_hq_index_id IN (` + utils.GetOrmInReplace(len(indexIds)) + `) `
-	_, err = o.Raw(sql, indexIds).QueryRows(&items)
+	err = o.Raw(sql, indexIds).Scan(&items).Error
+
 	return
 }
 
 // GetSciHqIndexCountByClassifyIds 获取分类下指标的个数
 func GetSciHqIndexCountByClassifyIds(classifyIds []int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	num := len(classifyIds)
 	if num <= 0 {
 		return
 	}
 	sql := `SELECT COUNT(1) AS count FROM base_from_sci_hq_index WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = o.Raw(sql, classifyIds).QueryRow(&count)
+	err = o.Raw(sql, classifyIds).Scan(&count).Error
+
 	return
 }
 
 // GetSciHqIndexByClassifyId 根据分类id获取卓创红期指标列表
 func GetSciHqIndexByClassifyId(classifyIds []int, startSize, pageSize int) (items []*BaseFromSciHqIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT b.*, e.edb_info_id,
 	CASE WHEN e.edb_info_id IS NULL THEN 0 ELSE 1 END AS edb_exist
 	FROM base_from_sci_hq_index AS b
 	LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=88
 	WHERE b.classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) ORDER BY b.sort ASC LIMIT ?,? `
-	_, err = o.Raw(sql, classifyIds, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, classifyIds, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
@@ -157,74 +166,82 @@ func GetSciHqIndexCountByClassifyId(classifyIds []int) (count int, err error) {
 	if len(classifyIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT COUNT(*) AS count FROM base_from_sci_hq_index WHERE classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) `
-	err = o.Raw(sql, classifyIds).QueryRow(&count)
+	err = o.Raw(sql, classifyIds).Scan(&count).Error
+
 	return
 }
 
 // GetSciHqIndexCount 获取卓创红期指标数量
 func GetSciHqIndexCount() (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT COUNT(*) AS count FROM base_from_sci_hq_index `
-	err = o.Raw(sql).QueryRow(&count)
+	err = o.Raw(sql).Scan(&count).Error
+
 	return
 }
 
 func GetSciHqIndexByPage(startSize, pageSize int) (items []*BaseFromSciHqIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT b.*, e.edb_info_id,
 	CASE WHEN e.edb_info_id IS NULL THEN 0 ELSE 1 END AS edb_exist
 	FROM base_from_sci_hq_index AS b
 	LEFT JOIN edb_info AS e ON b.index_code=e.edb_code AND e.source=88
 	ORDER BY b.modify_time DESC LIMIT ?,?`
-	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 // GetSciHqIndexBaseInfoByClassifyId 根据分类id获取卓创红期指标列表
 func GetSciHqIndexBaseInfoByClassifyId(classifyId int) (items []*BaseFromSciHqIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT base_from_sci_hq_index_id, classify_id, index_code, index_name, CONCAT(classify_id, '_', base_from_sci_hq_index_id) AS unique_code  FROM base_from_sci_hq_index WHERE classify_id = ? ORDER BY sort ASC `
-	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	err = o.Raw(sql, classifyId).Scan(&items).Error
+
 	return
 }
 
 // GetSciHqIndexBaseInfoByClassifyId 根据分类id获取卓创红期指标列表
 func GetSciHqIndexBaseInfoByCondition(condition string, pars []interface{}) (items []*BaseFromSciHqIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT base_from_sci_hq_index_id, index_code, index_name  FROM base_from_sci_hq_index WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC `
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	err = o.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
 func GetSciHqDataMaxCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT MAX(t.num) AS count FROM ( SELECT COUNT(1) AS num  FROM base_from_sci_hq_index AS a INNER JOIN base_from_sci_hq_data AS b ON a.index_code=b.index_code WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` GROUP BY a.base_from_sci_hq_index_id) AS t `
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 // GetSciHqIndexMaxSortByClassifyId 根据分类id获取指标最大排序
 func GetSciHqIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT MAX(sort) FROM base_from_sci_index WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = o.Raw(sql, classifyId).Scan(&sort).Error
+
 	return
 }
 
 func GetSciHqFrequency(classifyId int) (items []*string, err error) {
 	sql := `SELECT DISTINCT frequency FROM base_from_sci_hq_index WHERE classify_id=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	o := global.DmSQL["data"]
+	err = o.Raw(sql, classifyId).Scan(&items).Error
+
 	return
 }
 
@@ -234,15 +251,17 @@ func GetSciHqFrequencyByCondition(condition string, pars []interface{}) (items [
 		sql += condition
 	}
 	sql += ` ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
+	o := global.DmSQL["data"]
+	err = o.Raw(sql, pars...).Scan(&items).Error
+
 	return
 }
 
 func GetSciHqFrequencyByCode(code string) (items []*string, err error) {
 	sql := `SELECT DISTINCT frequency FROM base_from_sci_hq_index WHERE index_code=? ORDER BY FIELD(frequency,'日度','周度','月度','季度','半年','年度') `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, code).QueryRows(&items)
+	o := global.DmSQL["data"]
+	err = o.Raw(sql, code).Scan(&items).Error
+
 	return
 }
 
@@ -251,7 +270,7 @@ func GetSciHqClassifyMaxSortByClassifyIds(classifyIds []int) (items []*BaseFromS
 	if len(classifyIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT bc.classify_id, COALESCE(MAX(bi.sort), 0) AS max_sort FROM base_from_sci_hq_classify  AS bc
 	LEFT JOIN base_from_sci_hq_index AS bi
 	ON bc.classify_id=bi.classify_id  
@@ -259,7 +278,8 @@ func GetSciHqClassifyMaxSortByClassifyIds(classifyIds []int) (items []*BaseFromS
 	GROUP BY bc.classify_id
 	`
 	// sql = ` SELECT classify_id, MAX(sort) AS max_sort FROM base_from_sci_hq_index WHERE classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) GROUP BY classify_id `
-	_, err = o.Raw(sql, classifyIds).QueryRows(&items)
+	err = o.Raw(sql, classifyIds).Scan(&items).Error
+
 	return
 }
 

models/data_manage/base_from_smm.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -34,23 +34,19 @@ type BaseFromSmm struct {
 	AuthDurType   string
 }
 
-func AddBaseFromSmm(item *BaseFromSmm) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
 func GetBaseFromSmmList() (list []*BaseFromSmm, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_smm `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Scan(&list).Error
+
 	return
 }
 
 func GetBaseFromSmmBySmmCode(smmCode string) (item *BaseFromSmm, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_smm WHERE interface=?`
-	err = o.Raw(sql, smmCode).QueryRow(&item)
+	err = o.Raw(sql, smmCode).First(&item).Error
+
 	return
 }
 
@@ -80,15 +76,20 @@ type BaseFromSmmIndex struct {
 }
 
 func AddBaseFromSmmIndex(item *BaseFromSmmIndex) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	err = global.DmSQL["data"].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.ClassifyId)
+
 	return
 }
 
 func GetBaseFromSmmIndex() (list []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_smm_index `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Scan(&list).Error
+
 	return
 }
 
@@ -104,110 +105,128 @@ type BaseFromSmmData struct {
 }
 
 func AddBaseFromSmmData(item *BaseFromSmmData) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	err = global.DmSQL["data"].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.BaseFromSmmIndexId)
+
 	return
 }
 
 func GetBaseFromSmmDataAll() (list []*BaseFromSmmData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_smm_data `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Scan(&list).Error
+
 	return
 }
 
 func ModifyBaseFromSmmData(smmDataId int, value string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `UPDATE base_from_smm_data SET value=?,modify_time=NOW() WHERE smm_data_id=? `
-	_, err = o.Raw(sql, value, smmDataId).Exec()
+	err = o.Exec(sql, value, smmDataId).Error
+
 	return
 }
 
 func GetBaseFromSmmIndexBySmmCode(smmCode string) (list []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_smm_index WHERE interface=? `
-	_, err = o.Raw(sql, smmCode).QueryRows(&list)
+	err = o.Raw(sql, smmCode).Scan(&list).Error
+
 	return
 }
 
+type SmmMaxOrMinDate struct {
+	MinDate string `json:"min_date"`
+	MaxDate string `json:"max_date"`
+}
+
 func GetBaseFromSmmMaxOrMinDate(indexCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
+	var tmpData SmmMaxOrMinDate
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM base_from_smm_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&min_date, &max_date)
+	err = o.Raw(sql, indexCode).Scan(&tmpData).Error
+	if err != nil {
+		return
+	}
+	min_date = tmpData.MinDate
+	max_date = tmpData.MaxDate
+
 	return
 }
 
 func ModifyBaseFromSmmMinDateAndMaxDate(baseFromSmmIndexId int, minDate, maxDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` UPDATE base_from_smm_index SET start_date=?,end_date=?,modify_time=NOW() WHERE base_from_smm_index_id=? `
-	_, err = o.Raw(sql, minDate, maxDate, baseFromSmmIndexId).Exec()
+	err = o.Exec(sql, minDate, maxDate, baseFromSmmIndexId).Error
+
 	return
 }
 
 func GetBaseFromSmmDataAllByIndexCode(indexCode string) (list []*BaseFromSmmData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_smm_data WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = o.Raw(sql, indexCode).Scan(&list).Error
+
 	return
 }
 
 func GetBaseFromSmmIndexByIndexCode(indexCode string) (list *BaseFromSmmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_smm_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&list)
+	err = o.Raw(sql, indexCode).First(&list).Error
+
 	return
 }
 
 // GetBaseFromSmmIndexCountByClassifyIds 获取分类下指标的个数
 func GetBaseFromSmmIndexCountByClassifyIds(classifyIds []int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	num := len(classifyIds)
 	if num <= 0 {
 		return
 	}
 	sql := `SELECT COUNT(1) AS count FROM base_from_smm_index WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	err = o.Raw(sql, classifyIds).QueryRow(&count)
+	err = o.Raw(sql, classifyIds).Scan(&count).Error
+
 	return
 }
 
 // GetBaseFromSmmIndexByClassifyId 获取根据分类查询指标
 func GetBaseFromSmmIndexByClassifyId(classifyId int) (list []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_smm_index WHERE classify_id =? ORDER BY sort ASC, base_from_smm_index_id ASC `
-	_, err = o.Raw(sql, classifyId).QueryRows(&list)
-	return
-}
+	err = o.Raw(sql, classifyId).Scan(&list).Error
 
-// GetSmmIndexAll 用于分类展示
-func GetSmmIndexAll() (items []*BaseFromSmmClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT base_from_smm_index_id, classify_id, index_name as classify_name, index_code as base_from_smm_index_code
-            FROM base_from_smm_index ORDER BY sort ASC, base_from_smm_index_id ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 // GetBaseFromSmmIndexByIndexId 根据指标id获取指标信息
 func GetBaseFromSmmIndexByIndexId(indexId int) (item *BaseFromSmmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_smm_index WHERE base_from_smm_index_id=? `
-	err = o.Raw(sql, indexId).QueryRow(&item)
+	err = o.Raw(sql, indexId).First(&item).Error
+
 	return
 }
 
 // GetBaseFromSmmIndexMaxSortByClassifyId 根据指标id获取指标信息
 func GetBaseFromSmmIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT max(sort) FROM base_from_smm_index WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = o.Raw(sql, classifyId).Scan(&sort).Error
+
 	return
 }
 
 // GetBaseFromSmmIndexMinSortByClassifyId 获取最小不等于0的排序
 func GetBaseFromSmmIndexMinSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT min(sort) FROM base_from_smm_index WHERE classify_id=? and sort <> 0 `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = o.Raw(sql, classifyId).Scan(&sort).Error
+
 	return
 }
 
@@ -218,72 +237,74 @@ type BaseFromSmmIndexType struct {
 
 // GetBaseFromSmmIndexType 获取历史指标信息类型
 func GetBaseFromSmmIndexType() (list []BaseFromSmmIndexType, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT type_2, type_3 from base_from_smm_index where type_2 <> "" GROUP BY type_2, type_3`
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Scan(&list).Error
+
 	return
 }
 
 // MoveBaseFromSmmIndex 移动指标分类
 func MoveBaseFromSmmIndex(chartInfoId, classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` UPDATE base_from_smm_index
 			SET
 			  classify_id = ?, modify_time=NOW() 
 			WHERE base_from_smm_index_id = ?`
-	_, err = o.Raw(sql, classifyId, chartInfoId).Exec()
+	err = o.Exec(sql, classifyId, chartInfoId).Error
+
 	return
 }
 
 // UpdateBaseFromSmmIndexByClassifyId 根据指标id更新排序
 func UpdateBaseFromSmmIndexByClassifyId(classifyId, nowSort, prevIndexInfoId int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` update base_from_smm_index set sort = ` + updateSort + ` WHERE classify_id=? AND  `
 	if prevIndexInfoId > 0 {
 		sql += ` ( sort > ? or (base_from_smm_index_id > ` + fmt.Sprint(prevIndexInfoId) + ` and sort = ` + fmt.Sprint(nowSort) + `))`
 	}
-	_, err = o.Raw(sql, classifyId, nowSort).Exec()
+	err = o.Exec(sql, classifyId, nowSort).Error
+
 	return
 }
 
 // MoveUpSmmIndexBySort 往上移动
 func MoveUpSmmIndexBySort(classifyId, nextSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `update base_from_smm_index set sort = sort + 1 where classify_id=? and sort >= ? and sort< ?`
-	_, err = o.Raw(sql, classifyId, nextSort, currentSort).Exec()
+	err = o.Exec(sql, classifyId, nextSort, currentSort).Error
+
 	return
 }
 
 // MoveDownSmmIndexBySort 往下移动
 func MoveDownSmmIndexBySort(classifyId, prevSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `update base_from_smm_index set sort = sort - 1 where classify_id=? and sort <= ? and sort> ? `
-	_, err = o.Raw(sql, classifyId, prevSort, currentSort).Exec()
+	err = o.Exec(sql, classifyId, prevSort, currentSort).Error
+
 	return
 }
 
 // GetFirstBaseFromSmmIndexByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstBaseFromSmmIndexByClassifyId(classifyId int) (item *BaseFromSmmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_smm_index WHERE classify_id=? order by sort asc,base_from_smm_index_id asc limit 1`
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).Scan(&item).Error
+
 	return
 }
 
 // Update 更新Smm指标基础信息
 func (item *BaseFromSmmIndex) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(item, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(item).Error
+
 	return
 }
 
 // DeleteBaseFromSmmIndexById 根据指标id删除对应的指标、指标数据
 func DeleteBaseFromSmmIndexById(smmIndexId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -294,14 +315,14 @@ func DeleteBaseFromSmmIndexById(smmIndexId int) (err error) {
 
 	//删除指标
 	sql := `DELETE FROM base_from_smm_index WHERE base_from_smm_index_id = ? `
-	_, err = to.Raw(sql, smmIndexId).Exec()
+	err = to.Exec(sql, smmIndexId).Error
 	if err != nil {
 		return
 	}
 
 	//删除指标数据
 	sql = `DELETE FROM base_from_smm_data WHERE base_from_smm_index_id = ? `
-	_, err = to.Raw(sql, smmIndexId).Exec()
+	err = to.Exec(sql, smmIndexId).Error
 	if err != nil {
 		return
 	}
@@ -341,8 +362,9 @@ func GetSmmIndexDataList(condition, sortStr string, pars []interface{}, startSiz
 	}
 	sql += ` ORDER BY ` + sortStr
 	sql += `  limit ?,? `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	o := global.DmSQL["data"]
+	err = o.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
@@ -352,8 +374,9 @@ func GetSmmIndexDataListCount(condition string, pars []interface{}) (total int,
 	if condition != "" {
 		sql += condition
 	}
-	o := orm.NewOrmUsingDB("data")
-	err = o.Raw(sql, pars).QueryRow(&total)
+	o := global.DmSQL["data"]
+	err = o.Raw(sql, pars).Scan(&total).Error
+
 	return
 }
 
@@ -396,9 +419,10 @@ type BaseFromSmmIndexTypeList struct {
 
 // GetBaseFromSmmIndexTypeList
 func GetBaseFromSmmIndexTypeList() (list []BaseFromSmmIndexTypeList, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT type_1,type_2, type_3 from base_from_smm_index GROUP BY type_1,type_2,type_3 `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Scan(&list).Error
+
 	return
 }
 
@@ -413,15 +437,17 @@ func GetSmmIndexDataListNoPage(condition string, pars []interface{}) (items []*B
 	if condition != "" {
 		sql += condition
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	o := global.DmSQL["data"]
+	err = o.Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 func GetBaseFromSmmIndexByIndexCodes(indexCodes string) (list []*BaseFromSmmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_smm_index WHERE index_code IN (` + indexCodes + `)`
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Scan(&list).Error
+
 	return
 }
 

models/data_manage/base_from_smm_classify.go

@@ -1,9 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -23,16 +22,22 @@ type BaseFromSmmClassify struct {
 
 // AddBaseFromSmmClassify 添加SMM原始数据分类
 func AddBaseFromSmmClassify(item *BaseFromSmmClassify) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	err = global.DmSQL["data"].Create(item).Error
+	if err != nil {
+		return
+	}
+
+	lastId = int64(item.ClassifyId)
+
 	return
 }
 
 // GetBaseFromSmmClassifyCount 获取分类名称的个数
 func GetBaseFromSmmClassifyCount(classifyName string, parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) AS count FROM base_from_smm_classify WHERE classify_name=? AND parent_id=? `
-	err = o.Raw(sql, classifyName, parentId).QueryRow(&count)
+	err = o.Raw(sql, classifyName, parentId).Scan(&count).Error
+
 	return
 }
 
@@ -45,25 +50,28 @@ func GetBaseFromSmmClassifyCount(classifyName string, parentId int) (count int,
 // @return count int
 // @return err error
 func GetBaseFromSmmClassifyEnCount(classifyNameEn string, parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) AS count FROM base_from_smm_classify WHERE classify_name_en = ? AND parent_id = ? `
-	err = o.Raw(sql, classifyNameEn, parentId).QueryRow(&count)
+	err = o.Raw(sql, classifyNameEn, parentId).Scan(&count).Error
+
 	return
 }
 
 // GetBaseFromSmmClassifyById 通过分类id的获取分类信息
 func GetBaseFromSmmClassifyById(classifyId int) (item *BaseFromSmmClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_smm_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).Scan(&item).Error
+
 	return
 }
 
 // EditBaseFromSmmClassify 修改SMM原始数据分类
 func EditBaseFromSmmClassify(classifyId int, classifyName string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `UPDATE base_from_smm_classify SET classify_name=?,modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyName, classifyId).Exec()
+	err = o.Exec(sql, classifyName, classifyId).Error
+
 	return
 }
 
@@ -75,17 +83,19 @@ func EditBaseFromSmmClassify(classifyId int, classifyName string) (err error) {
 // @param classifyNameEn string
 // @return err error
 func EditBaseFromSmmClassifyEn(classifyId int, classifyNameEn string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `UPDATE base_from_smm_classify SET classify_name_en = ?,modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyNameEn, classifyId).Exec()
+	err = o.Exec(sql, classifyNameEn, classifyId).Error
+
 	return
 }
 
 // UpdateBaseFromSmmClassifySort 修改SMM原始数据分类的排序
 func UpdateBaseFromSmmClassifySort(classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `UPDATE base_from_smm_classify SET sort=classify_id, modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyId).Exec()
+	err = o.Exec(sql, classifyId).Error
+
 	return
 }
 
@@ -128,25 +138,28 @@ type BaseFromSmmClassifyItemsButton struct {
 
 // GetBaseFromSmmClassifyByParentId 根据上级id获取当下的分类列表数据
 func GetBaseFromSmmClassifyByParentId(parentId int) (items []*BaseFromSmmClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_smm_classify WHERE parent_id=? order by sort asc,classify_id asc`
-	_, err = o.Raw(sql, parentId).QueryRows(&items)
+	err = o.Raw(sql, parentId).Scan(&items).Error
+
 	return
 }
 
 // GetBaseFromSmmClassifyByIds 根据id获取当下的分类列表数据
 func GetBaseFromSmmClassifyByIds(classifyIds []int) (items []*BaseFromSmmClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_smm_classify WHERE parent_id > 0 and classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) order by sort asc, classify_id asc`
-	_, err = o.Raw(sql, classifyIds).QueryRows(&items)
+	err = o.Raw(sql, classifyIds).Scan(&items).Error
+
 	return
 }
 
 // GetAllBaseFromSmmClassify 获取所有的分类列表数据
 func GetAllBaseFromSmmClassify() (items []*BaseFromSmmClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_smm_classify WHERE parent_id <> 0 order by sort asc,classify_id asc`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }
 
@@ -166,53 +179,36 @@ type BaseFromSmmClassifySimplify struct {
 	ParentId     int
 }
 
-// GetFirstBaseFromSmmClassify 获取当前分类下，且排序数相同 的排序第一条的数据
-func GetFirstBaseFromSmmClassify() (item *BaseFromSmmClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_smm_classify order by sort asc,classify_id asc limit 1`
-	err = o.Raw(sql).QueryRow(&item)
-	return
-}
-
-// UpdateBaseFromSmmClassifySortByClassifyId 根据分类id更新排序
-func UpdateBaseFromSmmClassifySortByClassifyId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` update base_from_smm_classify set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? `
-	if classifyId > 0 {
-		sql += ` or ( classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
-	}
-	_, err = o.Raw(sql, parentId, nowSort).Exec()
-	return
-}
-
 // MoveUpSmmIndexClassifyBySort 往上移动
 func MoveUpSmmIndexClassifyBySort(parentId, nextSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `update base_from_smm_classify set sort = sort + 1 where parent_id=? and sort >= ? and sort< ?`
-	_, err = o.Raw(sql, parentId, nextSort, currentSort).Exec()
+	err = global.DmSQL["data"].Exec(sql, parentId, nextSort, currentSort).Error
+
 	return
 }
 
 // MoveDownSmmIndexClassifyBySort 往下移动
 func MoveDownSmmIndexClassifyBySort(parentId, prevSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `update base_from_smm_classify set sort = sort - 1 where parent_id=? and sort <= ? and sort> ? `
-	_, err = o.Raw(sql, parentId, prevSort, currentSort).Exec()
+	err = o.Exec(sql, parentId, prevSort, currentSort).Error
+
 	return
 }
 
 // GetSmmIndexClassifyMinSort 获取最小不等于0的排序
 func GetSmmIndexClassifyMinSort(parentId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `select min(sort) from base_from_smm_classify where parent_id=? and sort <> 0 `
-	err = o.Raw(sql, parentId).QueryRow(&sort)
+	err = global.DmSQL["data"].Raw(sql, parentId).Scan(&sort).Error
+
 	return
 }
 
 // Update 更新分类基础信息
 func (BaseFromSmmClassify *BaseFromSmmClassify) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(BaseFromSmmClassify, cols...)
+	o := global.DmSQL["data"]
+	err = o.Select(cols).Updates(BaseFromSmmClassify).Error
+
 	return
 }
 
@@ -222,36 +218,39 @@ type AddSmmClassifyResp struct {
 
 // DeleteSmmClassifyByClassifyId 根据分类id删除对应的指标分类
 func DeleteSmmClassifyByClassifyId(classifyIdList []int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	num := len(classifyIdList)
 	if num <= 0 {
 		return
 	}
 	//删除分类
 	sql := `DELETE FROM base_from_smm_classify WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, classifyIdList).Exec()
+	err = o.Exec(sql, classifyIdList).Error
+
 	return
 }
 
 // AddSmmClassifyMulti 批量新增SMM类别
 func AddSmmClassifyMulti(list []*BaseFromSmmClassify) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(1, list)
+	o := global.DmSQL["data"]
+	err = o.CreateInBatches(list, utils.MultiAddNum).Error
+
 	return
 }
 
 // InitSmmClassifySort 初始化sort值
 func InitSmmClassifySort() (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `UPDATE base_from_smm_classify 
 SET modify_time=NOW(), sort = classify_id`
-	_, err = o.Raw(sql).Exec()
+	err = o.Exec(sql).Error
+
 	return
 }
 
 // InitSmmIndexClassifyId 历史数据的classifyId值
 func InitSmmIndexClassifyId() (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `UPDATE base_from_smm_index s
 LEFT JOIN (
 SELECT
@@ -262,6 +261,7 @@ FROM
 	LEFT JOIN base_from_smm_classify c2 ON c1.parent_id = c2.classify_id 
 	) AS t ON CONCAT( s.type_2, s.type_3 ) = t.type_name
 	SET s.classify_id = t.classify_id, s.modify_time=NOW() where s.type_2 <>""`
-	_, err = o.Raw(sql).Exec()
+	err = o.Exec(sql).Error
+
 	return
 }

models/data_manage/base_from_ths_hf.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"strings"
 	"time"
@@ -97,12 +97,8 @@ func (m *BaseFromThsHfIndex) Cols() BaseFromThsHfIndexCols {
 }
 
 func (m *BaseFromThsHfIndex) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.BaseFromThsHfIndexId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -110,21 +106,23 @@ func (m *BaseFromThsHfIndex) CreateMulti(items []*BaseFromThsHfIndex) (err error
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *BaseFromThsHfIndex) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	o := global.DmSQL["data"]
+	err = o.Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *BaseFromThsHfIndex) Remove() (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.BaseFromThsHfIndexId).Exec()
+	err = o.Exec(sql, m.BaseFromThsHfIndexId).Error
+
 	return
 }
 
@@ -132,9 +130,10 @@ func (m *BaseFromThsHfIndex) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = o.Exec(sql, ids).Error
+
 	return
 }
 
@@ -142,39 +141,43 @@ func (m *BaseFromThsHfIndex) RemoveByCondition(condition string, pars []interfac
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = o.Exec(sql, pars).Error
+
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetItemById(id int) (item *BaseFromThsHfIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = o.Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *BaseFromThsHfIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = o.Raw(sql, pars).First(&item).Error
+
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromThsHfIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -184,12 +187,13 @@ func (m *BaseFromThsHfIndex) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 func (m *BaseFromThsHfIndex) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BaseFromThsHfIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -199,7 +203,8 @@ func (m *BaseFromThsHfIndex) GetPageItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
@@ -249,9 +254,10 @@ func (m *BaseFromThsHfIndex) UpdateClassifyMulti(ids []int, classifyId int) (err
 	if len(ids) == 0 || classifyId <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`UPDATE %s SET %s = ?, %s = NOW() WHERE %s IN (%s)`, m.TableName(), m.Cols().BaseFromThsHfClassifyId, m.Cols().ModifyTime, m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, classifyId, ids).Exec()
+	err = o.Exec(sql, classifyId, ids).Error
+
 	return
 }
 
@@ -407,38 +413,42 @@ type ThsHfIndexPageListResp struct {
 }
 
 func GetThsHfIndexById(indexId int) (item *BaseFromThsHfIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_ths_hf_index WHERE base_from_ths_hf_index_id = ?`
-	err = o.Raw(sql, indexId).QueryRow(&item)
+	err = o.Raw(sql, indexId).First(&item).Error
+
 	return
 }
 
 // UpdateThsHfIndexSortByClassifyId 根据分类id更新排序
 func UpdateThsHfIndexSortByClassifyId(classifyId, nowSort int, prevEdbInfoId int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` update base_from_ths_hf_index set sort = ` + updateSort + ` WHERE base_from_ths_hf_classify_id=?`
 	if prevEdbInfoId > 0 {
 		sql += ` AND ( sort > ? or ( base_from_ths_hf_index_id > ` + fmt.Sprint(prevEdbInfoId) + ` and sort=` + fmt.Sprint(nowSort) + ` )) `
 	} else {
 		sql += ` AND ( sort > ? )`
 	}
-	_, err = o.Raw(sql, classifyId, nowSort).Exec()
+	err = o.Exec(sql, classifyId, nowSort).Error
+
 	return
 }
 
 // GetThsHfIndexMaxSortByClassifyId 获取分类下指标的最大的排序数
 func GetThsHfIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT Max(sort) AS sort FROM base_from_ths_hf_index WHERE base_from_ths_hf_classify_id = ?`
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = o.Raw(sql, classifyId).Scan(&sort).Error
+
 	return
 }
 
 // GetFirstThsHfIndexByClassifyId 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstThsHfIndexByClassifyId(classifyId int) (item *BaseFromThsHfIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_ths_hf_index WHERE base_from_ths_hf_classify_id = ? order by sort asc,base_from_ths_hf_index_id asc limit 1`
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).First(&item).Error
+
 	return
 }
 

models/data_manage/base_from_ths_hf_classify.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -64,12 +64,8 @@ func (m *BaseFromThsHfClassify) Cols() BaseFromThsHfClassifyCols {
 }
 
 func (m *BaseFromThsHfClassify) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.BaseFromThsHfClassifyId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -77,21 +73,21 @@ func (m *BaseFromThsHfClassify) CreateMulti(items []*BaseFromThsHfClassify) (err
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *BaseFromThsHfClassify) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *BaseFromThsHfClassify) Remove() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.BaseFromThsHfClassifyId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.BaseFromThsHfClassifyId).Error
+
 	return
 }
 
@@ -99,9 +95,9 @@ func (m *BaseFromThsHfClassify) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DmSQL["data"].Exec(sql, ids).Error
+
 	return
 }
 
@@ -109,39 +105,42 @@ func (m *BaseFromThsHfClassify) RemoveByCondition(condition string, pars []inter
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = global.DmSQL["data"].Exec(sql, pars).Error
+
 	return
 }
 
 func (m *BaseFromThsHfClassify) GetItemById(id int) (item *BaseFromThsHfClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = o.Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *BaseFromThsHfClassify) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *BaseFromThsHfClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = o.Raw(sql, pars).First(&item).Error
+
 	return
 }
 
 func (m *BaseFromThsHfClassify) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func (m *BaseFromThsHfClassify) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromThsHfClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -151,12 +150,13 @@ func (m *BaseFromThsHfClassify) GetItemsByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 func (m *BaseFromThsHfClassify) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BaseFromThsHfClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -166,7 +166,8 @@ func (m *BaseFromThsHfClassify) GetPageItemsByCondition(condition string, pars [
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
@@ -209,9 +210,10 @@ type ThsHfClassifyEditReq struct {
 }
 
 func (m *BaseFromThsHfClassify) GetSortMax(parentId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT Max(%s) FROM %s WHERE %s = ?`, m.Cols().Sort, m.TableName(), m.Cols().ParentId)
-	err = o.Raw(sql, parentId).QueryRow(&sort)
+	err = o.Raw(sql, parentId).Scan(&sort).Error
+
 	return
 }
 
@@ -245,53 +247,57 @@ type BaseFromThsHfClassifyMoveReq struct {
 }
 
 func GetThsHfClassifyById(classifyId int) (item *BaseFromThsHfClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_ths_hf_classify WHERE base_from_ths_hf_classify_id = ?`
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).First(&item).Error
+
 	return
 }
 
 func GetThsHfClassifyByRootIdLevel(rootId int, orderStr string) (items []*BaseFromThsHfClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_ths_hf_classify WHERE root_id = ? `
 	if orderStr != "" {
 		sql += orderStr
 	} else {
 		sql += ` order by level desc, sort asc, base_from_ths_hf_classify_id asc`
 	}
-	_, err = o.Raw(sql, rootId).QueryRows(&items)
+	err = o.Raw(sql, rootId).Scan(&items).Error
+
 	return
 }
 
 // UpdateThsHfClassifySortByParentId 根据父类id更新排序
 func UpdateThsHfClassifySortByParentId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` update base_from_ths_hf_classify set sort = ` + updateSort + ` WHERE parent_id = ? AND sort > ? `
 	if classifyId > 0 {
 		sql += ` or ( base_from_ths_hf_classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
 	}
-	_, err = o.Raw(sql, parentId, nowSort).Exec()
+	err = global.DmSQL["data"].Exec(sql, parentId, nowSort).Error
+
 	return
 }
 
 // GetFirstThsHfClassifyByParentId 获取当前父级分类下，且排序数相同 的排序第一条的数据
 func GetFirstThsHfClassifyByParentId(parentId int) (item *BaseFromThsHfClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_ths_hf_classify WHERE parent_id = ? order by sort asc,base_from_ths_hf_classify_id asc limit 1`
-	err = o.Raw(sql, parentId).QueryRow(&item)
+	err = o.Raw(sql, parentId).First(&item).Error
+
 	return
 }
 
 func UpdateThsHfClassifyChildByParentClassifyId(classifyIds []int, rootId int, levelStep int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	var pars []interface{}
 	pars = append(pars, rootId, levelStep)
 	pars = append(pars, classifyIds)
 	// 更新相关联的二级分类的parentId,和classify_name_second
 	sql := `update base_from_ths_hf_classify SET root_id = ?, level = level+? where base_from_ths_hf_classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
-	_, err = o.Raw(sql, pars).Exec()
+	err = o.Exec(sql, pars).Error
 	if err != nil {
 		return
 	}
+
 	return
 }

models/data_manage/base_from_ths_hf_data.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -52,12 +52,8 @@ func (m *BaseFromThsHfData) Cols() BaseFromThsHfDataCols {
 }
 
 func (m *BaseFromThsHfData) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.BaseFromThsHfDataId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -65,21 +61,22 @@ func (m *BaseFromThsHfData) CreateMulti(items []*BaseFromThsHfData) (err error)
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *BaseFromThsHfData) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	o := global.DmSQL["data"]
+	err = o.Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *BaseFromThsHfData) Remove() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	_, err = o.Raw(sql, m.BaseFromThsHfDataId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.BaseFromThsHfDataId).Error
+
 	return
 }
 
@@ -87,9 +84,9 @@ func (m *BaseFromThsHfData) MultiRemove(ids []int) (err error) {
 	if len(ids) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.Cols().PrimaryId, utils.GetOrmInReplace(len(ids)))
-	_, err = o.Raw(sql, ids).Exec()
+	err = global.DmSQL["data"].Exec(sql, ids).Error
+
 	return
 }
 
@@ -97,39 +94,42 @@ func (m *BaseFromThsHfData) RemoveByCondition(condition string, pars []interface
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = global.DmSQL["data"].Exec(sql, pars).Error
+
 	return
 }
 
 func (m *BaseFromThsHfData) GetItemById(id int) (item *BaseFromThsHfData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().PrimaryId)
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = o.Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *BaseFromThsHfData) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *BaseFromThsHfData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = o.Raw(sql, pars).First(&item).Error
+
 	return
 }
 
 func (m *BaseFromThsHfData) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func (m *BaseFromThsHfData) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*BaseFromThsHfData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -139,12 +139,13 @@ func (m *BaseFromThsHfData) GetItemsByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 func (m *BaseFromThsHfData) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*BaseFromThsHfData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -154,7 +155,8 @@ func (m *BaseFromThsHfData) GetPageItemsByCondition(condition string, pars []int
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 

models/data_manage/base_from_trade_index.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -115,90 +115,100 @@ type BaseFromTradeEicIndex struct {
 }
 
 func GetBaseFromTradeIndexByParam(exchange, date, classifyName, classifyType string) (list []*BaseFromTradeShanghaiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	if classifyName == "" {
 		sql := "SELECT * FROM base_from_trade_" + exchange + "_index where data_time=?"
-		_, err = o.Raw(sql, date).QueryRows(&list)
+		err = o.Raw(sql, date).Scan(&list).Error
 		return
 	} else if classifyType == "" {
 		sql := "SELECT * FROM base_from_trade_" + exchange + "_index where data_time=? and classify_name=? ORDER BY classify_type,`rank`"
-		_, err = o.Raw(sql, date, classifyName).QueryRows(&list)
+		err = o.Raw(sql, date, classifyName).Scan(&list).Error
 		return
 	} else {
 		sql := "SELECT * FROM base_from_trade_" + exchange + "_index where data_time=? and classify_name=? and classify_type=?"
-		_, err = o.Raw(sql, date, classifyName, classifyType).QueryRows(&list)
+		err = o.Raw(sql, date, classifyName, classifyType).Scan(&list).Error
 		return
 	}
 }
 
 func GetExchangeClassify(exchange, dataTime string) (classifyName []string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT DISTINCT classify_name FROM base_from_trade_" + exchange + "_index where data_time=? ORDER BY CONVERT(classify_name using gbk) DESC"
-	_, err = o.Raw(sql, dataTime).QueryRows(&classifyName)
+	err = o.Raw(sql, dataTime).Scan(&classifyName).Error
+
 	return
 }
 
 func GetLatestDate(exchange string) (dataTime string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT data_time FROM base_from_trade_" + exchange + "_index ORDER BY data_time desc limit 1"
-	err = o.Raw(sql).QueryRow(&dataTime)
+	err = o.Raw(sql).Scan(&dataTime).Error
+
 	return
 }
 
 func GetExchangeClassifyContract(exchange, Classify, dataTime string) (classifyName []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT DISTINCT classify_type FROM base_from_trade_" + exchange + "_index where classify_name=? and data_time=?"
-	_, err = o.Raw(sql, Classify, dataTime).QueryRows(&classifyName)
+	err = o.Raw(sql, Classify, dataTime).Scan(&classifyName).Error
+
 	return
 }
 
 func GetContinentEicDate(date string) (data []*BaseFromTradeEicIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index where gas_day_started_on=? and type='continent' "
-	_, err = o.Raw(sql, date).QueryRows(&data)
+	err = o.Raw(sql, date).Scan(&data).Error
+
 	return
 }
 
 func GetCountryEicDate(date string) (data []*BaseFromTradeEicIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index where gas_day_started_on=? and type='country' "
-	_, err = o.Raw(sql, date).QueryRows(&data)
+	err = o.Raw(sql, date).Scan(&data).Error
+
 	return
 }
 
 func GetSSOEicDate(date, country string) (data []*BaseFromTradeEicIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index where gas_day_started_on=? and country=? and type='SSO' "
-	_, err = o.Raw(sql, date, country).QueryRows(&data)
+	err = o.Raw(sql, date, country).Scan(&data).Error
+
 	return
 }
 
 func GetStorageEicDate(date, country string) (data []*BaseFromTradeEicIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index where gas_day_started_on=? and country=? " +
 		" and (type='Storage Facility' or type='Storage Group') "
-	_, err = o.Raw(sql, date, country).QueryRows(&data)
+	err = o.Raw(sql, date, country).Scan(&data).Error
+
 	return
 }
 
 func GetEicDate() (date []*BaseFromTradeEicIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index ORDER BY gas_day_started_on desc limit 1"
-	_, err = o.Raw(sql).QueryRows(&date)
+	err = o.Raw(sql).Scan(&date).Error
+
 	return
 }
 
 func GetEicHistoryDate(code string) (date []*BaseFromTradeEicIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index WHERE eic_code=? ORDER BY gas_day_started_on desc limit 30"
-	_, err = o.Raw(sql, code).QueryRows(&date)
+	err = o.Raw(sql, code).Scan(&date).Error
+
 	return
 }
 
 func GetEicHistoryDateByDate(code, startDate, endDate string) (date []*BaseFromTradeEicIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index WHERE eic_code=? and gas_day_started_on between ? and ? ORDER BY gas_day_started_on desc"
-	_, err = o.Raw(sql, code, startDate, endDate).QueryRows(&date)
+	err = o.Raw(sql, code, startDate, endDate).Scan(&date).Error
+
 	return
 }
 
@@ -218,14 +228,6 @@ type BaseFromCoalmineJsmIndex struct {
 	ModifyTime                 string `description:"修改时间"`
 }
 
-// GetBaseFromCoalmineIndex 查询数据
-func GetBaseFromCoalmineIndex(startDate, endDate string) (items []*BaseFromCoalmineJsmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_coalmine_jsm_index WHERE data_time between ? and ? `
-	_, err = o.Raw(sql, startDate, endDate).QueryRows(&items)
-	return
-}
-
 type BaseFromCoalmineCompanyIndex struct {
 	BaseFromCoalmineCompanyIndexId int    `orm:"column(base_from_coalmine_company_index_id);pk"`
 	IndexName                      string `description:"持买单量指标名称"`
@@ -242,14 +244,6 @@ type BaseFromCoalmineCompanyIndex struct {
 	ModifyTime                     string `description:"修改时间"`
 }
 
-// GetBaseFromCoalmineCompanyIndex 查询公司指标
-func GetBaseFromCoalmineCompanyIndex(startDate, endDate string) (items []*BaseFromCoalmineCompanyIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_coalmine_company_index WHERE data_time between ? and ? `
-	_, err = o.Raw(sql, startDate, endDate).QueryRows(&items)
-	return
-}
-
 // BaseFromCoalmineFirmIndex 煤矿产量周度公司数据表
 type BaseFromCoalmineFirmIndex struct {
 	BaseFromCoalmineFirmIndexID int    `orm:"column(base_from_coalmine_firm_index_id);pk"`
@@ -265,16 +259,6 @@ type BaseFromCoalmineFirmIndex struct {
 	ModifyTime                  string `description:"修改时间"`
 }
 
-// 查询指标
-func GetBaseFromCoalmineFirmIndex(dataTime string) (items []*BaseFromCoalmineFirmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_coalmine_firm_index WHERE data_time LIKE  `
-	sql = sql + "'" + dataTime + "%" + "'"
-	_, err = o.Raw(sql).QueryRows(&items)
-	fmt.Println(sql)
-	return
-}
-
 // BaseFromCoalmineCoastalIndex 沿海八省动力煤用户供耗存数据指标表
 type BaseFromCoalmineCoastalIndex struct {
 	BaseFromCoalmineCoastalIndexID int    `orm:"column(base_from_coalmine_coastal_index_id);pk"`
@@ -292,9 +276,10 @@ type BaseFromCoalmineCoastalIndex struct {
 
 // 查询指标
 func GetBaseFromCoalmineCoastalIndex(startDate, endDate string) (items []*BaseFromCoalmineCoastalIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_coastal_index WHERE data_time between ? and ? `
-	_, err = o.Raw(sql, startDate, endDate).QueryRows(&items)
+	err = o.Raw(sql, startDate, endDate).Scan(&items).Error
+
 	return
 }
 
@@ -315,9 +300,10 @@ type BaseFromCoalmineInlandIndex struct {
 
 // 查询指标
 func GetBaseFromCoalmineInlandIndex(startDate, endDate string) (items []*BaseFromCoalmineInlandIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_inland_index WHERE data_time between ? and ? `
-	_, err = o.Raw(sql, startDate, endDate).QueryRows(&items)
+	err = o.Raw(sql, startDate, endDate).Scan(&items).Error
+
 	return
 }
 
@@ -374,227 +360,211 @@ type FrequencyResp struct {
 
 // GetFrequencyFromCoal 获取指标信息
 func GetFrequencyFromCoal(suffix string) (list *string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT DISTINCT frequency FROM base_from_coalmine_%s `
 	sql = fmt.Sprintf(sql, suffix)
-	err = o.Raw(sql).QueryRow(&list)
-	return
-}
+	err = o.Raw(sql).Scan(&list).Error
 
-// 查询数据
-func GetBaseFromCoalmineIndexByFrequency(frequency, groupName string) (items []*BaseFromCoalmineJsmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_coalmine_jsm_index WHERE frequency=? AND province=?`
-	_, err = o.Raw(sql, frequency, groupName).QueryRows(&items)
 	return
 }
 
 // 查询数据
 func GetGroupNameFromCoalmineIndex(suffix string) (items []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT DISTINCT group_name FROM base_from_coalmine_%s `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }
 
 // 查询数据
 func GetProvinceFromCoalmineIndex(suffix string) (items []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT DISTINCT province FROM base_from_coalmine_%s `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }
 
 // 查询数据
 func GetClassifyCoalmineIndexByGroupName(groupName string) (items []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT DISTINCT index_code FROM base_from_coalmine_jsm_index WHERE province=? `
-	_, err = o.Raw(sql, groupName).QueryRows(&items)
+	err = o.Raw(sql, groupName).Scan(&items).Error
+
 	return
 }
 
 // 查询数据
 func GetPageFromCoalmineIndexByFrequency(frequency, classify string, startSize, pageSize int) (items []*BaseFromCoalmineJsmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_jsm_index WHERE frequency=? AND index_code=? ORDER BY data_time DESC LIMIT ?,?  `
-	_, err = o.Raw(sql, frequency, classify, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, frequency, classify, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 // 查询数据
 func GetCountFromJsm(indexCode string) (item int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) FROM base_from_coalmine_jsm_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = o.Raw(sql, indexCode).Scan(&item).Error
+
 	return
 }
 
 func GetClassifyCompanyByGroupName(groupName string) (items []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT DISTINCT index_code FROM base_from_coalmine_company_index WHERE group_name=? `
-	_, err = o.Raw(sql, groupName).QueryRows(&items)
+	err = o.Raw(sql, groupName).Scan(&items).Error
+
 	return
 }
 
 func GetClassifyJsmByGroupName(groupName string) (items []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT DISTINCT index_code FROM base_from_coalmine_jsm_index WHERE province=? `
-	_, err = o.Raw(sql, groupName).QueryRows(&items)
+	err = o.Raw(sql, groupName).Scan(&items).Error
+
 	return
 }
 
 // 查询公司指标
 func GetPageFromCoalmineCompanyIndexByFrequency(frequency, classify string, startSize, pageSize int) (items []*BaseFromCoalmineCompanyIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_company_index WHERE frequency=? AND index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	_, err = o.Raw(sql, frequency, classify, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, frequency, classify, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 func GetCountFromCompany(indexCode string) (item int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) FROM base_from_coalmine_company_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = o.Raw(sql, indexCode).Scan(&item).Error
+
 	return
 }
 
 func GetCountFromFirm(indexCode string) (item int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) FROM base_from_coalmine_firm_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = o.Raw(sql, indexCode).Scan(&item).Error
+
 	return
 }
 
 func GetClassifyFirmByGroupName(groupName string) (items []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT DISTINCT index_code FROM base_from_coalmine_firm_index WHERE group_name=? `
-	_, err = o.Raw(sql, groupName).QueryRows(&items)
+	err = o.Raw(sql, groupName).Scan(&items).Error
+
 	return
 }
 
 // 查询指标
 func GetPageFromCoalmineFirmIndexByFrequency(frequency, classify string, startSize, pageSize int) (items []*BaseFromCoalmineFirmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_firm_index WHERE frequency=? AND index_code=? ORDER BY data_time DESC LIMIT ?,?  `
-	_, err = o.Raw(sql, frequency, classify, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, frequency, classify, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 func GetCountFromCoastal(indexCode string) (item int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) FROM base_from_coalmine_coastal_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = o.Raw(sql, indexCode).Scan(&item).Error
+
 	return
 }
 
 func GetClassifyCoastalByGroupName(groupName string) (items []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT DISTINCT index_code FROM base_from_coalmine_coastal_index WHERE group_name=? `
-	_, err = o.Raw(sql, groupName).QueryRows(&items)
+	err = o.Raw(sql, groupName).Scan(&items).Error
+
 	return
 }
 
 // 查询指标
 func GetPageFromCoalmineCoastalIndexByFrequency(frequency, classify string, startSize, pageSize int) (items []*BaseFromCoalmineCoastalIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_coastal_index WHERE frequency=? AND index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	_, err = o.Raw(sql, frequency, classify, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, frequency, classify, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 func GetCountFromInland(indexCode string) (item int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) FROM base_from_coalmine_inland_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = o.Raw(sql, indexCode).Scan(&item).Error
+
 	return
 }
 
 func GetClassifyInlandByGroupName(groupName string) (items []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT DISTINCT index_code FROM base_from_coalmine_inland_index WHERE group_name=? `
-	_, err = o.Raw(sql, groupName).QueryRows(&items)
+	err = o.Raw(sql, groupName).Scan(&items).Error
+
 	return
 }
 
 // 查询指标
 func GetPageFromCoalmineInlandIndexByFrequency(frequency, classify string, startSize, pageSize int) (items []*BaseFromCoalmineInlandIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_inland_index WHERE frequency=? AND index_code=? ORDER BY data_time DESC LIMIT ?,? `
-	_, err = o.Raw(sql, frequency, classify, startSize, pageSize).QueryRows(&items)
-	return
-}
-
-// 查询公司指标
-func GetBaseFromCoalmineCompanyIndexByFrequency(frequency, groupName string) (items []*BaseFromCoalmineCompanyIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_coalmine_company_index WHERE frequency=? AND group_name=? `
-	_, err = o.Raw(sql, frequency, groupName).QueryRows(&items)
-	return
-}
+	err = o.Raw(sql, frequency, classify, startSize, pageSize).Scan(&items).Error
 
-// 查询指标
-func GetBaseFromCoalmineFirmIndexByFrequency(frequency, groupName string) (items []*BaseFromCoalmineFirmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_coalmine_firm_index WHERE frequency=? AND group_name=? `
-	_, err = o.Raw(sql, frequency, groupName).QueryRows(&items)
-	return
-}
-
-// 查询指标
-func GetBaseFromCoalmineCoastalIndexByFrequency(frequency, groupName string) (items []*BaseFromCoalmineCoastalIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_coalmine_coastal_index WHERE frequency=? AND group_name=? `
-	_, err = o.Raw(sql, frequency, groupName).QueryRows(&items)
-	return
-}
-
-// 查询指标
-func GetBaseFromCoalmineInlandIndexByFrequency(frequency, groupName string) (items []*BaseFromCoalmineInlandIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_coalmine_inland_index WHERE frequency=? AND group_name=? `
-	_, err = o.Raw(sql, frequency, groupName).QueryRows(&items)
 	return
 }
 
 // 查询数据
 func GetBaseFromCoalmineIndexByCode(indexCode string) (items []*BaseFromCoalmineJsmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_jsm_index WHERE index_code=?`
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = o.Raw(sql, indexCode).Scan(&items).Error
+
 	return
 }
 
 // 查询公司指标
 func GetBaseFromCoalmineCompanyIndexByCode(indexCode string) (items []*BaseFromCoalmineCompanyIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_company_index WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = o.Raw(sql, indexCode).Scan(&items).Error
+
 	return
 }
 
 // 查询指标
 func GetBaseFromCoalmineFirmIndexByCode(indexCode string) (items []*BaseFromCoalmineFirmIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_firm_index WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = o.Raw(sql, indexCode).Scan(&items).Error
+
 	return
 }
 
 // 查询指标
 func GetBaseFromCoalmineCoastalIndexByCode(indexCode string) (items []*BaseFromCoalmineCoastalIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_coastal_index WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = o.Raw(sql, indexCode).Scan(&items).Error
+
 	return
 }
 
 // 查询指标
 func GetBaseFromCoalmineInlandIndexByCode(indexCode string) (items []*BaseFromCoalmineInlandIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_inland_index WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = o.Raw(sql, indexCode).Scan(&items).Error
+
 	return
 }
 
@@ -633,58 +603,58 @@ type BaseFromTradeEicIndexV2 struct {
 }
 
 func GetEicDateV2() (date []*BaseFromTradeEicIndexV2, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index_v2 ORDER BY gas_day_start desc limit 1"
-	_, err = o.Raw(sql).QueryRows(&date)
+	err = o.Raw(sql).Scan(&date).Error
+
 	return
 }
 
 func GetEicDataV2(date string) (data []*BaseFromTradeEicIndexV2, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index_v2 where gas_day_start=? "
-	_, err = o.Raw(sql, date).QueryRows(&data)
+	err = o.Raw(sql, date).Scan(&data).Error
+
 	return
 }
 
 func GetEicHistoryDateByDateV2(code, startDate, endDate string) (date []*BaseFromTradeEicIndexV2, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index_v2 WHERE eic_code=? and gas_day_start between ? and ? ORDER BY gas_day_start desc"
-	_, err = o.Raw(sql, code, startDate, endDate).QueryRows(&date)
+	err = o.Raw(sql, code, startDate, endDate).Scan(&date).Error
+
 	return
 }
 
 func GetEicHistoryDateV2(code string) (date []*BaseFromTradeEicIndexV2, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index_v2 WHERE eic_code=? ORDER BY gas_day_start desc limit 30"
-	_, err = o.Raw(sql, code).QueryRows(&date)
+	err = o.Raw(sql, code).Scan(&date).Error
+
 	return
 }
 
 func GetContinentAndCountryEicDateV2(date string) (data []*BaseFromTradeEicIndexV2, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index_v2 where gas_day_start=? and (type='continent' OR type='country') "
-	_, err = o.Raw(sql, date).QueryRows(&data)
+	err = o.Raw(sql, date).Scan(&data).Error
+
 	return
 }
 
 func GetSSOAndFacEicDateV2(date, name string) (data []*BaseFromTradeEicIndexV2, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_eic_index_v2 where gas_day_start=? and (type='sso' OR type='fac') "
-	_, err = o.Raw(sql, date).QueryRows(&data)
-	return
-}
+	err = o.Raw(sql, date).Scan(&data).Error
 
-func GetBaseFromTradeIndexByDate(exchange, startDate, endDate string) (list []*BaseFromTradeShanghaiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := "SELECT * FROM base_from_trade_" + exchange + "_index where `rank` < 50 and data_time between ? and ? order by data_time asc"
-	_, err = o.Raw(sql, startDate, endDate).QueryRows(&list)
 	return
 }
 
 func GetFirstBaseFromTradeIndexByDate(exchange string) (item *BaseFromTradeShanghaiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_trade_" + exchange + "_index where `rank` < 50 order by data_time asc"
-	err = o.Raw(sql).QueryRow(&item)
+	err = o.Raw(sql).First(&item).Error
+
 	return
 }
 
@@ -696,8 +666,9 @@ type BaseFromCoalmineClassify struct {
 }
 
 func GetCoalmineClassifyList() (list []*BaseFromCoalmineClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_coalmine_classify"
-	_,err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Scan(&list).Error
+
 	return
 }

models/data_manage/base_from_yongyi.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -53,34 +53,37 @@ type YongyiSingleData struct {
 }
 
 func GetYongyiIndex(condition string, pars interface{}) (items []*BaseFromYongyiIndexList, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_yongyi_index WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC, yongyi_index_id asc`
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 func GetYongyiIndexDataCount(indexCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT COUNT(1) AS count  FROM base_from_yongyi_data WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&count)
+	err = o.Raw(sql, indexCode).Scan(&count).Error
+
 	return
 }
 
 func GetYongyiIndexData(indexCode string, startSize, pageSize int) (items []*BaseFromYongyiData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT *  FROM base_from_yongyi_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).Scan(&items).Error
+
 	return
 }
 
 func GetYongyiIndexDataByCodes(indexCode []string) (items []*BaseFromYongyiData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT *  FROM base_from_yongyi_data WHERE index_code in (` + utils.GetOrmInReplace(len(indexCode)) + `) ORDER BY data_time DESC  `
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = o.Raw(sql, indexCode).Scan(&items).Error
+
 	return
 }
 
@@ -104,26 +107,29 @@ type BaseFromYongyiIndexSearchItem struct {
 
 // GetYongyiItemList 模糊查询Yongyi数据库指标列表
 func GetYongyiItemList(condition string) (items []*BaseFromYongyiIndexSearchItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := "SELECT * FROM base_from_yongyi_index  WHERE 1=1"
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }
 
 func GetYongyiIndexDataByCode(indexCode string) (list []*BaseFromYongyiData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_yongyi_data WHERE index_code=? `
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = o.Raw(sql, indexCode).Scan(&list).Error
+
 	return
 }
 
 func GetBaseFromYongyiIndexByIndexCode(indexCode string) (list *BaseFromYongyiIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_yongyi_index WHERE index_code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&list)
+	err = o.Raw(sql, indexCode).First(&list).Error
+
 	return
 }
 
@@ -134,8 +140,8 @@ type BaseFromYongyiIndexType struct {
 
 // Update 更新Yongyi指标基础信息
 func (item *BaseFromYongyiIndex) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(item, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(item).Error
+
 	return
 }
 

models/data_manage/base_from_yongyi_classify.go

@@ -1,9 +1,7 @@
 package data_manage
 
 import (
-	"eta_gn/eta_api/utils"
-	"fmt"
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
@@ -20,45 +18,6 @@ type BaseFromYongyiClassify struct {
 	CreateTime      time.Time `description:"创建时间"`
 }
 
-// AddBaseFromYongyiClassify 添加Yongyi原始数据分类
-func AddBaseFromYongyiClassify(item *BaseFromYongyiClassify) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
-// GetBaseFromYongyiClassifyCount 获取分类名称的个数
-func GetBaseFromYongyiClassifyCount(classifyName string, parentId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT COUNT(1) AS count FROM base_from_yongyi_classify WHERE classify_name=? AND parent_id=? `
-	err = o.Raw(sql, classifyName, parentId).QueryRow(&count)
-	return
-}
-
-// GetBaseFromYongyiClassifyById 通过分类id的获取分类信息
-func GetBaseFromYongyiClassifyById(classifyId int) (item *BaseFromYongyiClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_yongyi_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
-	return
-}
-
-// EditBaseFromYongyiClassify 修改Yongyi原始数据分类
-func EditBaseFromYongyiClassify(classifyId int, classifyName string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_yongyi_classify SET classify_name=?,modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyName, classifyId).Exec()
-	return
-}
-
-// UpdateBaseFromYongyiClassifySort 修改Yongyi原始数据分类的排序
-func UpdateBaseFromYongyiClassifySort(classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_yongyi_classify SET sort=classify_id, modify_time=NOW() WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyId).Exec()
-	return
-}
-
 type BaseFromYongyiClassifyItems struct {
 	ClassifyId      int    `description:"分类ID"`
 	YongyiIndexId   int    `description:"指标类型ID"`
@@ -91,19 +50,12 @@ type BaseFromYongyiClassifyItemsButton struct {
 	MoveButton   bool `description:"是否可移动"`
 }
 
-// GetBaseFromYongyiClassifyByParentId 根据上级id获取当下的分类列表数据
-func GetBaseFromYongyiClassifyByParentId(parentId int) (items []*BaseFromYongyiClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_yongyi_classify WHERE parent_id=? order by sort asc,classify_id asc`
-	_, err = o.Raw(sql, parentId).QueryRows(&items)
-	return
-}
-
 // GetAllBaseFromYongyiClassify 获取所有的分类列表数据
 func GetAllBaseFromYongyiClassify() (items []*BaseFromYongyiClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM base_from_yongyi_classify order by parent_id asc, sort asc,classify_id asc`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }
 
@@ -123,102 +75,14 @@ type BaseFromYongyiClassifySimplify struct {
 	ParentId     int
 }
 
-// GetFirstBaseFromYongyiClassify 获取当前分类下，且排序数相同 的排序第一条的数据
-func GetFirstBaseFromYongyiClassify() (item *BaseFromYongyiClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_yongyi_classify order by sort asc,classify_id asc limit 1`
-	err = o.Raw(sql).QueryRow(&item)
-	return
-}
-
-// UpdateBaseFromYongyiClassifySortByClassifyId 根据分类id更新排序
-func UpdateBaseFromYongyiClassifySortByClassifyId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` update base_from_yongyi_classify set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? `
-	if classifyId > 0 {
-		sql += ` or ( classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
-	}
-	_, err = o.Raw(sql, parentId, nowSort).Exec()
-	return
-}
-
-// MoveUpYongyiIndexClassifyBySort 往上移动
-func MoveUpYongyiIndexClassifyBySort(parentId, nextSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `update base_from_yongyi_classify set sort = sort + 1 where parent_id=? and sort >= ? and sort< ?`
-	_, err = o.Raw(sql, parentId, nextSort, currentSort).Exec()
-	return
-}
-
-// MoveDownYongyiIndexClassifyBySort 往下移动
-func MoveDownYongyiIndexClassifyBySort(parentId, prevSort, currentSort int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `update base_from_yongyi_classify set sort = sort - 1 where parent_id=? and sort <= ? and sort> ? `
-	_, err = o.Raw(sql, parentId, prevSort, currentSort).Exec()
-	return
-}
-
-// GetYongyiIndexClassifyMinSort 获取最小不等于0的排序
-func GetYongyiIndexClassifyMinSort(parentId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `select min(sort) from base_from_yongyi_classify where parent_id=? and sort <> 0 `
-	err = o.Raw(sql, parentId).QueryRow(&sort)
-	return
-}
-
 // Update 更新分类基础信息
 func (BaseFromYongyiClassify *BaseFromYongyiClassify) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(BaseFromYongyiClassify, cols...)
+	o := global.DmSQL["data"]
+	err = o.Select(cols).Updates(BaseFromYongyiClassify).Error
+
 	return
 }
 
 type AddYongyiClassifyResp struct {
 	ClassifyId int
 }
-
-// DeleteYongyiClassifyByClassifyId 根据分类id删除对应的指标分类
-func DeleteYongyiClassifyByClassifyId(classifyIdList []int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	num := len(classifyIdList)
-	if num <= 0 {
-		return
-	}
-	//删除分类
-	sql := `DELETE FROM base_from_yongyi_classify WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, classifyIdList).Exec()
-	return
-}
-
-// AddYongyiClassifyMulti 批量新增SMM类别
-func AddYongyiClassifyMulti(list []*BaseFromYongyiClassify) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(1, list)
-	return
-}
-
-// InitYongyiClassifySort 初始化sort值
-func InitYongyiClassifySort() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_yongyi_classify 
-SET modify_time=NOW(), sort = classify_id`
-	_, err = o.Raw(sql).Exec()
-	return
-}
-
-// InitYongyiIndexClassifyId 历史数据的classifyId值
-func InitYongyiIndexClassifyId() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_yongyiindex s
-LEFT JOIN (
-SELECT
-	c1.classify_id,
-	CONCAT( c2.classify_name, c1.classify_name ) AS type_name 
-FROM
-	base_from_yongyi_classify c1
-	LEFT JOIN base_from_yongyi_classify c2 ON c1.parent_id = c2.classify_id 
-	) AS t ON CONCAT( s.type_2, s.type_3 ) = t.type_name
-	SET s.classify_id = t.classify_id, s.modify_time=NOW() where s.type_2 <>""`
-	_, err = o.Raw(sql).Exec()
-	return
-}

models/data_manage/ccf_stock_classify.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -41,12 +41,8 @@ func (m *CCFStockClassify) PrimaryId() string {
 }
 
 func (m *CCFStockClassify) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.CcfStockClassifyId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -54,21 +50,21 @@ func (m *CCFStockClassify) CreateMulti(items []*CCFStockClassify) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *CCFStockClassify) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *CCFStockClassify) Del() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	_, err = o.Raw(sql, m.CcfStockClassifyId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.CcfStockClassifyId).Error
+
 	return
 }
 
@@ -76,39 +72,43 @@ func (m *CCFStockClassify) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	_, err = o.Raw(sql, menuIds).Exec()
+	err = o.Exec(sql, menuIds).Error
+
 	return
 }
 
 func (m *CCFStockClassify) GetItemById(id int) (item *CCFStockClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = o.Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *CCFStockClassify) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *CCFStockClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = o.Raw(sql, pars).First(&item).Error
+
 	return
 }
 
 func (m *CCFStockClassify) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func (m *CCFStockClassify) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*CCFStockClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -118,12 +118,13 @@ func (m *CCFStockClassify) GetItemsByCondition(condition string, pars []interfac
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 func (m *CCFStockClassify) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*CCFStockClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -133,7 +134,8 @@ func (m *CCFStockClassify) GetPageItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 

models/data_manage/ccf_stock_excel.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"html"
 	"regexp"
 	"strings"
@@ -52,12 +52,8 @@ func (m *CCFStockExcel) PrimaryId() string {
 }
 
 func (m *CCFStockExcel) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.CcfStockExcelId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -65,21 +61,23 @@ func (m *CCFStockExcel) CreateMulti(items []*CCFStockExcel) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *CCFStockExcel) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	o := global.DmSQL["data"]
+	err = o.Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *CCFStockExcel) Del() (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	_, err = o.Raw(sql, m.CcfStockExcelId).Exec()
+	err = o.Exec(sql, m.CcfStockExcelId).Error
+
 	return
 }
 
@@ -87,39 +85,42 @@ func (m *CCFStockExcel) MultiDel(menuIds []int) (err error) {
 	if len(menuIds) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s IN (%s)`, m.TableName(), m.PrimaryId(), utils.GetOrmInReplace(len(menuIds)))
-	_, err = o.Raw(sql, menuIds).Exec()
+	err = o.Exec(sql, menuIds).Error
+
 	return
 }
 
 func (m *CCFStockExcel) GetItemById(id int) (item *CCFStockExcel, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = o.Raw(sql, id).First(&item).Error
 	return
 }
 
 func (m *CCFStockExcel) GetItemByCondition(condition string, pars []interface{}, orderRule string) (item *CCFStockExcel, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	order := ``
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s %s LIMIT 1`, m.TableName(), condition, order)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = o.Raw(sql, pars).First(&item).Error
+
 	return
 }
 
 func (m *CCFStockExcel) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func (m *CCFStockExcel) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*CCFStockExcel, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -129,12 +130,13 @@ func (m *CCFStockExcel) GetItemsByCondition(condition string, pars []interface{}
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 func (m *CCFStockExcel) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*CCFStockExcel, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -144,7 +146,8 @@ func (m *CCFStockExcel) GetPageItemsByCondition(condition string, pars []interfa
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 

models/data_manage/chart_classify.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -26,12 +26,11 @@ type ChartClassify struct {
 }
 
 func AddChartClassify(item *ChartClassify) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	err = global.DmSQL["data"].Create(item).Error
 	if err != nil {
 		return
 	}
-	item.ChartClassifyId = int(lastId)
+	lastId = int64(item.ChartClassifyId)
 
 	return
 }
@@ -52,9 +51,10 @@ type AddChartClassifyReq struct {
 // @return count int
 // @return err error
 func GetChartClassifyCount(chartClassifyName string, parentId, source int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) AS count FROM chart_classify WHERE parent_id=? AND source = ? AND chart_classify_name=? `
-	err = o.Raw(sql, parentId, source, chartClassifyName).QueryRow(&count)
+	err = o.Raw(sql, parentId, source, chartClassifyName).Scan(&count).Error
+
 	return
 }
 
@@ -68,9 +68,10 @@ func GetChartClassifyCount(chartClassifyName string, parentId, source int) (coun
 // @return count int
 // @return err error
 func GetChartClassifyEnCount(chartClassifyNameEn string, parentId, source int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT COUNT(1) AS count FROM chart_classify WHERE parent_id=? AND source = ? AND chart_classify_name_en = ? `
-	err = o.Raw(sql, parentId, source, chartClassifyNameEn).QueryRow(&count)
+	err = o.Raw(sql, parentId, source, chartClassifyNameEn).Scan(&count).Error
+
 	return
 }
 
@@ -80,46 +81,17 @@ type EditChartClassifyReq struct {
 }
 
 func GetChartClassifyById(classifyId int) (item *ChartClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM chart_classify WHERE chart_classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = o.Raw(sql, classifyId).First(&item).Error
 	return
 }
 
 func GetChartClassifyCountById(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT count(1) AS count FROM chart_classify WHERE chart_classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
-	return
-}
-
-// EditChartClassify
-// @Description: 修改图表分类的名称
-// @author: Roc
-// @datetime 2024-04-16 18:12:51
-// @param classifyId int
-// @param source int
-// @param chartClassifyName string
-// @return err error
-func EditChartClassify(classifyId, source int, chartClassifyName string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE chart_classify SET chart_classify_name=?,modify_time=NOW() WHERE chart_classify_id=? AND source = ? `
-	_, err = o.Raw(sql, chartClassifyName, classifyId, source).Exec()
-	return
-}
+	err = o.Raw(sql, classifyId).Scan(&count).Error
 
-// EditChartClassifyEn
-// @Description: 修改图表分类的英文名称
-// @author: Roc
-// @datetime 2024-04-16 18:12:40
-// @param classifyId int
-// @param source int
-// @param chartClassifyNameEn string
-// @return err error
-func EditChartClassifyEn(classifyId, source int, chartClassifyNameEn string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE chart_classify SET chart_classify_name_en = ?,modify_time=NOW() WHERE chart_classify_id=? AND source = ? `
-	_, err = o.Raw(sql, chartClassifyNameEn, classifyId, source).Exec()
 	return
 }
 
@@ -129,7 +101,7 @@ type DeleteChartClassifyReq struct {
 }
 
 func GetChartInfoCountByClassifyId(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT COUNT(1) AS count FROM chart_info AS a
 				WHERE a.chart_classify_id IN(
 				SELECT t.chart_classify_id FROM 
@@ -142,12 +114,13 @@ func GetChartInfoCountByClassifyId(classifyId int) (count int, err error) {
 				UNION SELECT * FROM chart_classify WHERE chart_classify_id = @pid
 				)AS t
 				) `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
+	err = o.Raw(sql, classifyId).Scan(&count).Error
+
 	return
 }
 
 func DeleteChartClassify(classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` DELETE FROM chart_classify
 				WHERE chart_classify_id IN(
 				SELECT t.chart_classify_id FROM
@@ -160,25 +133,28 @@ func DeleteChartClassify(classifyId int) (err error) {
 				UNION SELECT * FROM chart_classify WHERE chart_classify_id = @pid
 				)AS t
 				) `
-	_, err = o.Raw(sql, classifyId).Exec()
+	err = o.Exec(sql, classifyId).Error
+
 	return
 }
 
 // GetChartClassifyByParentId
 // @param source int 1：ETA图库；2：商品价格曲线；3：相关性图表
 func GetChartClassifyByParentId(parentId, source int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_classify WHERE parent_id=? AND source = ? order by sort asc,chart_classify_id asc`
-	_, err = o.Raw(sql, parentId, source).QueryRows(&items)
+	err = o.Raw(sql, parentId, source).Scan(&items).Error
+
 	return
 }
 
 // GetChartClassifyAll
 // @param source int 1：ETA图库；2：商品价格曲线；3：相关性图表
 func GetChartClassifyAll(source int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_classify WHERE parent_id<>0 AND source = ? order by sort asc,chart_classify_id asc`
-	_, err = o.Raw(sql, source).QueryRows(&items)
+	err = o.Raw(sql, source).Scan(&items).Error
+
 	return
 }
 
@@ -233,7 +209,7 @@ type ChartClassifyDeleteCheckReq struct {
 }
 
 func GetChartClassifyCountByClassifyId(chartClassifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT COUNT(1) AS count FROM (
 			SELECT rd.*
 			FROM (SELECT * FROM chart_classify WHERE parent_id IS NOT NULL) rd,
@@ -243,17 +219,19 @@ func GetChartClassifyCountByClassifyId(chartClassifyId int) (count int, err erro
 			UNION SELECT * FROM chart_classify WHERE chart_classify_id = @pid
 			)AS t
 			WHERE t.chart_classify_id<>? `
-	err = o.Raw(sql, chartClassifyId, chartClassifyId).QueryRow(&count)
+	err = o.Raw(sql, chartClassifyId, chartClassifyId).Scan(&count).Error
+
 	return
 }
 
 func GetChartClassifyByCondition(condition string, pars []interface{}) (item *ChartClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_classify WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = o.Raw(sql, pars).First(&item).Error
+
 	return
 }
 
@@ -270,43 +248,47 @@ type MoveChartClassifyReq struct {
 
 // GetFirstChartClassifyByParentId 获取当前父级图表分类下的排序第一条的数据
 func GetFirstChartClassifyByParentId(parentId int) (item *ChartClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_classify WHERE parent_id=? order by sort asc,chart_classify_id asc limit 1`
-	err = o.Raw(sql, parentId).QueryRow(&item)
+	err = o.Raw(sql, parentId).First(&item).Error
+
 	return
 }
 
 // GetFirstChartClassifyByParentIdAndSource 获取当前父级图表分类下的排序第一条的数据
 func GetFirstChartClassifyByParentIdAndSource(parentId, source int) (item *ChartClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_classify WHERE parent_id=?  and source = ? order by sort asc,chart_classify_id asc limit 1`
-	err = o.Raw(sql, parentId, source).QueryRow(&item)
+	err = o.Raw(sql, parentId, source).First(&item).Error
+
 	return
 }
 
 // UpdateChartClassifySortByParentId 根据图表父类id更新排序
 func UpdateChartClassifySortByParentId(parentId, classifyId, nowSort int, updateSort string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` update chart_classify set sort = ` + updateSort + ` WHERE parent_id=? and sort > ? `
 	if classifyId > 0 {
 		sql += ` or ( chart_classify_id > ` + fmt.Sprint(classifyId) + ` and sort= ` + fmt.Sprint(nowSort) + `)`
 	}
-	_, err = o.Raw(sql, parentId, nowSort).Exec()
+	err = o.Exec(sql, parentId, nowSort).Error
+
 	return
 }
 
 // Update 更新图表分类基础信息
 func (chartClassify *ChartClassify) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(chartClassify, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(chartClassify).Error
+
 	return
 }
 
 // GetChartClassifyMaxSort 获取图表分类下最大的排序数
 func GetChartClassifyMaxSort(parentId, source int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT Max(sort) AS sort FROM chart_classify WHERE parent_id=? AND source = ? `
-	err = o.Raw(sql, parentId, source).QueryRow(&sort)
+	err = o.Raw(sql, parentId, source).Scan(&sort).Error
+
 	return
 }
 
@@ -317,51 +299,34 @@ type ChartClassifyView struct {
 }
 
 func GetChartClassifyViewById(classifyId int) (item *ChartClassifyView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM chart_classify WHERE chart_classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
-	return
-}
+	err = o.Raw(sql, classifyId).First(&item).Error
 
-func GetChartClassifyByParentIdFromETA(parentId int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM chart_classify WHERE parent_id=? AND source = 1 order by sort asc,chart_classify_id asc`
-	_, err = o.Raw(sql, parentId).QueryRows(&items)
-	return
-}
-
-func GetChartClassifyAllFromETA() (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM chart_classify WHERE parent_id<>0 AND source = 1 order by sort asc,chart_classify_id asc`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func GetChartClassifyTwo(source int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM chart_classify WHERE level=3 AND source = ? order by sort asc,chart_classify_id asc`
-	_, err = o.Raw(sql, source).QueryRows(&items)
 	return
 }
 
 func GetChartClassifyByLevel(level, source int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_classify WHERE level=? AND source = ? order by sort asc,chart_classify_id asc`
-	_, err = o.Raw(sql, level, source).QueryRows(&items)
+	err = o.Raw(sql, level, source).Scan(&items).Error
+
 	return
 }
 
 func EditChartClassifySysUser(classifyId, sysUserId int, chartClassifyName string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `UPDATE chart_classify SET sys_user_id=?,sys_user_real_name=?,modify_time=NOW() WHERE parent_id=?  AND level=3 `
-	_, err = o.Raw(sql, sysUserId, chartClassifyName, classifyId).Exec()
+	err = o.Exec(sql, sysUserId, chartClassifyName, classifyId).Error
+
 	return
 }
 
 func GetAllChartClassifyItemsBySource(source int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_classify WHERE source = ? order by sort ASC,chart_classify_id ASC`
-	_, err = o.Raw(sql, source).QueryRows(&items)
+	err = o.Raw(sql, source).Scan(&items).Error
+
 	return
 }
 
@@ -373,17 +338,19 @@ func GetAllChartClassifyItemsBySource(source int) (items []*ChartClassifyItems,
 // @return item *ChartClassify
 // @return err error
 func GetCrossVarietyChartClassifyBySysUserId(sysUserId int) (item *ChartClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM chart_classify WHERE source = ? AND sys_user_id=?`
-	err = o.Raw(sql, utils.CHART_SOURCE_CROSS_HEDGING, sysUserId).QueryRow(&item)
+	err = o.Raw(sql, utils.CHART_SOURCE_CROSS_HEDGING, sysUserId).First(&item).Error
+
 	return
 }
 
 // GetChartClassifyByParentIdAndName 根据父级ID和名称获取分类
 func GetChartClassifyByParentIdAndName(parentId int, classifyName string, classifyId int) (item *ChartClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM chart_classify WHERE parent_id = ? AND chart_classify_name = ? AND chart_classify_id <> ? LIMIT 1`
-	err = o.Raw(sql, parentId, classifyName, classifyId).QueryRow(&item)
+	err = o.Raw(sql, parentId, classifyName, classifyId).First(&item).Error
+
 	return
 }
 
@@ -399,9 +366,9 @@ func GetChartClassifyByIdList(classifyIdList []int) (items []*ChartClassify, err
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM chart_classify WHERE chart_classify_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, classifyIdList).QueryRows(&items)
+	err = o.Raw(sql, classifyIdList).Scan(&items).Error
 
 	return
 }
@@ -415,9 +382,10 @@ func GetChartClassifyByIdList(classifyIdList []int) (items []*ChartClassify, err
 // @return items []*ChartClassify
 // @return err error
 func GetChartClassifyBySourceAndIsJoinPermission(source, isJoinPermission int) (items []*ChartClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM chart_classify WHERE source = ? AND is_join_permission = ? `
-	_, err = o.Raw(sql, source, isJoinPermission).QueryRows(&items)
+	err = o.Raw(sql, source, isJoinPermission).Scan(&items).Error
+
 	return
 }
 
@@ -433,7 +401,7 @@ type ChartClassifyIdItems struct {
 }
 
 func GetChartClassifyByRootIdLevel(rootId, source int, orderStr string) (items []*ChartClassifyIdItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_classify WHERE root_id = ? AND source = ? `
 	if orderStr != "" {
 		sql += orderStr
@@ -441,25 +409,28 @@ func GetChartClassifyByRootIdLevel(rootId, source int, orderStr string) (items [
 		sql += ` order by level desc, sort asc, chart_classify_id asc`
 	}
 
-	_, err = o.Raw(sql, rootId, source).QueryRows(&items)
+	err = o.Raw(sql, rootId, source).Scan(&items).Error
+
 	return
 }
 
 // UpdateChartClassifySortByParentIdAndSource 根据图表父类id更新排序
 func UpdateChartClassifySortByParentIdAndSource(parentId, classifyId, nowSort int, updateSort string, source int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` update chart_classify set sort = ` + updateSort + ` WHERE parent_id=? and sort > ? AND source = ? `
 	if classifyId > 0 {
 		sql += ` or ( chart_classify_id > ` + fmt.Sprint(classifyId) + ` and sort= ` + fmt.Sprint(nowSort) + `)`
 	}
-	_, err = o.Raw(sql, parentId, nowSort, source).Exec()
+	err = o.Exec(sql, parentId, nowSort, source).Error
+
 	return
 }
 
 // GetChartClassifyAllBySource 根据来源获取所有分类
 func GetChartClassifyAllBySource(source int) (items []*ChartClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_classify WHERE source = ? ORDER BY parent_id ASC, sort ASC, chart_classify_id ASC`
-	_, err = o.Raw(sql, source).QueryRows(&items)
+	err = o.Raw(sql, source).Scan(&items).Error
+
 	return
 }

models/data_manage/chart_edb_mapping.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
@@ -38,13 +38,13 @@ type ChartEdbMapping struct {
 }
 
 func AddChartEdbMapping(items []*ChartEdbMapping) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(1, items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func GetChartEdbMappingList(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT a.*,b.source_name,b.source,b.sub_source,b.classify_id,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,
 b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type AS edb_info_category_type,b.edb_type,b.is_join_permission,
 a.is_convert, a.convert_type, a.convert_value, a.convert_unit, a.convert_en_unit 
@@ -52,39 +52,43 @@ a.is_convert, a.convert_type, a.convert_value, a.convert_unit, a.convert_en_unit
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			 WHERE chart_info_id=? 
              ORDER BY chart_edb_mapping_id ASC `
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&list)
+	err = o.Raw(sql, chartInfoId).Scan(&list).Error
+
 	return
 }
 
 func GetChartMappingList(chartInfoId int) (list []*ChartEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT a.*
              FROM chart_edb_mapping AS a
 			 WHERE chart_info_id=? 
              ORDER BY chart_edb_mapping_id ASC `
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&list)
+	err = o.Raw(sql, chartInfoId).Scan(&list).Error
+
 	return
 }
 
 func GetChartEdbMappingListByChartInfoIds(chartInfoIds string) (list []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT a.*,b.source_name,b.source,b.sub_source,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type AS edb_info_category_type,b.edb_type,b.classify_id,b.is_join_permission
              FROM chart_edb_mapping AS a
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			 WHERE chart_info_id in (` + chartInfoIds + `) 
              ORDER BY chart_edb_mapping_id ASC `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Scan(&list).Error
+
 	return
 }
 
 func GetChartEdbMappingListByEdbInfoId(edbInfoStr string) (list []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT edb_info_id,source_name,source,sub_source,edb_code,edb_name,edb_name_en,frequency,unit,unit_en,start_date,end_date,modify_time,latest_date,latest_value,unique_code,edb_info_type AS edb_info_category_type,max_value,min_value,edb_type,classify_id,is_join_permission
              FROM edb_info
 			 WHERE edb_info_id IN(` + edbInfoStr + `)
 			ORDER BY FIELD(edb_info_id,` + edbInfoStr + `)
               `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Scan(&list).Error
+
 	return
 }
 
@@ -94,13 +98,14 @@ func GetChartEdbMappingListByEdbInfoIdList(edbIdList []int) (list []*ChartEdbInf
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT edb_info_id,source_name,source,sub_source,edb_code,edb_name,edb_name_en,frequency,unit,unit_en,start_date,end_date,modify_time,latest_date,latest_value,unique_code,edb_info_type AS edb_info_category_type,max_value,min_value,edb_type,classify_id,is_join_permission
              FROM edb_info
 			 WHERE edb_info_id IN(` + utils.GetOrmInReplace(num) + `)
 			ORDER BY FIELD(edb_info_id,` + utils.GetOrmInReplace(num) + `)
               `
-	_, err = o.Raw(sql, edbIdList, edbIdList).QueryRows(&list)
+	err = o.Raw(sql, edbIdList, edbIdList).Scan(&list).Error
+
 	return
 }
 
@@ -110,13 +115,14 @@ func GetChartEdbMappingListByIdList(chartInfoIdList []int) (list []*ChartEdbInfo
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT a.*,b.source_name,b.source,b.sub_source,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type,b.edb_type AS edb_info_category_type,b.classify_id,b.is_join_permission
              FROM chart_edb_mapping AS a
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			 WHERE chart_info_id in (` + utils.GetOrmInReplace(num) + `) 
              ORDER BY chart_edb_mapping_id ASC `
-	_, err = o.Raw(sql, chartInfoIdList).QueryRows(&list)
+	err = o.Raw(sql, chartInfoIdList).Scan(&list).Error
+
 	return
 }
 
@@ -127,7 +133,7 @@ type RelationEdbInfoListResp struct {
 }
 
 func GetRelationEdbInfoListByCondition(condition string, pars []interface{}, startSize, pageSize int) (item []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT a.* FROM edb_info AS a 
 	JOIN edb_info_calculate_mapping AS b on a.edb_info_id = b.edb_info_id WHERE 1=1 `
 	if condition != "" {
@@ -135,24 +141,26 @@ func GetRelationEdbInfoListByCondition(condition string, pars []interface{}, sta
 	}
 	//sql += " ORDER BY sort ASC,chart_info_id DESC LIMIT ?,? "
 	sql += " ORDER BY a.create_time DESC LIMIT ?,? "
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&item)
+	err = o.Raw(sql, pars, startSize, pageSize).Scan(&item).Error
+
 	return
 }
 
 func GetRelationEdbInfoListCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT COUNT(1) AS count FROM edb_info AS a 
 	JOIN edb_info_calculate_mapping AS b on a.edb_info_id = b.edb_info_id WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 // GetEtaEdbChartEdbMapping       商品曲线图查询对应的普通指标
 func GetEtaEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
 
 	sql := ` SELECT ` + aField + `,b.source_name,b.source,b.sub_source,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type AS edb_info_category_type,b.classify_id,b.is_join_permission
@@ -160,13 +168,14 @@ func GetEtaEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err e
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
-	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).QueryRow(&item)
+	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).Scan(&item).Error
+
 	return
 }
 
 // GetEtaEdbChartEdbMappingList       商品曲线图查询对应的普通指标
 func GetEtaEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
 
 	sql := ` SELECT ` + aField + `,b.source_name,b.source,b.sub_source,b.edb_code,b.edb_name,b.edb_name_en,b.frequency,b.unit,b.unit_en,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value,b.unique_code,b.edb_info_type AS edb_info_category_type,b.classify_id,b.is_join_permission
@@ -174,72 +183,79 @@ func GetEtaEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
-	_, err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).QueryRows(&items)
+	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).Scan(&items).Error
+
 	return
 }
 
 // GetFutureGoodEdbChartEdbMapping       商品曲线图查询对应的商品指标
 func GetFutureGoodEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
 	sql := ` SELECT ` + aField + `,b.future_good_edb_info_id,b.future_good_edb_code as edb_code,b.future_good_edb_name as edb_name,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value
              FROM chart_edb_mapping AS a
 			 INNER JOIN future_good_edb_info AS b ON a.edb_info_id=b.future_good_edb_info_id
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
-	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).QueryRow(&item)
+	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).Scan(&item).Error
+
 	return
 }
 
 // GetFutureGoodEdbChartEdbMappingList       商品曲线图查询对应的商品指标
 func GetFutureGoodEdbChartEdbMappingList(chartInfoId int) (items []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	aField := `a.chart_edb_mapping_id,a.chart_info_id,a.edb_info_id,a.create_time,a.modify_time,a.unique_code,a.max_data,a.min_data,a.is_order,a.is_axis,a.edb_info_type,a.lead_value,a.lead_unit,a.chart_style,a.chart_color,a.predict_chart_color,a.chart_width,a.source as mapping_source`
 	sql := ` SELECT ` + aField + `,b.future_good_edb_info_id,b.future_good_edb_code as edb_code,b.future_good_edb_name as edb_name,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value
              FROM chart_edb_mapping AS a
 			 INNER JOIN future_good_edb_info AS b ON a.edb_info_id=b.future_good_edb_info_id
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
-	_, err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).QueryRows(&items)
+	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_FUTURE_GOOD).Scan(&items).Error
+
 	return
 }
 
 // GetChartEdbMappingListV2 根据图表id获取指标信息,不连表查询指标表
 func GetChartEdbMappingListV2(chartInfoId int) (list []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT a.* FROM chart_edb_mapping AS a
 			 WHERE chart_info_id=? 
              ORDER BY chart_edb_mapping_id ASC `
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&list)
+	err = o.Raw(sql, chartInfoId).Scan(&list).Error
+
 	return
 }
 
 // GetChartEdbMappingByEdbInfoId 根据指标id获取edb_mapping
 func GetChartEdbMappingByEdbInfoId(edbInfoId int) (item *ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT edb_info_id,source_name,classify_id,source,sub_source,edb_code,edb_name,edb_name_en,frequency,unit,unit_en,start_date,end_date,modify_time,latest_date,latest_value,unique_code,edb_info_type AS edb_info_category_type,edb_type,max_value,min_value,is_join_permission
              FROM edb_info
 			 WHERE edb_info_id = ? limit 1`
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = o.Raw(sql, edbInfoId).Scan(&item).Error
+
 	return
 }
 
 // GetEdbMappingListByEdbInfoId 根据指标id获取edb_mapping
 func GetEdbMappingListByEdbInfoId(edbInfoId int) (item []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM chart_edb_mapping
 			 WHERE edb_info_id = ? `
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&item)
+	err = o.Raw(sql, edbInfoId).Scan(&item).Error
+
 	return
 }
 
 // GetChartEdbMappingByFutureGoodEdbInfoId 根据指标id获取edb_mapping
 func GetChartEdbMappingByFutureGoodEdbInfoId(edbInfoId int) (item *ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT future_good_edb_info_id as edb_info_id,future_good_edb_code as edb_code,b.future_good_edb_name as edb_name,b.start_date,b.end_date,b.modify_time,b.latest_date,b.latest_value,b.region_type
              FROM future_good_edb_info b
 			 WHERE future_good_edb_info_id = ?  limit 1 `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = o.Raw(sql, edbInfoId).Scan(&item).Error
+
 	return
 }
 
@@ -251,10 +267,7 @@ func GetChartEdbMappingByFutureGoodEdbInfoId(edbInfoId int) (item *ChartEdbInfoM
 // @param edbInfoList []*EdbInfo
 // @return err error
 func ModifyChartEdbMapping(chartInfoId int, edbInfoList []*EdbInfo) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	o := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			fmt.Println("AddCalculateHcz,Err:" + err.Error())
@@ -268,8 +281,7 @@ func ModifyChartEdbMapping(chartInfoId int, edbInfoList []*EdbInfo) (err error)
              FROM chart_edb_mapping AS a
 			 WHERE chart_info_id=? 
              ORDER BY chart_edb_mapping_id ASC `
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&list)
-
+	err = o.Raw(sql, chartInfoId).Scan(&list).Error
 	if err != nil {
 		return
 	}
@@ -314,7 +326,7 @@ func ModifyChartEdbMapping(chartInfoId int, edbInfoList []*EdbInfo) (err error)
 
 	// 需要添加的话，那就添加吧
 	if len(addList) > 0 {
-		_, err = o.InsertMulti(len(addList), addList)
+		err = o.CreateInBatches(addList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -331,7 +343,7 @@ func ModifyChartEdbMapping(chartInfoId int, edbInfoList []*EdbInfo) (err error)
 		//如果拼接指标变更了，那么需要删除所有的指标数据
 		sql := fmt.Sprintf(` DELETE FROM chart_edb_mapping WHERE chart_edb_mapping_id in (%s) `, removeIdStr)
 
-		_, err = o.Raw(sql).Exec()
+		err = o.Exec(sql).Error
 		if err != nil {
 			err = fmt.Errorf("移除不必要的mapping失败,Err:" + err.Error())
 			return
@@ -342,12 +354,13 @@ func ModifyChartEdbMapping(chartInfoId int, edbInfoList []*EdbInfo) (err error)
 }
 
 func GetRelationEdbInfoListMappingByCondition(condition string, pars []interface{}) (item []*ChartEdbInfoMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT a.* FROM edb_info AS a 
 	JOIN edb_info_calculate_mapping AS b on a.edb_info_id = b.edb_info_id WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&item)
+	err = o.Raw(sql, pars).Scan(&item).Error
+
 	return
 }

models/data_manage/chart_framework.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -61,12 +61,8 @@ var ChartFrameworkColumns = struct {
 }
 
 func (m *ChartFramework) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.ChartFrameworkId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -74,47 +70,48 @@ func (m *ChartFramework) CreateMulti(items []*ChartFramework) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *ChartFramework) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	o := global.DmSQL["data"]
+	err = o.Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *ChartFramework) Del() (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	_, err = o.Raw(sql, m.ChartFrameworkId).Exec()
+	err = global.DmSQL["data"].Exec(sql, m.ChartFrameworkId).Error
+
 	return
 }
 
 func (m *ChartFramework) GetItemById(id int) (item *ChartFramework, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *ChartFramework) GetItemByCondition(condition string, pars []interface{}) (item *ChartFramework, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+
 	return
 }
 
 func (m *ChartFramework) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func (m *ChartFramework) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*ChartFramework, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -124,12 +121,13 @@ func (m *ChartFramework) GetItemsByCondition(condition string, pars []interface{
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 func (m *ChartFramework) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*ChartFramework, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -139,17 +137,13 @@ func (m *ChartFramework) GetPageItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 func (m *ChartFramework) CreateFrameworkAndNodes(item *ChartFramework, nodes []*ChartFrameworkNode) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %s", e.Error())
-		return
-	}
+	tx := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -158,19 +152,17 @@ func (m *ChartFramework) CreateFrameworkAndNodes(item *ChartFramework, nodes []*
 		_ = tx.Commit()
 	}()
 
-	id, e := tx.Insert(item)
+	e := tx.Create(item).Error
 	if e != nil {
 		err = fmt.Errorf("insert framework err: %s", e.Error())
 		return
 	}
-	newId := int(id)
-	item.ChartFrameworkId = newId
 
 	if len(nodes) > 0 {
 		for _, n := range nodes {
-			n.ChartFrameworkId = newId
+			n.ChartFrameworkId = item.ChartFrameworkId
 		}
-		_, e = tx.InsertMulti(len(nodes), nodes)
+		e = tx.CreateInBatches(nodes, utils.MultiAddNum).Error
 		if e != nil {
 			err = fmt.Errorf("insert multi nodes err: %s", e.Error())
 			return
@@ -180,12 +172,7 @@ func (m *ChartFramework) CreateFrameworkAndNodes(item *ChartFramework, nodes []*
 }
 
 func (m *ChartFramework) EditFrameworkAndNodes(item *ChartFramework, updateCols []string, nodes []*ChartFrameworkNode) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %s", e.Error())
-		return
-	}
+	tx := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -194,20 +181,20 @@ func (m *ChartFramework) EditFrameworkAndNodes(item *ChartFramework, updateCols
 		_ = tx.Commit()
 	}()
 
-	_, e = tx.Update(item, updateCols...)
+	e := tx.Select(updateCols).Updates(item).Error
 	if e != nil {
 		err = fmt.Errorf("framework update err: %s", e.Error())
 		return
 	}
 
 	sql := `DELETE FROM chart_framework_node WHERE chart_framework_id = ?`
-	_, e = tx.Raw(sql, item.ChartFrameworkId).Exec()
+	e = tx.Exec(sql, item.ChartFrameworkId).Error
 	if e != nil {
 		err = fmt.Errorf("clear nodes err: %s", e.Error())
 		return
 	}
 	if len(nodes) > 0 {
-		_, e = tx.InsertMulti(len(nodes), nodes)
+		e = tx.CreateInBatches(nodes, utils.MultiAddNum).Error
 		if e != nil {
 			err = fmt.Errorf("insert multi nodes err: %s", e.Error())
 			return
@@ -217,12 +204,7 @@ func (m *ChartFramework) EditFrameworkAndNodes(item *ChartFramework, updateCols
 }
 
 func (m *ChartFramework) RemoveFrameworkAndNodes(frameworkId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %s", e.Error())
-		return
-	}
+	tx := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -232,14 +214,14 @@ func (m *ChartFramework) RemoveFrameworkAndNodes(frameworkId int) (err error) {
 	}()
 
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	_, e = tx.Raw(sql, frameworkId).Exec()
+	e := tx.Exec(sql, frameworkId).Error
 	if e != nil {
 		err = fmt.Errorf("delete framework err: %s", e.Error())
 		return
 	}
 
 	sql = `DELETE FROM chart_framework_node WHERE chart_framework_id = ?`
-	_, e = tx.Raw(sql, frameworkId).Exec()
+	e = tx.Exec(sql, frameworkId).Error
 	if e != nil {
 		err = fmt.Errorf("clear nodes err: %s", e.Error())
 		return
@@ -294,20 +276,22 @@ type ChartFrameworkMoveReq struct {
 
 // UpdateChartFrameworkSort 更新我的图库框架排序
 func UpdateChartFrameworkSort(adminId, frameworkId, current int, updates string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`UPDATE chart_framework SET sort = %s WHERE admin_id = ? and sort > ?`, updates)
 	if frameworkId > 0 {
 		sql += ` OR (chart_framework_id > ` + fmt.Sprint(frameworkId) + ` AND sort = ` + fmt.Sprint(current) + `)`
 	}
-	_, err = o.Raw(sql, adminId, current).Exec()
+	err = o.Exec(sql, adminId, current).Error
+
 	return
 }
 
 // GetFirstChartFramework 获取我的图库框架排首位的数据
 func GetFirstChartFramework(adminId int) (item *ChartFramework, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM chart_framework WHERE admin_id = ? ORDER BY sort ASC,chart_framework_id ASC LIMIT 1`
-	err = o.Raw(sql, adminId).QueryRow(&item)
+	err = o.Raw(sql, adminId).First(&item).Error
+
 	return
 }
 

models/data_manage/chart_framework_node.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -28,12 +28,8 @@ func (m *ChartFrameworkNode) PrimaryId() string {
 }
 
 func (m *ChartFrameworkNode) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.ChartFrameworkNodeId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
@@ -41,47 +37,52 @@ func (m *ChartFrameworkNode) CreateMulti(items []*ChartFrameworkNode) (err error
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(len(items), items)
+	err = global.DmSQL["data"].CreateInBatches(items, utils.MultiAddNum).Error
+
 	return
 }
 
 func (m *ChartFrameworkNode) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	o := global.DmSQL["data"]
+	err = o.Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *ChartFrameworkNode) Del() (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	_, err = o.Raw(sql, m.ChartFrameworkNodeId).Exec()
+	err = o.Exec(sql, m.ChartFrameworkNodeId).Error
+
 	return
 }
 
 func (m *ChartFrameworkNode) GetItemById(id int) (item *ChartFrameworkNode, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = o.Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func (m *ChartFrameworkNode) GetItemByCondition(condition string, pars []interface{}) (item *ChartFrameworkNode, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = o.Raw(sql, pars).First(&item).Error
+
 	return
 }
 
 func (m *ChartFrameworkNode) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 func (m *ChartFrameworkNode) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*ChartFrameworkNode, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -91,12 +92,13 @@ func (m *ChartFrameworkNode) GetItemsByCondition(condition string, pars []interf
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 func (m *ChartFrameworkNode) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*ChartFrameworkNode, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -106,7 +108,8 @@ func (m *ChartFrameworkNode) GetPageItemsByCondition(condition string, pars []in
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s LIMIT ?,?`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 

models/data_manage/chart_info_correlation.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 	"time"
 )
@@ -47,44 +48,44 @@ func (m *ChartInfoCorrelation) TableName() string {
 }
 
 func (m *ChartInfoCorrelation) Create() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Insert(m)
-	if err != nil {
-		return
-	}
-	//m.CorrelationChartInfoId = int(id)
+	err = global.DmSQL["data"].Create(m).Error
+
 	return
 }
 
 func (m *ChartInfoCorrelation) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	o := global.DmSQL["data"]
+	err = o.Select(cols).Updates(m).Error
+
 	return
 }
 
 func (m *ChartInfoCorrelation) Delete() (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE correlation_chart_info_id = ? LIMIT 1`, m.TableName())
-	_, err = o.Raw(sql, m.CorrelationChartInfoId).Exec()
+	err = o.Exec(sql, m.CorrelationChartInfoId).Error
+
 	return
 }
 
 func (m *ChartInfoCorrelation) GetItemById(id int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE correlation_chart_info_id = ? LIMIT 1`, m.TableName())
-	err = o.Raw(sql, id).QueryRow(&m)
+	err = o.Raw(sql, id).First(&m).Error
+
 	return
 }
 
 func (m *ChartInfoCorrelation) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&m)
+	err = o.Raw(sql, pars).First(&m).Error
+
 	return
 }
 
 func (m *ChartInfoCorrelation) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*ChartInfoCorrelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
 		fields = `*`
@@ -94,14 +95,14 @@ func (m *ChartInfoCorrelation) GetItemsByCondition(condition string, pars []inte
 		order = ` ORDER BY ` + orderRule
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = o.Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 // CreateCorrelationChartAndEdb 新增相关性图表
 func CreateCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingList []*ChartEdbMapping, correlationInfo *ChartInfoCorrelation) (chartInfoId int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	tx, err := o.Begin()
+	tx := global.DmSQL["data"].Begin()
 	if err != nil {
 		return
 	}
@@ -114,25 +115,25 @@ func CreateCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingList []*ChartE
 	}()
 
 	// 新增图表信息
-	newId, err := tx.Insert(chartInfo)
+	err = tx.Create(chartInfo).Error
 	if err != nil {
 		return
 	}
 	// 指标mapping
-	chartInfo.ChartInfoId = int(newId)
-	chartInfoId = int(newId)
+	chartInfoId = chartInfo.ChartInfoId
 	if len(edbMappingList) > 0 {
 		for i := range edbMappingList {
 			edbMappingList[i].ChartInfoId = chartInfoId
 		}
-		_, err = tx.InsertMulti(len(edbMappingList), edbMappingList)
+		err = tx.CreateInBatches(edbMappingList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
 	}
 	// 相关性信息
 	correlationInfo.CorrelationChartInfoId = chartInfoId
-	if _, err = tx.Insert(correlationInfo); err != nil {
+	err = tx.Create(correlationInfo).Error
+	if err != nil {
 		return
 	}
 	return
@@ -170,12 +171,7 @@ type CorrelationChartInfoExtraConfig struct {
 // CreateMultiFactorCorrelationChartAndEdb 新增多因子相关性图表
 func CreateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingList []*ChartEdbMapping, correlationInfo *ChartInfoCorrelation, chartMappings []*FactorEdbSeriesChartMapping, saveAs bool, copySeries []*FactorEdbSeries, copySeriesEdb []*FactorEdbSeriesMapping, copySeriesData []*FactorEdbSeriesCalculateData) (chartInfoId int, seriesIdMap map[int]int, err error) {
 	seriesIdMap = make(map[int]int) // 此处做一个原ID与新ID的映射, 另存为才用的到
-	o := orm.NewOrmUsingDB("data")
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %v", e)
-		return
-	}
+	tx := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -185,12 +181,11 @@ func CreateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 	}()
 
 	// 新增图表信息
-	chartId, e := tx.Insert(chartInfo)
+	e := tx.Create(chartInfo).Error
 	if e != nil {
 		err = fmt.Errorf("chart insert err: %v", e)
 		return
 	}
-	chartInfo.ChartInfoId = int(chartId)
 	chartInfoId = chartInfo.ChartInfoId
 
 	// 指标mapping
@@ -198,7 +193,7 @@ func CreateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 		for i := range edbMappingList {
 			edbMappingList[i].ChartInfoId = chartInfoId
 		}
-		_, e = tx.InsertMulti(200, edbMappingList)
+		e = tx.CreateInBatches(edbMappingList, utils.MultiAddNum).Error
 		if e != nil {
 			err = fmt.Errorf("edb mappings insert err: %v", e)
 			return
@@ -207,7 +202,7 @@ func CreateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 
 	// 相关性信息
 	correlationInfo.CorrelationChartInfoId = chartInfoId
-	if _, e = tx.Insert(correlationInfo); e != nil {
+	if e = tx.Create(correlationInfo).Error; e != nil {
 		err = fmt.Errorf("correlate chart insert err: %v", e)
 		return
 	}
@@ -221,7 +216,7 @@ func CreateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 				v.ChartInfoId = chartInfoId
 				//v.FactorEdbSeriesId = seriesIdMap[v.FactorEdbSeriesId]
 			}
-			_, e = tx.InsertMulti(200, chartMappings)
+			e = tx.CreateInBatches(chartMappings, utils.MultiAddNum).Error
 			if e != nil {
 				err = fmt.Errorf("insert series chart mappings err: %v", e)
 				return
@@ -255,18 +250,18 @@ func CreateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 		id := v.FactorEdbSeriesId
 		originSeriesIds = append(originSeriesIds, id)
 		v.FactorEdbSeriesId = 0
-		newId, e := tx.Insert(v)
+		e = tx.Create(v).Error
 		if e != nil {
 			err = fmt.Errorf("copy series err: %v", e)
 			return
 		}
-		seriesIdMap[id] = int(newId)
+		seriesIdMap[id] = v.FactorEdbSeriesId
 	}
 	for _, v := range copySeriesEdb {
 		v.FactorEdbSeriesMappingId = 0
 		v.FactorEdbSeriesId = seriesIdMap[v.FactorEdbSeriesId]
 	}
-	_, e = tx.InsertMulti(200, copySeriesEdb)
+	e = tx.CreateInBatches(copySeriesEdb, utils.MultiAddNum).Error
 	if e != nil {
 		err = fmt.Errorf("copy series edb mappings err: %v", e)
 		return
@@ -277,7 +272,7 @@ func CreateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 			v.ChartInfoId = chartInfoId
 			v.FactorEdbSeriesId = seriesIdMap[v.FactorEdbSeriesId]
 		}
-		_, e = tx.InsertMulti(200, chartMappings)
+		e = tx.CreateInBatches(chartMappings, utils.MultiAddNum).Error
 		if e != nil {
 			err = fmt.Errorf("copy series chart mappings err: %v", e)
 			return
@@ -293,7 +288,7 @@ func CreateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 			t.FactorEdbSeriesId = seriesIdMap[t.FactorEdbSeriesId]
 			newCalculateData = append(newCalculateData, t)
 		}
-		_, e = tx.InsertMulti(200, newCalculateData)
+		e = tx.CreateInBatches(newCalculateData, utils.MultiAddNum).Error
 		if e != nil {
 			err = fmt.Errorf("copy series calculate data err: %v", e)
 			return
@@ -304,12 +299,7 @@ func CreateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 
 // UpdateMultiFactorCorrelationChartAndEdb 编辑多因子相关性图表
 func UpdateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingList []*ChartEdbMapping, correlationInfo *ChartInfoCorrelation, chartMappings []*FactorEdbSeriesChartMapping, chartUpdateCols, correlateUpdateCols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	tx, e := o.Begin()
-	if e != nil {
-		err = fmt.Errorf("orm begin err: %v", e)
-		return
-	}
+	tx := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -319,7 +309,7 @@ func UpdateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 	}()
 
 	// 更新图表信息
-	_, e = tx.Update(chartInfo, chartUpdateCols...)
+	e := tx.Select(chartUpdateCols).Updates(chartInfo).Error
 	if e != nil {
 		err = fmt.Errorf("chart update err: %v", e)
 		return
@@ -327,7 +317,7 @@ func UpdateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 
 	// 指标mapping
 	sql := `DELETE FROM chart_edb_mapping WHERE chart_info_id = ?`
-	_, e = tx.Raw(sql, chartInfo.ChartInfoId).Exec()
+	e = tx.Exec(sql, chartInfo.ChartInfoId).Error
 	if e != nil {
 		err = fmt.Errorf("clear chart edb mapping err: %v", e)
 		return
@@ -336,7 +326,7 @@ func UpdateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 		for i := range edbMappingList {
 			edbMappingList[i].ChartInfoId = chartInfo.ChartInfoId
 		}
-		_, e = tx.InsertMulti(200, edbMappingList)
+		e = tx.CreateInBatches(edbMappingList, utils.MultiAddNum).Error
 		if e != nil {
 			err = fmt.Errorf("edb mappings insert err: %v", e)
 			return
@@ -344,7 +334,7 @@ func UpdateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 	}
 
 	// 相关性信息
-	_, e = tx.Update(correlationInfo, correlateUpdateCols...)
+	e = tx.Select(correlateUpdateCols).Updates(correlationInfo).Error
 	if e != nil {
 		err = fmt.Errorf("correlate chart update err: %v", e)
 		return
@@ -354,7 +344,7 @@ func UpdateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 	chartMappingOb := new(FactorEdbSeriesChartMapping)
 	//if len(existsChartMappingIds) > 0 {
 	sql = fmt.Sprintf(`DELETE FROM %s WHERE %s = ?`, chartMappingOb.TableName(), chartMappingOb.Cols().ChartInfoId)
-	_, e = tx.Raw(sql, chartInfo.ChartInfoId).Exec()
+	e = tx.Exec(sql, chartInfo.ChartInfoId).Error
 	if e != nil {
 		err = fmt.Errorf("clear chart mapping err: %v", e)
 		return
@@ -363,7 +353,7 @@ func UpdateMultiFactorCorrelationChartAndEdb(chartInfo *ChartInfo, edbMappingLis
 
 	// 指标系列-图表关联
 	if len(chartMappings) > 0 {
-		_, e = tx.InsertMulti(200, chartMappings)
+		e = tx.CreateInBatches(chartMappings, utils.MultiAddNum).Error
 		if e != nil {
 			err = fmt.Errorf("insert series chart mappings err: %v", e)
 			return

models/data_manage/chart_info_log.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
@@ -20,7 +20,11 @@ type ChartInfoLog struct {
 }
 
 func AddChartInfoLog(item *ChartInfoLog) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	err = global.DmSQL["data"].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.ChartInfoLogId)
+
 	return
 }

models/data_manage/chart_info_range_analysis.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"strings"
 	"time"
@@ -103,11 +103,7 @@ type ChartRangeAnalysisDateDataItem struct {
 
 // CreateRangeChartAndEdb 新增区间计算图表
 func CreateRangeChartAndEdb(chartInfo *ChartInfo, edbMappingList []*ChartEdbMapping) (chartInfoId int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	tx, err := o.Begin()
-	if err != nil {
-		return
-	}
+	tx := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = tx.Rollback()
@@ -117,18 +113,17 @@ func CreateRangeChartAndEdb(chartInfo *ChartInfo, edbMappingList []*ChartEdbMapp
 	}()
 
 	// 新增图表信息
-	newId, err := tx.Insert(chartInfo)
+	err = tx.Create(chartInfo).Error
 	if err != nil {
 		return
 	}
 	// 指标mapping
-	chartInfo.ChartInfoId = int(newId)
-	chartInfoId = int(newId)
+	chartInfoId = chartInfo.ChartInfoId
 	if len(edbMappingList) > 0 {
 		for i := range edbMappingList {
 			edbMappingList[i].ChartInfoId = chartInfoId
 		}
-		_, err = tx.InsertMulti(len(edbMappingList), edbMappingList)
+		err = tx.CreateInBatches(edbMappingList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -138,11 +133,7 @@ func CreateRangeChartAndEdb(chartInfo *ChartInfo, edbMappingList []*ChartEdbMapp
 
 // EditRangeChartInfoAndMapping 修改区间计算图表的 图表与指标 的关系
 func EditRangeChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr, lang string, calendar string, dateType, disabled int, barChartConf string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -233,7 +224,7 @@ func EditRangeChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr, lang stri
 	sql += `WHERE chart_info_id = ?`
 
 	pars = append(pars, req.ChartInfoId)
-	_, err = to.Raw(sql, pars).Exec()
+	err = to.Exec(sql, pars).Error
 	if err != nil {
 		fmt.Println("UPDATE  chart_info Err:", err.Error())
 		return err
@@ -243,7 +234,7 @@ func EditRangeChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr, lang stri
 		// 查询该指标是否存在,如果存在的话,那么就去修改,否则新增
 		var tmpChartEdbMapping *ChartEdbMapping
 		csql := `SELECT *  FROM chart_edb_mapping WHERE chart_info_id=? AND edb_info_id=? AND source = ? `
-		err = to.Raw(csql, req.ChartInfoId, v.EdbInfoId, utils.CHART_SOURCE_RANGE_ANALYSIS).QueryRow(&tmpChartEdbMapping)
+		err = to.Raw(csql, req.ChartInfoId, v.EdbInfoId, utils.CHART_SOURCE_RANGE_ANALYSIS).Scan(&tmpChartEdbMapping).Error
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			fmt.Println("QueryRow Err:", err.Error())
 			return err
@@ -263,7 +254,7 @@ func EditRangeChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr, lang stri
 			//tmpChartEdbMapping.ChartColor = v.ChartColor
 			//tmpChartEdbMapping.PredictChartColor = v.PredictChartColor
 			//tmpChartEdbMapping.ChartWidth = v.ChartWidth
-			_, err = to.Update(tmpChartEdbMapping, "ModifyTime", "IsAxis", "EdbAliasName")
+			err = to.Select("ModifyTime", "IsAxis", "EdbAliasName").Updates(tmpChartEdbMapping).Error
 			if err != nil {
 				fmt.Println("chart_edb_mapping Err:" + err.Error())
 				return err
@@ -289,19 +280,18 @@ func EditRangeChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr, lang stri
 			//mapItem.PredictChartColor = v.PredictChartColor
 			//mapItem.ChartWidth = v.ChartWidth
 			mapItem.Source = utils.CHART_SOURCE_RANGE_ANALYSIS
-			tmpId, err := to.Insert(mapItem)
+			err = to.Create(mapItem).Error
 			if err != nil {
 				fmt.Println("AddChartEdbMapping Err:" + err.Error())
 				return err
 			}
-			mapItem.ChartEdbMappingId = int(tmpId)
 			chartEdbMappingIdList = append(chartEdbMappingIdList, strconv.Itoa(mapItem.ChartEdbMappingId))
 		}
 	}
 	if len(chartEdbMappingIdList) > 0 {
 		chartEdbMappingIdStr := strings.Join(chartEdbMappingIdList, ",")
 		dsql := `DELETE FROM chart_edb_mapping WHERE chart_info_id=? AND chart_edb_mapping_id NOT IN(` + chartEdbMappingIdStr + `)`
-		_, err = to.Raw(dsql, req.ChartInfoId).Exec()
+		err = to.Exec(dsql, req.ChartInfoId).Error
 		if err != nil {
 			fmt.Println("delete err:" + err.Error())
 			return err
@@ -313,11 +303,7 @@ func EditRangeChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr, lang stri
 
 // EditRangeChartInfo 修改区间计算图表基本信息
 func EditRangeChartInfo(req *SaveChartRangeReq) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -368,7 +354,7 @@ func EditRangeChartInfo(req *SaveChartRangeReq) (err error) {
 	sql += `WHERE chart_info_id = ?`
 
 	pars = append(pars, req.ChartInfoId)
-	_, err = to.Raw(sql, pars).Exec()
+	err = to.Exec(sql, pars).Error
 	if err != nil {
 		fmt.Println("UPDATE  chart_info Err:", err.Error())
 		return err

models/data_manage/chart_series.go

@@ -2,9 +2,9 @@ package data_manage
 
 import (
 	"encoding/json"
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -31,19 +31,15 @@ func (c *ChartSeries) TableName() string {
 }
 
 func GetChartSeriesByChartInfoId(chartInfoId int) (items []*ChartSeries, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT * FROM chart_series WHERE chart_info_id = ?"
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, chartInfoId).Scan(&items).Error
+
 	return
 }
 
 // EditChartSeriesAndEdbMapping
 func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -72,7 +68,7 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 	}
 
 	// 删除所有的指标映射
-	_, err = o.Raw("DELETE FROM chart_series_edb_mapping WHERE chart_info_id = ?", chartInfoId).Exec()
+	err = to.Exec("DELETE FROM chart_series_edb_mapping WHERE chart_info_id = ?", chartInfoId).Error
 	if err != nil {
 		return
 	}
@@ -102,16 +98,16 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 			}
 			//新增
 			tmp.CreateTime = time.Now()
-			seriesIdTmp, e := to.Insert(tmp)
+			e := to.Create(tmp).Error
 			if e != nil {
 				err = fmt.Errorf("AddChartSeries Err:" + e.Error())
 				return
 			}
-			seriesId = int(seriesIdTmp)
+			seriesId = tmp.ChartSeriesId
 		} else {
 			//编辑
 			delete(seriesDeleteMap, v.ChartSeriesId)
-			_, e := to.Update(tmp)
+			e := to.Updates(tmp).Error
 			if e != nil {
 				err = fmt.Errorf("UpdateChartSeries Err:" + e.Error())
 				return
@@ -141,7 +137,7 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 			addSeriesEdbList = append(addSeriesEdbList, edbTmp)
 		}
 		if len(addSeriesEdbList) > 0 {
-			_, err = to.InsertMulti(len(addSeriesEdbList), addSeriesEdbList)
+			err = to.CreateInBatches(addSeriesEdbList, utils.MultiAddNum).Error
 			if err != nil {
 				err = fmt.Errorf("AddChartSeries Err:" + err.Error())
 				return
@@ -155,13 +151,13 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 	}
 	if len(seriesIds) > 0 {
 		sql := `DELETE FROM chart_series WHERE chart_series_id IN (` + utils.GetOrmInReplace(len(seriesIds)) + `) and chart_info_id=?`
-		_, err = to.Raw(sql, seriesIds, chartInfoId).Exec()
+		err = to.Exec(sql, seriesIds, chartInfoId).Error
 		if err != nil {
 			err = fmt.Errorf("删除系列失败 Err:" + err.Error())
 			return
 		}
 		sql = `DELETE FROM chart_series_edb_mapping WHERE chart_series_id IN (` + utils.GetOrmInReplace(len(seriesIds)) + `) and chart_info_id=?`
-		_, err = to.Raw(sql, seriesIds, chartInfoId).Exec()
+		err = to.Exec(sql, seriesIds, chartInfoId).Error
 		if err != nil {
 			err = fmt.Errorf("删除系列指标 Err:" + err.Error())
 			return
@@ -172,11 +168,7 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 }
 
 func AddChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -209,12 +201,12 @@ func AddChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err er
 			CreateTime:   time.Now(),
 			ModifyTime:   time.Now(),
 		}
-		seriesIdTmp, e := to.Insert(tmp)
+		e := to.Create(tmp).Error
 		if e != nil {
 			err = fmt.Errorf("AddChartSeries Err:" + e.Error())
 			return
 		}
-		seriesId := int(seriesIdTmp)
+		seriesId := tmp.ChartSeriesId
 		addSeriesEdbList := make([]*ChartSeriesEdbMapping, 0)
 		for _, edbItem := range v.EdbInfoList {
 			dateConfStrByte, e := json.Marshal(edbItem.DateConf)
@@ -238,7 +230,7 @@ func AddChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err er
 			addSeriesEdbList = append(addSeriesEdbList, edbTmp)
 		}
 		if len(addSeriesEdbList) > 0 {
-			_, e = to.InsertMulti(len(addSeriesEdbList), addSeriesEdbList)
+			e = to.CreateInBatches(addSeriesEdbList, utils.MultiAddNum).Error
 			if e != nil {
 				err = fmt.Errorf("AddChartSeries Err:" + e.Error())
 				return
@@ -249,11 +241,7 @@ func AddChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err er
 }
 
 func DeleteChartSeriesAndEdbMapping(chartInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -263,21 +251,19 @@ func DeleteChartSeriesAndEdbMapping(chartInfoId int) (err error) {
 	}()
 
 	sql := ` DELETE FROM chart_series WHERE chart_info_id=? `
-	_, err = to.Raw(sql, chartInfoId).Exec()
+	err = to.Exec(sql, chartInfoId).Error
 	if err != nil {
 		return
 	}
+
 	sql = ` DELETE FROM  chart_series_edb_mapping WHERE chart_info_id=? `
-	_, err = to.Raw(sql, chartInfoId).Exec()
+	err = to.Exec(sql, chartInfoId).Error
+
 	return
 }
 
 func CopyChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList []*ChartSeriesEdbMapping, chartInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -305,12 +291,12 @@ func CopyChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList [
 			CreateTime:   time.Now(),
 			ModifyTime:   time.Now(),
 		}
-		seriesIdTmp, e := to.Insert(tmp)
+		e := to.Create(tmp).Error
 		if e != nil {
 			err = fmt.Errorf("AddChartSeries Err:" + e.Error())
 			return
 		}
-		seriesId := int(seriesIdTmp)
+		seriesId := tmp.ChartSeriesId
 		addSeriesEdbList := make([]*ChartSeriesEdbMapping, 0)
 		mappingList, ok := seriesEdbMap[v.ChartSeriesId]
 		if ok {
@@ -330,7 +316,7 @@ func CopyChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList [
 				addSeriesEdbList = append(addSeriesEdbList, edbTmp)
 			}
 			if len(addSeriesEdbList) > 0 {
-				_, e = to.InsertMulti(len(addSeriesEdbList), addSeriesEdbList)
+				e = to.CreateInBatches(addSeriesEdbList, utils.MultiAddNum).Error
 				if e != nil {
 					err = fmt.Errorf("AddChartSeries Err:" + e.Error())
 					return

models/data_manage/chart_series_edb_mapping.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
@@ -22,8 +22,8 @@ func (c *ChartSeriesEdbMapping) TableName() string {
 }
 
 func GetChartSeriesEdbByChartInfoId(chartInfoId int) (items []*ChartSeriesEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT * FROM chart_series_edb_mapping WHERE chart_info_id = ?"
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, chartInfoId).Find(&items).Error
+
 	return
 }

models/data_manage/chart_type.go

@@ -1,8 +1,6 @@
 package data_manage
 
-import (
-	"github.com/beego/beego/v2/client/orm"
-)
+import "eta_gn/eta_api/global"
 
 type ChartType struct {
 	ChartTypeId     int    `orm:"column(chart_type_id);pk"`
@@ -31,8 +29,9 @@ func (c *ChartType) TableName() string {
 
 // 查询所有图表类型
 func GetChartTypeList() (items []ChartType, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM chart_type order by sort asc`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }

models/data_manage/coal_data.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type BaseFromCoalmineMapping struct {
@@ -15,14 +15,14 @@ type BaseFromCoalmineMapping struct {
 
 // GetCoalItemList 模糊查询Smm数据库指标列表
 func GetCoalItemList(keyword string) (items []*BaseFromCoalmineMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT * FROM base_from_coalmine_mapping WHERE CONCAT(index_name,index_code) LIKE ? "
-	_, err = o.Raw(sql, utils.GetLikeKeyword(keyword)).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, utils.GetLikeKeyword(keyword)).Find(&items).Error
+
 	return
 }
 
 func GetCoalCompanyMaxCount(suffix, classifyName string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT
 	MAX( t.num ) AS count 
 FROM
@@ -36,12 +36,13 @@ FROM
 GROUP BY
 	index_name ) AS t `
 	sql = fmt.Sprintf(sql, suffix)
-	err = o.Raw(sql, classifyName).QueryRow(&count)
+	err = o.Raw(sql, classifyName).Scan(&count).Error
+
 	return
 }
 
 func GetCoalJsmMaxCount(classifyName string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT
 	MAX( t.num ) AS count 
 FROM
@@ -54,12 +55,13 @@ FROM
 		province =? 
 GROUP BY
 	index_name ) AS t `
-	err = o.Raw(sql, classifyName).QueryRow(&count)
+	err = o.Raw(sql, classifyName).Scan(&count).Error
+
 	return
 }
 
 func GetCoalCount(suffix, indexCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT
 		COUNT( 1 ) AS num 
 	FROM
@@ -67,7 +69,8 @@ func GetCoalCount(suffix, indexCode string) (count int, err error) {
 	WHERE
 		index_code =? `
 	sql = fmt.Sprintf(sql, suffix)
-	err = o.Raw(sql, indexCode).QueryRow(&count)
+	err = o.Raw(sql, indexCode).Scan(&count).Error
+
 	return
 }
 
@@ -88,17 +91,19 @@ type BaseFromCoalmineIndex struct {
 }
 
 func GetBaseFromCoalIndexByCode(suffix, indexCode string) (items []*BaseFromCoalmineIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_coalmine_%s WHERE index_code=? ORDER BY data_time DESC`
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = o.Raw(sql, indexCode).Find(&items).Error
+
 	return
 }
 
 func GetClassifyFromCoalByGroupName(suffix, groupName string) (items []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT DISTINCT index_code FROM base_from_coalmine_%s WHERE group_name=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, groupName).QueryRows(&items)
+	err = o.Raw(sql, groupName).Scan(&items).Error
+
 	return
 }

models/data_manage/com_trade_country.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
@@ -17,12 +17,13 @@ type ComTradeCountry struct {
 
 // AddComTradeCountry 添加联合国商品贸易数据库的国家编码
 func AddComTradeCountry(item *ComTradeCountry) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	o := global.DmSQL["data"]
+	err = o.Create(item).Error
 	if err != nil {
 		return
 	}
-	item.Id = int(lastId)
+	lastId = int64(item.Id)
+
 	return
 }
 
@@ -35,8 +36,9 @@ type ComTradeCountryItem struct {
 
 // GetComTradeCountryItemAll 获取所有的国家
 func GetComTradeCountryItemAll() (list []*ComTradeCountryItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM com_trade_country`
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
+
 	return
 }

models/data_manage/com_trade_data.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
@@ -61,24 +61,24 @@ type ComTradeDataListResp struct {
 
 // GetComTradeListCount 获取指标数据汇总数
 func GetComTradeListCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COUNT(1) AS count FROM com_trade_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&count).Error
+
 	return
 }
 
 // GetComTradeList 获取指标数据列表
 func GetComTradeList(condition string, pars []interface{}, startSize, pageSize int, orderBy string) (list []*ComTradeDataListItem, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM com_trade_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY ` + orderBy
 	sql += `  limit ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, pars, startSize, pageSize).Scan(&list).Error
+
 	return
 }

models/data_manage/com_trade_index.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -18,13 +18,13 @@ type ComTradeIndex struct {
 
 // GetComTradeIndexList 获取指标数据列表
 func GetComTradeIndexList(condition string, pars []interface{}) (list []*ComTradeIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM com_trade_index WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY com_trade_id DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, pars).Find(&list).Error
+
 	return
 }
 
@@ -34,17 +34,19 @@ func GetComTradeIndexByIdList(idList []int) (list []*ComTradeIndex, err error) {
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM com_trade_index WHERE com_trade_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, idList).QueryRows(&list)
+	err = o.Raw(sql, idList).Find(&list).Error
+
 	return
 }
 
 // GetAllComTradeIndexList 获取指标数据列表
 func GetAllComTradeIndexList() (list []*ComTradeIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM com_trade_index  ORDER BY com_trade_id DESC `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
+
 	return
 }
 
@@ -59,8 +61,9 @@ type ComTradeCodeMapping struct {
 
 // GetComTradeIndex 根据指标code获取指标信息
 func GetComTradeIndex(indexCode string) (item *ComTradeCodeMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM com_trade_code_mapping WHERE code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = o.Raw(sql, indexCode).First(&item).Error
+
 	return
 }