数据库交互优化：替换`orm`库为`global.DmSQL`，增强数据库操作的灵活性和错误处理

在数据管理模块的多个文件中，统一将`orm`库替换为`global.DmSQL`，以实现数据库操作方法的更新。这次更改加强了对数据库交互的统一管理，提高了代码的维护性和错误处理能力。以下是主要改动点：

1. 在`base_from_sci_hq_classify.go`中，更新了数据插入、更新和查询的方法，例如`Add`、`Update`以及各类`Get`方法。
2. 在`base_from_sci_hq_index.go`中，修改了指标相关的数据库操作方法，包括`Update`、`GetSciHqIndexByCondition`等方法。
3. 在`base_from_smm.go`中，调整了SMM数据源的管理方法，如`AddBaseFromSmm`、`GetBaseFromSmmList`等。

这些改动统一了数据库操作风格，提高了代码的可读性和可维护性，同时通过直接使用`global.DmSQL`，增强了错误处理的灵活性。

models/data_manage/ccf_stock_classify.go

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

models/data_manage/ccf_stock_excel.go

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

models/data_manage/chart_classify.go

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

models/data_manage/chart_edb_mapping.go

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

models/data_manage/chart_framework.go

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

models/data_manage/chart_framework_node.go

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

models/data_manage/chart_info_log.go

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

models/data_manage/chart_info_range_analysis.go

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

models/data_manage/chart_series.go

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

models/data_manage/chart_series_edb_mapping.go

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

models/data_manage/coal_data.go

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

models/data_manage/com_trade_country.go

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

models/data_manage/com_trade_data.go

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

models/data_manage/com_trade_index.go

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