数据库交互优化及错误处理

- 替换`beego orm`包为`global.DmSQL`，统一数据库交互方式。
-直接使用`global.DmSQL`进行SQL查询和操作，减少中间变量，改进错误处理。
- 移除不必要的`beego orm`导入，简化项目依赖。
- 在`AdminOperateRecord`模型的`Insert`方法中隐藏错误打印，避免日志泄露。

此次代码调整，优化了数据库操作的统一性和效率，同时通过改进错误处理流程，提升了系统的稳定性和安全性。

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
 }