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

models/data_manage/edb_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"
 	"strconv"
 	"time"
 )
@@ -29,8 +29,12 @@ type EdbClassify struct {
 }
 
 func AddEdbClassify(item *EdbClassify) (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
 }
 
@@ -51,9 +55,9 @@ type AddEdbClassifyReq struct {
 // @return count int
 // @return err error
 func GetEdbClassifyCount(classifyName string, parentId int, classifyType uint8) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COUNT(1) AS count FROM edb_classify WHERE parent_id=? AND classify_name=? AND classify_type = ? `
-	err = o.Raw(sql, parentId, classifyName, classifyType).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, parentId, classifyName, classifyType).Scan(&count).Error
+
 	return
 }
 
@@ -67,9 +71,9 @@ func GetEdbClassifyCount(classifyName string, parentId int, classifyType uint8)
 // @return count int
 // @return err error
 func GetEdbClassifyEnCount(classifyNameEn string, parentId int, classifyType uint8) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT COUNT(1) AS count FROM edb_classify WHERE parent_id=? AND classify_name_en = ? AND classify_type = ? `
-	err = o.Raw(sql, parentId, classifyNameEn, classifyType).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, parentId, classifyNameEn, classifyType).Scan(&count).Error
+
 	return
 }
 
@@ -79,16 +83,16 @@ type EditEdbClassifyReq struct {
 }
 
 func GetEdbClassifyById(classifyId int) (item *EdbClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
+
 	return
 }
 
 func GetEdbClassifyCountById(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT count(1) AS count FROM edb_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&count).Error
+
 	return
 }
 
@@ -102,9 +106,9 @@ func GetEdbClassifyCountById(classifyId int) (count int, err error) {
 // @param userRealName string
 // @return err error
 func EditEdbClassify(classifyId int, classifyName string, userId int, userRealName string) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE edb_classify SET classify_name=?,modify_time=NOW(), last_modify_user_id = ?, last_modify_user_real_name = ? WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyName, userId, userRealName, classifyId).Exec()
+	err = global.DmSQL["data"].Exec(sql, classifyName, userId, userRealName, classifyId).Error
+
 	return
 }
 
@@ -118,9 +122,9 @@ func EditEdbClassify(classifyId int, classifyName string, userId int, userRealNa
 // @param userRealName string
 // @return err error
 func EditEdbClassifyEn(classifyId int, classifyNameEn string, userId int, userRealName string) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE edb_classify SET classify_name_en = ?,modify_time=NOW(), last_modify_user_id = ?, last_modify_user_real_name = ? WHERE classify_id=? `
-	_, err = o.Raw(sql, classifyNameEn, userId, userRealName, classifyId).Exec()
+	err = global.DmSQL["data"].Exec(sql, classifyNameEn, userId, userRealName, classifyId).Error
+
 	return
 }
 
@@ -130,7 +134,6 @@ type DeleteEdbClassifyReq struct {
 }
 
 func GetEdbInfoCountByClassifyId(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM edb_info AS a
 				WHERE a.classify_id IN(
 				SELECT t.classify_id FROM 
@@ -143,12 +146,12 @@ func GetEdbInfoCountByClassifyId(classifyId int) (count int, err error) {
 				UNION SELECT * FROM edb_classify WHERE classify_id = @pid
 				)AS t
 				) `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&count).Error
+
 	return
 }
 
 func DeleteEdbClassify(classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` DELETE FROM edb_classify
 				WHERE classify_id IN(
 				SELECT t.classify_id FROM
@@ -161,19 +164,21 @@ func DeleteEdbClassify(classifyId int) (err error) {
 				UNION SELECT * FROM edb_classify WHERE classify_id = @pid
 				)AS t
 				) `
-	_, err = o.Raw(sql, classifyId).Exec()
+	err = global.DmSQL["data"].Exec(sql, classifyId).Error
+
 	return
 }
 
 func GetEdbClassifyByParentId(parentId int, classifyType int8) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_classify WHERE parent_id=? AND classify_type = ?  order by sort asc,classify_id asc`
-	_, err = o.Raw(sql, parentId, classifyType).QueryRows(&items)
+	err = o.Raw(sql, parentId, classifyType).Scan(&items).Error
+
 	return
 }
 
 func GetEdbClassifyByRootIdLevel(rootId int, classifyType uint8, orderStr string) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_classify WHERE root_id=? AND classify_type = ? `
 	if orderStr != "" {
 		sql += orderStr
@@ -181,54 +186,61 @@ func GetEdbClassifyByRootIdLevel(rootId int, classifyType uint8, orderStr string
 		sql += ` order by level desc, sort asc, classify_id asc`
 	}
 
-	_, err = o.Raw(sql, rootId, classifyType).QueryRows(&items)
+	err = o.Raw(sql, rootId, classifyType).Scan(&items).Error
+
 	return
 }
 
 func GetEdbClassifyByRootIdLevelOrder(rootId int, classifyType uint8) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_classify WHERE root_id=? AND classify_type = ? order by level desc, sort asc, classify_id asc`
-	_, err = o.Raw(sql, rootId, classifyType).QueryRows(&items)
+	err = o.Raw(sql, rootId, classifyType).Scan(&items).Error
+
 	return
 }
 
 // GetEdbClassifyAll 获取普通指标的分类列表
 func GetEdbClassifyAll() (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_classify WHERE parent_id<>0  AND classify_type = 0  order by sort asc,classify_id asc`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }
 
 // GetAllEdbClassify 获取所有的普通指标的分类列表（包含第一级）
 func GetAllEdbClassify() (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_classify WHERE  classify_type = 0  order by sort asc,classify_id asc`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }
 
 // GetNormalEdbClassifyAll 获取普通指标的分类列表
 func GetNormalEdbClassifyAll() (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_classify WHERE  classify_type = 0  order by sort asc,classify_id asc`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }
 
 // GetPredictEdbClassifyAll 获取预测指标的分类列表
 func GetPredictEdbClassifyAll() (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_classify WHERE classify_type = 1  order by sort asc,classify_id asc`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Scan(&items).Error
+
 	return
 }
 
 // GetAllEdbClassifyByType 根据类型获取分类列表
 func GetAllEdbClassifyByType(classifyType int) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_classify WHERE classify_type = ? order by sort ASC,classify_id ASC`
-	_, err = o.Raw(sql, classifyType).QueryRows(&items)
+	err = o.Raw(sql, classifyType).Scan(&items).Error
+
 	return
 }
 
@@ -319,7 +331,7 @@ type ClassifyDeleteCheckReq struct {
 }
 
 func GetClassifyCountByClassifyId(classifyId 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 edb_classify WHERE parent_id IS NOT NULL) rd,
@@ -329,7 +341,8 @@ func GetClassifyCountByClassifyId(classifyId int) (count int, err error) {
 			UNION SELECT * FROM edb_classify WHERE classify_id = @pid
 			)AS t
 			WHERE t.classify_id<>? `
-	err = o.Raw(sql, classifyId, classifyId).QueryRow(&count)
+	err = o.Raw(sql, classifyId, classifyId).Scan(&count).Error
+
 	return
 }
 
@@ -341,13 +354,11 @@ type EdbClassifySimplify struct {
 
 // 递归获取所有目录
 func GetClassifyAllByClassifyId(classifyId int) (resultList []*EdbClassifySimplify, err error) {
-	fmt.Println("185")
-	o := orm.NewOrmUsingDB("data")
 	for {
 		sql := ` SELECT * FROM edb_classify AS a
 			WHERE a.classify_id=? order by sort asc,classify_id asc`
 		item := new(EdbClassifySimplify)
-		err = o.Raw(sql, classifyId).QueryRow(&item)
+		err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&item).Error
 		if err != nil {
 			break
 		}
@@ -374,43 +385,44 @@ type MoveEdbClassifyReq struct {
 
 // GetFirstEdbClassifyByParentId 获取当前父级分类下，且排序数相同 的排序第一条的数据
 func GetFirstEdbClassifyByParentId(parentId int) (item *EdbClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_classify WHERE parent_id=? order by sort asc,classify_id asc limit 1`
-	err = o.Raw(sql, parentId).QueryRow(&item)
+	err = o.Raw(sql, parentId).First(&item).Error
+
 	return
 }
 
 // UpdateEdbClassifySortByParentId 根据父类id更新排序
 func UpdateEdbClassifySortByParentId(parentId, classifyId, nowSort int, updateSort string, classifyType uint8) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` update edb_classify set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? AND classify_type = ? `
 	if classifyId > 0 {
 		sql += ` or ( classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
 	}
-	_, err = o.Raw(sql, parentId, nowSort, classifyType).Exec()
+	err = global.DmSQL["data"].Exec(sql, parentId, nowSort, classifyType).Error
+
 	return
 }
 
 // Update 更新分类基础信息
 func (edbClassify *EdbClassify) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(edbClassify, cols...)
+	err = global.DmSQL["data"].Select(cols).Updates(edbClassify).Error
+
 	return
 }
 
 // GetEdbClassifyMaxSort 获取分类下最大的排序数
 func GetEdbClassifyMaxSort(parentId int, classifyType uint8) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT Max(sort) AS sort FROM edb_classify WHERE parent_id=? AND classify_type=? `
-	err = o.Raw(sql, parentId, classifyType).QueryRow(&sort)
+	err = global.DmSQL["data"].Raw(sql, parentId, classifyType).Scan(&sort).Error
+
 	return
 }
 
 // GetEdbInfoMaxSortByClassifyId 获取分类下指标的最大的排序数
 func GetEdbInfoMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT Max(sort) AS sort FROM edb_info WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&sort).Error
+
 	return
 }
 
@@ -420,16 +432,16 @@ type ClassifyEdbInfoListResp struct {
 
 // GetEdbClassifyAllV2 获取普通指标的分类列表
 func GetEdbClassifyAllV2(classifyType int8) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_classify WHERE parent_id <>0  AND classify_type = ?  order by sort asc,classify_id asc`
-	_, err = o.Raw(sql, classifyType).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, classifyType).Scan(&items).Error
+
 	return
 }
 
 func GetEdbClassifyByParentIdTwo(classifyType int8) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_classify WHERE level=2 AND classify_type = ?  order by sort asc,classify_id asc`
-	_, err = o.Raw(sql, classifyType).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, classifyType).Scan(&items).Error
+
 	return
 }
 
@@ -442,23 +454,23 @@ type AddEdbClassifyReqV2 struct {
 
 // GetEdbClassifyMaxSortV2 获取分类下最大的排序数
 func GetEdbClassifyMaxSortV2(parentId int, classifyType uint8) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT Max(sort) AS sort FROM edb_classify WHERE parent_id=? AND parent_id_two=? AND classify_type=? `
-	err = o.Raw(sql, parentId, classifyType).QueryRow(&sort)
+	err = global.DmSQL["data"].Raw(sql, parentId, classifyType).Scan(&sort).Error
+
 	return
 }
 
 func GetEdbClassifyByLevel(level, source int) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_classify WHERE level=? AND classify_type = ? `
-	_, err = o.Raw(sql, level, source).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, level, source).Scan(&items).Error
+
 	return
 }
 
 func FIXEdbClassifyId(newId, oldId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE edb_info SET classify_id=? WHERE classify_id=? `
-	_, err = o.Raw(sql, newId, oldId).Exec()
+	err = global.DmSQL["data"].Exec(sql, newId, oldId).Error
+
 	return
 }
 
@@ -541,7 +553,6 @@ func FixPredictEdbClassify() {
 }
 
 func GetEdbClassify(classifyId int) (classifyIds string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT GROUP_CONCAT(t.classify_id) AS classify_ids FROM (
 			SELECT a.classify_id FROM edb_classify AS a 
 			WHERE a.classify_id=?
@@ -555,7 +566,8 @@ func GetEdbClassify(classifyId int) (classifyIds string, err error) {
 WHERE
 	parent_id IN ( SELECT classify_id FROM edb_classify WHERE parent_id = ? )
 			)AS t`
-	err = o.Raw(sql, classifyId, classifyId, classifyId).QueryRow(&classifyIds)
+	err = global.DmSQL["data"].Raw(sql, classifyId, classifyId, classifyId).Scan(&classifyIds).Error
+
 	return
 }
 
@@ -576,9 +588,9 @@ func FixEdbClassifySysUser() {
 }
 
 func EditEdbClassifySysUser(classifyId, sysUserId int, chartClassifyName string) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE edb_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 = global.DmSQL["data"].Exec(sql, sysUserId, chartClassifyName, classifyId).Error
+
 	return
 }
 
@@ -599,7 +611,6 @@ func FixPredictEdbClassifySysUser() {
 }
 
 func UpdateEdbClassifyChildByParentClassifyId(classifyIds []int, rootId int, levelStep int) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	var pars []interface{}
 	pars = append(pars, rootId, levelStep)
 	pars = append(pars, classifyIds)
@@ -607,18 +618,19 @@ func UpdateEdbClassifyChildByParentClassifyId(classifyIds []int, rootId int, lev
 	sql := `update edb_classify 
 SET root_id = ?, level = level+?
 where classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
-	_, err = o.Raw(sql, pars).Exec()
+	err = global.DmSQL["data"].Exec(sql, pars).Error
 	if err != nil {
 		return
 	}
+
 	return
 }
 
 // GetEdbClassifyByParentIdAndName 根据父级ID和名称获取分类
 func GetEdbClassifyByParentIdAndName(parentId int, classifyName string, classifyId int) (item *EdbClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_classify WHERE parent_id = ? AND classify_name = ? AND classify_id <> ? LIMIT 1`
-	err = o.Raw(sql, parentId, classifyName, classifyId).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, parentId, classifyName, classifyId).First(&item).Error
+
 	return
 }
 
@@ -634,9 +646,9 @@ func GetEdbClassifyByIdList(classifyIdList []int) (item []*EdbClassify, err erro
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_classify WHERE classify_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, classifyIdList).QueryRows(&item)
+	err = global.DmSQL["data"].Raw(sql, classifyIdList).Scan(&item).Error
+
 	return
 }
 
@@ -649,16 +661,17 @@ func GetEdbClassifyByIdList(classifyIdList []int) (item []*EdbClassify, err erro
 // @return items []*EdbClassify
 // @return err error
 func GetEdbClassifyByClassifyTypeAndIsJoinPermission(classifyType, isJoinPermission int) (items []*EdbClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM edb_classify WHERE   classify_type = ? AND is_join_permission = ? `
-	_, err = o.Raw(sql, classifyType, isJoinPermission).QueryRows(&items)
+	sql := `SELECT * FROM edb_classify WHERE  classify_type = ? AND is_join_permission = ? `
+	err = global.DmSQL["data"].Raw(sql, classifyType, isJoinPermission).Scan(&items).Error
+
 	return
 }
 
 // GetEdbClassifyRootIdsByClassifyIds 获取普通指标的顶级分类列表
 func GetEdbClassifyRootIdsByClassifyIds(classifyIds []int) (items []int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT distinct root_id FROM edb_classify WHERE classify_type=0 and classify_id in (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
-	_, err = o.Raw(sql, classifyIds).QueryRows(&items)
+	err = o.Raw(sql, classifyIds).Scan(&items).Error
+
 	return
 }

models/data_manage/edb_config.go

@@ -1,6 +1,8 @@
 package data_manage
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta_gn/eta_api/global"
+)
 
 type EdbConfig struct {
 	ConfigValue string `description:"详情"`
@@ -8,16 +10,16 @@ type EdbConfig struct {
 
 // EdbConfigUpdate 修改配置
 func EdbConfigUpdate(newValue, configCode string) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `UPDATE edb_config SET  config_value=?   WHERE config_code=  ?`
-	_, err = o.Raw(sql, newValue, configCode).Exec()
+	err = global.DmSQL["data"].Exec(sql, newValue, configCode).Error
+
 	return
 }
 
 // GetConfigDetailByCode 根据配置编码获取配置的值
 func GetConfigDetailByCode(configCode string) (item *EdbConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT config_value FROM edb_config WHERE config_code=? `
-	err = o.Raw(sql, configCode).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, configCode).First(&item).Error
+
 	return
 }

models/data_manage/edb_data_baiinfo.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 )
 
 type BaseFromBaiinfoDataSimple struct {
@@ -13,8 +13,14 @@ type BaseFromBaiinfoDataSimple struct {
 }
 
 func GetEdbDataBaiinfoMaxAndMinDate(edbCode 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 edb_data_baiinfo WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+	var tmpData SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpData).Error
+	if err != nil {
+		return
+	}
+	min_date = tmpData.MinDate
+	max_date = tmpData.MaxDate
+
 	return
 }

models/data_manage/edb_data_base.go

@@ -1,13 +1,13 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/models/mgo"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"strconv"
 	"time"
 
-	"github.com/beego/beego/v2/client/orm"
 	"go.mongodb.org/mongo-driver/bson"
 )
 
@@ -240,7 +240,6 @@ func GetEdbDataAllByEdbCode(edbCode string, source, subSource, limit int) (items
 func GetEdbDataAllByEdbCodeByMysql(edbCode string, source, subSource, limit int) (items []*EdbInfoSearchData, err error) {
 	var pars []interface{}
 	pars = append(pars, edbCode)
-	o := orm.NewOrmUsingDB("data")
 
 	tableName := GetEdbDataTableName(source, subSource)
 	sql := ` SELECT * FROM %s WHERE edb_code=? ORDER BY data_time DESC`
@@ -249,19 +248,20 @@ func GetEdbDataAllByEdbCodeByMysql(edbCode string, source, subSource, limit int)
 		pars = append(pars, limit)
 	}
 	sql = fmt.Sprintf(sql, tableName)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
 func GetEdbDataBaseByEdbInfoId(edbInfoId int, source, subSource int) (items []*EdbDataBase, err error) {
-	o := orm.NewOrmUsingDB("data")
 	tableName := GetEdbDataTableName(source, subSource)
 	if source == utils.DATA_SOURCE_PREDICT {
 		tableName = "edb_data_predict_base"
 	}
 	sql := ` SELECT * FROM %s WHERE edb_info_id=? ORDER BY data_time DESC`
 	sql = fmt.Sprintf(sql, tableName)
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, edbInfoId).Scan(&items).Error
+
 	return
 }
 
@@ -325,7 +325,6 @@ func GetEdbDataAllByEdbCodeByMongo(edbCode string, source, subSource, limit int)
 func GetBaseIndexInfoByEdbCode(edbCode string, source int) (item *BaseIndexInfo, err error) {
 	var pars []interface{}
 	pars = append(pars, edbCode)
-	o := orm.NewOrmUsingDB("data")
 
 	tableName := GetBaseIndexTableName(source)
 	if tableName == "" {
@@ -335,7 +334,8 @@ func GetBaseIndexInfoByEdbCode(edbCode string, source int) (item *BaseIndexInfo,
 	sql := ` SELECT * FROM %s WHERE index_code=? `
 
 	sql = fmt.Sprintf(sql, tableName)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&item).Error
+
 	return
 }
 
@@ -349,7 +349,6 @@ func GetBaseIndexTableName(source int) (tableName string) {
 func GetEdbDataAllByEdbCodeAndSubSource(edbCode string, source, subSource, limit int) (items []*EdbInfoSearchData, err error) {
 	var pars []interface{}
 	pars = append(pars, edbCode)
-	o := orm.NewOrmUsingDB("data")
 
 	tableName := GetEdbDataTableNameAndSubSource(source, subSource)
 	sql := ` SELECT * FROM %s WHERE edb_code=? ORDER BY data_time DESC`
@@ -358,7 +357,8 @@ func GetEdbDataAllByEdbCodeAndSubSource(edbCode string, source, subSource, limit
 		pars = append(pars, limit)
 	}
 	sql = fmt.Sprintf(sql, tableName)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 
@@ -391,14 +391,14 @@ func GetEdbDataTableNameAndSubSource(source, subSource int) (tableName string) {
 func GetEdbDataAllByEdbCodes(edbCodes []string, limit int) (items []*EdbInfoSearchData, err error) {
 	var pars []interface{}
 	pars = append(pars, edbCodes)
-	o := orm.NewOrmUsingDB("data")
 
 	sql := ` SELECT * FROM edb_data_ys WHERE edb_code IN (` + utils.GetOrmInReplace(len(edbCodes)) + `) ORDER BY data_time DESC`
 	if limit > 0 {
 		sql += `  LIMIT ?  `
 		pars = append(pars, limit)
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, pars).Scan(&items).Error
+
 	return
 }
 

models/data_manage/edb_data_cffex.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -55,17 +55,25 @@ type BaseFromTradeCFFEXIndex struct {
 }
 
 func GetEdbDataCffexMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_cffex WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 
 // GetBaseInfoFromCffexByIndexCode 获取指标信息
 func GetBaseInfoFromCffexByIndexCode(indexCode, suffix string) (list []*BaseInfoFromCffex, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_cffex_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&list).Error
+
 	return
 }

models/data_manage/edb_data_coal.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -55,17 +55,25 @@ type BaseFromTradeCoalIndex struct {
 }
 
 func GetEdbDataCoalMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_coal WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 
 // GetBaseInfoFromCoalByIndexCode 获取指标信息
 func GetBaseInfoFromCoalByIndexCode(indexCode, suffix string) (list []*BaseInfoFromCoal, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_coalmine_%s WHERE index_code=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&list).Error
+
 	return
 }

models/data_manage/edb_data_dl.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -55,17 +55,25 @@ type BaseFromTradeDalianIndex struct {
 }
 
 func GetEdbDataDlMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_dl WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 
 // GetBaseInfoFromDalianByIndexCode 获取指标信息
 func GetBaseInfoFromDalianByIndexCode(indexCode, suffix string) (list []*BaseInfoFromDl, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_dalian_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&list).Error
+
 	return
 }

models/data_manage/edb_data_from_python.go

@@ -1,7 +1,6 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -17,14 +16,6 @@ type EdbDataPython struct {
 	DataTimestamp int64
 }
 
-// GetAllEdbDataPythonByEdbInfoId 根据指标id获取全部的数据
-func GetAllEdbDataPythonByEdbInfoId(edbInfoId int) (items []*EdbDataPython, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM edb_data_python WHERE edb_info_id=? ORDER BY data_time DESC `
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
-	return
-}
-
 // EdbInfoPythonSaveReq 计算（运算）指标请求参数
 type EdbInfoPythonSaveReq struct {
 	AdminId          int    `description:"添加人id"`

models/data_manage/edb_data_fubao.go

@@ -1,13 +1,21 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 )
 
 // 富宝数据
 func GetEdbDataFubaoMaxOrMinDate(edbCode 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 edb_data_ths WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	min_date = tmpDate.MinDate
+	max_date = tmpDate.MaxDate
+
 	return
 }

models/data_manage/edb_data_gie.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -12,9 +12,17 @@ type GieData struct {
 }
 
 func GetEdbDataGieMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_gie WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 
@@ -53,7 +61,6 @@ type EicIndexV2 struct {
 }
 
 func GetBaseFromEicDataAllByIndexCodeV2(indexCode, suffix string) (list []*BaseFromTradeEicIndexV2, err error) {
-	o := orm.NewOrmUsingDB("data")
 	var name string
 	if suffix == "" {
 		name = "eic_code"
@@ -80,6 +87,7 @@ func GetBaseFromEicDataAllByIndexCodeV2(indexCode, suffix string) (list []*BaseF
 	}
 	sql := `SELECT * FROM base_from_trade_eic_index_v2 WHERE %s=? `
 	sql = fmt.Sprintf(sql, name)
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&list).Error
+
 	return
 }

models/data_manage/edb_data_gl.go

@@ -1,13 +1,21 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 )
 
 func GetEdbDataGlMaxOrMinDate(edbCode 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 edb_data_gl WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	min_date = tmpDate.MinDate
+	max_date = tmpDate.MaxDate
+
 	return
 }
 

models/data_manage/edb_data_gz.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type GzData struct {
@@ -11,9 +11,17 @@ type GzData struct {
 }
 
 func GetEdbDataGzMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_gz WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 
@@ -31,9 +39,9 @@ type GzIndexView struct {
 
 // GetBaseInfoFromShByIndexCode 获取指标信息
 func GetBaseInfoFromGzByIndexCode(indexCode string) (item *GzIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_guangzhou_index WHERE index_code=? `
 	sql = fmt.Sprintf(sql)
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&item).Error
+
 	return
 }

models/data_manage/edb_data_icpi.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type IcpiData struct {
@@ -11,9 +11,17 @@ type IcpiData struct {
 }
 
 func GetEdbDataIcpiMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_icpi WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 
@@ -31,9 +39,9 @@ type IcpiIndexView struct {
 
 // GetBaseInfoFromShByIndexCode 获取指标信息
 func GetBaseInfoFromIcpiByIndexCode(indexCode string) (item *IcpiIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_icpi_index WHERE index_code=? `
 	sql = fmt.Sprintf(sql)
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&item).Error
+
 	return
 }

models/data_manage/edb_data_insert_config.go

@@ -2,12 +2,13 @@ package data_manage
 
 import (
 	"errors"
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/models/mgo"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
+	"gorm.io/gorm"
 	"strconv"
 	"time"
 )
@@ -24,9 +25,9 @@ type EdbDataInsertConfig struct {
 
 // GetEdbDataInsertConfigByEdbId 根据指标id 获取数据插入配置详情
 func GetEdbDataInsertConfigByEdbId(edbInfoId int) (item *EdbDataInsertConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_insert_config WHERE edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, edbInfoId).First(&item).Error
+
 	return
 }
 
@@ -37,9 +38,10 @@ func GetEdbDataInsertConfigByEdbIdList(edbInfoIdList []int) (items []*EdbDataIns
 		return
 	}
 
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_data_insert_config WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, edbInfoIdList).QueryRows(&items)
+	err = o.Raw(sql, edbInfoIdList).Find(&items).Error
+
 	return
 }
 
@@ -66,10 +68,7 @@ func CreateEdbDataInsertConfigAndData(edbInfo *EdbInfo, date time.Time, value st
 		saveValue = utils.SubFloatToString(floatValue, 30)
 	}
 
-	to, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -83,7 +82,7 @@ func CreateEdbDataInsertConfigAndData(edbInfo *EdbInfo, date time.Time, value st
 	{
 		var item *EdbDataInsertConfig
 		sql := ` SELECT * FROM edb_data_insert_config WHERE edb_info_id=? `
-		err = to.Raw(sql, edbInfo.EdbInfoId).QueryRow(&item)
+		err = to.Raw(sql, edbInfo.EdbInfoId).First(&item).Error
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			return
 		}
@@ -112,7 +111,7 @@ func CreateEdbDataInsertConfigAndData(edbInfo *EdbInfo, date time.Time, value st
 				ModifyTime: time.Now(),
 				CreateTime: time.Now(),
 			}
-			_, err = to.Insert(item)
+			err = to.Create(item).Error
 		} else {
 			if date.Equal(item.RealDate) || date.Before(item.RealDate) {
 				errMsg = `选择日期不能早于/等于数据最新日期`
@@ -125,7 +124,7 @@ func CreateEdbDataInsertConfigAndData(edbInfo *EdbInfo, date time.Time, value st
 			item.Date = date
 			item.Value = saveValue
 			item.ModifyTime = time.Now()
-			_, err = to.Update(item, "Date", "Value", "ModifyTime")
+			err = to.Select("Date", "Value", "ModifyTime").Updates(item).Error
 		}
 		if err != nil {
 			return
@@ -146,7 +145,7 @@ func CreateEdbDataInsertConfigAndData(edbInfo *EdbInfo, date time.Time, value st
 
 	// 指标信息更新
 	edbInfo.EndDate = dateStr
-	_, err = to.Update(edbInfo, "EndDate")
+	err = to.Select("EndDate").Updates(edbInfo).Error
 
 	return
 }
@@ -162,7 +161,7 @@ func CreateEdbDataInsertConfigAndData(edbInfo *EdbInfo, date time.Time, value st
 // @param value string
 // @return dateStr string
 // @return err error
-func updateInsertConfigValueByMysql(to orm.TxOrmer, edbInfo *EdbInfo, oldConfigDate, date time.Time, value string) (dateStr string, err error) {
+func updateInsertConfigValueByMysql(to *gorm.DB, edbInfo *EdbInfo, oldConfigDate, date time.Time, value string) (dateStr string, err error) {
 	tableName := GetEdbDataTableName(edbInfo.Source, edbInfo.SubSource)
 	if tableName == `` {
 		err = errors.New("找不到该指标的数据表")
@@ -190,7 +189,7 @@ func updateInsertConfigValueByMysql(to orm.TxOrmer, edbInfo *EdbInfo, oldConfigD
 		if !oldConfigDate.IsZero() {
 			sql := `SELECT edb_data_id,edb_info_id,data_time,value,data_timestamp FROM %s WHERE edb_info_id=? AND data_time = ?`
 			sql = fmt.Sprintf(sql, tableName)
-			err = to.Raw(sql, edbInfo.EdbInfoId, oldConfigDate.Format(utils.FormatDate)).QueryRow(&edbDateData)
+			err = to.Raw(sql, edbInfo.EdbInfoId, oldConfigDate.Format(utils.FormatDate)).Scan(&edbDateData).Error
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				return
 			}
@@ -201,12 +200,12 @@ func updateInsertConfigValueByMysql(to orm.TxOrmer, edbInfo *EdbInfo, oldConfigD
 		if edbDateData == nil {
 			addSql := ` INSERT INTO %s (edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) VALUES ( %d, "%s", "%s", "%s", now(), now(), %s) `
 			addSql = fmt.Sprintf(addSql, tableName, edbInfo.EdbInfoId, edbInfo.EdbCode, dateStr, saveValue, timeStr)
-			_, err = to.Raw(addSql).Exec()
+			err = to.Exec(addSql).Error
 		} else if value == "" {
 			// 传空值时删除
 			sql := `SELECT data_time FROM %s WHERE edb_info_id=? ORDER BY data_time DESC LIMIT 1 OFFSET 1`
 			sql = fmt.Sprintf(sql, tableName)
-			err = to.Raw(sql, edbInfo.EdbInfoId).QueryRow(&offsetDate)
+			err = to.Raw(sql, edbInfo.EdbInfoId).Scan(&offsetDate).Error
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				return
 			}
@@ -215,11 +214,11 @@ func updateInsertConfigValueByMysql(to orm.TxOrmer, edbInfo *EdbInfo, oldConfigD
 
 			deleteSql := `DELETE FROM %s WHERE edb_data_id = %d;`
 			deleteSql = fmt.Sprintf(deleteSql, tableName, edbDateData.EdbDataId)
-			_, err = to.Raw(deleteSql).Exec()
+			err = to.Exec(deleteSql).Error
 		} else {
 			updateSql := `UPDATE %s SET data_time = "%s", value = "%s", modify_time= now(), data_timestamp= %s WHERE edb_data_id = %d;`
 			updateSql = fmt.Sprintf(updateSql, tableName, dateStr, saveValue, timeStr, edbDateData.EdbDataId)
-			_, err = to.Raw(updateSql).Exec()
+			err = to.Exec(updateSql).Error
 		}
 		if err != nil {
 			return
@@ -240,7 +239,7 @@ func updateInsertConfigValueByMysql(to orm.TxOrmer, edbInfo *EdbInfo, oldConfigD
 // @param value string
 // @return dateStr string
 // @return err error
-func updateInsertConfigValueByMongo(to orm.TxOrmer, edbInfo *EdbInfo, oldConfigDate, newDate time.Time, value string) (dateStr string, err error) {
+func updateInsertConfigValueByMongo(to *gorm.DB, edbInfo *EdbInfo, oldConfigDate, newDate time.Time, value string) (dateStr string, err error) {
 	tableName := GetEdbDataTableName(edbInfo.Source, edbInfo.SubSource)
 	if tableName == `` {
 		err = errors.New("找不到该指标的数据表")
@@ -339,7 +338,7 @@ func updateInsertConfigValueByMongo(to orm.TxOrmer, edbInfo *EdbInfo, oldConfigD
 	return
 }
 
-func updateThsHfInsertConfigValueByMongo(to orm.TxOrmer, edbInfo *EdbInfo, oldConfigDate, newDate time.Time, value string) (dateStr string, err error) {
+func updateThsHfInsertConfigValueByMongo(to *gorm.DB, edbInfo *EdbInfo, oldConfigDate, newDate time.Time, value string) (dateStr string, err error) {
 	tableName := GetEdbDataTableName(edbInfo.Source, edbInfo.SubSource)
 	if tableName == `` {
 		err = errors.New("找不到该指标的数据表")

models/data_manage/edb_data_lz.go

@@ -1,12 +1,20 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 )
 
-func GetEdbDataLzMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+func GetEdbDataLzMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_lz WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }

models/data_manage/edb_data_manual.go

@@ -1,14 +1,22 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
-func GetEdbDataManualMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+func GetEdbDataManualMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_manual WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 

models/data_manage/edb_data_mysteel_chemical.go

@@ -1,21 +1,29 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 )
 
 // GetEdbDataMysteelChemicalMaxOrMinDate 根据钢联化工指标code获取最大、最小日期
 func GetEdbDataMysteelChemicalMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_mysteel_chemical WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 
 // 更新钢联化工指标的刷新状态
 func UpdateMysteelChemicalRefreshStatus(edbCode string, isStop int) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = ? WHERE index_code =? and is_stop=1`
-	_, err = o.Raw(sql, isStop, edbCode).Exec()
+	err = global.DmSQL["data"].Exec(sql, isStop, edbCode).Error
+
 	return
 }

models/data_manage/edb_data_oilchem.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type OilchemData struct {
@@ -11,9 +11,17 @@ type OilchemData struct {
 }
 
 func GetEdbDataOilchemMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_oilchem WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 
@@ -31,9 +39,10 @@ type BaseFromOilchemIndexItem struct {
 
 // GetBaseInfoFromOilchemByIndexCode 获取指标信息
 func GetBaseInfoFromOilchemByIndexCode(indexCode string) (item *BaseFromOilchemIndexItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_oilchem_index WHERE index_code=? `
 	sql = fmt.Sprintf(sql)
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = o.Raw(sql, indexCode).Scan(&item).Error
+
 	return
 }

models/data_manage/edb_data_pb.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
@@ -19,9 +19,17 @@ type EdbDataPb struct {
 	DataTimestamp int64
 }
 
-func GetEdbDataPbMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+func GetEdbDataPbMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_pb WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }

models/data_manage/edb_data_quarter.go

@@ -1,6 +1,7 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
@@ -13,19 +14,15 @@ import (
 )
 
 func GetEdbDataQuarterCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
 	hsql := `SELECT COUNT(1) AS count FROM edb_data_quarter WHERE edb_info_id=? `
-	err = o.Raw(hsql, edbInfoId).QueryRow(&count)
+	err = global.DmSQL["data"].Raw(hsql, edbInfoId).Scan(&count).Error
+
 	return
 }
 
 // 指标季度数据计算
 func AddCalculateQuarter(edbInfoId, source int, edbCode 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 {
 			fmt.Println("Err:", err)
@@ -74,7 +71,7 @@ func AddCalculateQuarter(edbInfoId, source int, edbCode string) (err error) {
 		currentYear := yv
 		hsql := `SELECT * FROM holiday WHERE year=? `
 		currentHolidayObj := new(Holiday)
-		err = to.Raw(hsql, currentYear).QueryRow(&currentHolidayObj)
+		err = to.Raw(hsql, currentYear).Scan(&currentHolidayObj).Error
 		if err != nil {
 			fmt.Println("get holiday err:" + err.Error())
 			return err
@@ -193,7 +190,7 @@ func AddCalculateQuarter(edbInfoId, source int, edbCode string) (err error) {
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		utils.FileLog.Info(addSql)
-		_, err = to.Raw(addSql).Exec()
+		err = to.Exec(addSql).Error
 		fmt.Println("err:", err)
 		if err != nil {
 			return err

models/data_manage/edb_data_sci.go

@@ -1,12 +1,20 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 )
 
-func GetEdbDataSciMaxAndMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+func GetEdbDataSciMaxAndMinDate(edbCode string) (minDate, maxDate string, err error) {
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_sci WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }

models/data_manage/edb_data_sci99.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type Sci99Data struct {
@@ -11,9 +11,17 @@ type Sci99Data struct {
 }
 
 func GetEdbDataSci99MaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_sci99 WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 
@@ -31,9 +39,9 @@ type BaseFromSci99IndexItem struct {
 
 // GetBaseInfoFromSci99ByIndexCode 获取指标信息
 func GetBaseInfoFromSci99ByIndexCode(indexCode string) (item *BaseFromSci99IndexItem, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_sci99_index WHERE index_code=? `
 	sql = fmt.Sprintf(sql)
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, indexCode).First(&item).Error
+
 	return
 }

models/data_manage/edb_data_sci_hq.go

@@ -1,10 +1,20 @@
 package data_manage
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta_gn/eta_api/global"
+)
 
-func GetEdbDataSciHqMaxAndMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+func GetEdbDataSciHqMaxAndMinDate(edbCode string) (minDate, maxDate string, err error) {
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_sci_hq WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }

models/data_manage/edb_data_sh.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -55,17 +55,25 @@ type BaseFromTradeShIndex struct {
 }
 
 func GetEdbDataShMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_sh WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 
 // GetBaseInfoFromShByIndexCode 获取指标信息
 func GetBaseInfoFromShByIndexCode(indexCode, suffix string) (list []*BaseInfoFromSh, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_shanghai_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&list).Error
+
 	return
 }

models/data_manage/edb_data_shfe.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -55,17 +55,25 @@ type BaseFromTradeShfeIndex struct {
 }
 
 func GetEdbDataShfeMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_ine WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 
 // GetBaseInfoFromShfeByIndexCode 获取指标信息
 func GetBaseInfoFromShfeByIndexCode(indexCode, suffix string) (list []*BaseInfoFromShfe, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_trade_ine_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, indexCode).Scan(&list).Error
+
 	return
 }

models/data_manage/edb_data_ths.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
@@ -17,9 +17,17 @@ type EdbDataThs struct {
 	DataTimestamp int64
 }
 
-func GetEdbDataThsMaxOrMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+func GetEdbDataThsMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_ths WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }

models/data_manage/edb_data_wind.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,44 +18,18 @@ type EdbDataWind struct {
 	DataTimestamp int64
 }
 
-func AddEdbDataWindBySql(sqlStr string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sqlStr).Exec()
-	return
-}
-
-func DeleteEdbDataWind(edbCode string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `DELETE FROM edb_data_wind WHERE edb_code=? `
-	_, err = o.Raw(sql, edbCode).Exec()
-	return
-}
-
-func ModifyEdbDataWind(edbInfoId int64, dataTime string, value float64) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` UPDATE edb_data_wind SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
-	return
-}
+func GetEdbDataWindMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
+	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_wind WHERE edb_code=? `
 
-func GetEdbDataWindByCode(edbCode string, size int) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM edb_data_wind WHERE edb_code=? ORDER BY data_time DESC LIMIT ? `
-	_, err = o.Raw(sql, edbCode, size).QueryRows(&items)
-	return
-}
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
 
-func GetEdbDataWindMaxOrMinDate(edbCode 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 edb_data_wind WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
-	return
-}
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
 
-func GetEdbDataWindByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT COUNT(1) AS count FROM edb_data_wind WHERE edb_code=? AND data_time=? `
-	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	return
 }
 
@@ -66,10 +40,7 @@ type EdbDataFromWind struct {
 }
 
 func EdbInfoUpdateStatusByEdbInfoId(edbInfoIds []int, isStop int, calculateEdbInfoIds []int) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	o := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = o.Rollback()
@@ -81,13 +52,13 @@ func EdbInfoUpdateStatusByEdbInfoId(edbInfoIds []int, isStop int, calculateEdbIn
 	// 更改指标的更新状态
 	if len(edbInfoIds) == 1 {
 		sql := ` UPDATE edb_info SET no_update = ? WHERE edb_info_id=? `
-		_, err = o.Raw(sql, isStop, edbInfoIds[0]).Exec()
+		err = o.Exec(sql, isStop, edbInfoIds[0]).Error
 		if err != nil {
 			return
 		}
 	} else {
 		sql := ` UPDATE edb_info SET no_update = ? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(edbInfoIds)) + `) `
-		_, err = o.Raw(sql, isStop, edbInfoIds).Exec()
+		err = o.Exec(sql, isStop, edbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -96,7 +67,7 @@ func EdbInfoUpdateStatusByEdbInfoId(edbInfoIds []int, isStop int, calculateEdbIn
 	if len(calculateEdbInfoIds) > 0 {
 		// 批量更新相关联的指标ID
 		sql := ` UPDATE edb_info SET no_update = ? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(calculateEdbInfoIds)) + `) `
-		_, err = o.Raw(sql, isStop, calculateEdbInfoIds).Exec()
+		err = o.Exec(sql, isStop, calculateEdbInfoIds).Error
 		if err != nil {
 			return
 		}

models/data_manage/edb_data_wind_wsd.go

@@ -1,15 +1,15 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 func ModifyEdbInfoWindWsdDataStatus(source, subSource int, edbInfoId int64, edbCode string) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	tableName := GetEdbDataTableNameAndSubSource(source, subSource)
 	sql := ` UPDATE %s SET edb_info_id=?,modify_time=NOW() WHERE edb_code=? `
 	sql = fmt.Sprintf(sql, tableName)
-	_, err = o.Raw(sql, edbInfoId, edbCode).Exec()
+	err = global.DmSQL["data"].Exec(sql, edbInfoId, edbCode).Error
+
 	return
 }

models/data_manage/edb_data_ys.go

@@ -10,9 +10,9 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"errors"
+	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -29,155 +29,18 @@ type BaseFromSmmDataSimple struct {
 	Value              string
 }
 
-func GetEdbDataYsMaxAndMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+func GetEdbDataYsMaxAndMinDate(edbCode string) (minDate, maxDate string, err error) {
 	sql := ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date FROM edb_data_ys WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
-	return
-}
-
-// 有色
-func GetEdbDataByYs(edbCode, startDate, endDate string) (searchItem *EdbInfoSearch, err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
-	searchItem = new(EdbInfoSearch)
-	searchItem.EdbCode = edbCode
-	smmBaseDataAll, err := GetBaseFromSmmDataAllByIndexCode(edbCode)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		return
-	}
-
-	var isAdd bool
-	addSql := ` INSERT INTO edb_data_ys(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
-	dataList := make([]*EdbInfoSearchData, 0)
-	existMap := make(map[string]string)
-
-	for _, sv := range smmBaseDataAll {
-		eDate := sv.DataTime
-		dataTime, err := time.Parse(utils.FormatDate, eDate)
-		if err != nil {
-			fmt.Println("time.Parse Err:" + eDate)
-			return nil, err
-		}
-		timestamp := dataTime.UnixNano() / 1e6
-		timeStr := fmt.Sprintf("%d", timestamp)
-		if _, ok := existMap[eDate]; !ok {
-			addSql += GetAddSql("0", edbCode, eDate, timeStr, sv.Value)
-			isAdd = true
-		}
-		existMap[eDate] = sv.Value
-	}
-	if isAdd {
-		addSql = strings.TrimRight(addSql, ",")
-		utils.FileLog.Info("addSql:" + addSql)
-		_, err = to.Raw(addSql).Exec()
-		if err != nil {
-			return searchItem, err
-		}
-	}
-	if err != nil {
-		_ = to.Rollback()
-	} else {
-		_ = to.Commit()
-	}
-	size := utils.EDB_DATA_LIMIT
-	dataList, err = GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_YS, utils.DATA_SUB_SOURCE_EDB, size)
-	if err != nil {
-		utils.FileLogData.Info("GetEdbDataThsByCode Err:%s", err.Error())
-		return searchItem, err
-	}
-	minDate, maxDate, err := GetEdbDataYsMaxAndMinDate(edbCode)
-	if err != nil {
-		return searchItem, err
-	}
-	searchItem.DataList = dataList
-	searchItem.StartDate = minDate
-	searchItem.EndDate = maxDate
-	if searchItem.DataList == nil {
-		searchItem.DataList = make([]*EdbInfoSearchData, 0)
-	}
-	return
-}
 
-// 全部刷新有色数据
-func RefreshAllEdbDataByYs(edbInfoId, source, subSource int, edbCode, startDate, endDate string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
 	if err != nil {
 		return
 	}
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
 
-	if err != nil {
-		return
-	}
-	edbInfoIdStr := strconv.Itoa(edbInfoId)
-	//获取数据
-	err = SyncSmmIndexDataBase(edbCode, startDate, endDate)
-	if err != nil {
-		err = errors.New("SyncSmmIndexDataBase Err:" + err.Error())
-		return err
-	}
-	//获取已存在指标所有数据
-	existDataList := make([]*EdbDataBase, 0)
-	dataTableName := GetEdbDataTableName(source, subSource)
-	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	sql = fmt.Sprintf(sql, dataTableName)
-	_, err = to.Raw(sql, edbInfoId).QueryRows(&existDataList)
-	if err != nil {
-		return err
-	}
-	existDataMap := make(map[string]string)
-	for _, v := range existDataList {
-		existDataMap[v.DataTime] = v.Value
-	}
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
 
-	smmDateList := make([]*BaseFromSmmDataSimple, 0)
-	smmSql := ` SELECT * FROM base_from_smm_data WHERE index_code=? AND data_time>=? `
-	_, err = to.Raw(smmSql, edbCode, startDate).QueryRows(&smmDateList)
-	if err != nil {
-		return err
-	}
-
-	addSql := ` INSERT INTO edb_data_ys(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
-	var isAdd bool
-	for _, sv := range smmDateList {
-		if existVal, ok := existDataMap[sv.DataTime]; !ok {
-			dataTime, err := time.Parse(utils.FormatDate, sv.DataTime)
-			if err != nil {
-				return err
-			}
-			timestamp := dataTime.UnixNano() / 1e6
-			timeStr := fmt.Sprintf("%d", timestamp)
-			addSql += GetAddSql(edbInfoIdStr, edbCode, sv.DataTime, timeStr, sv.Value)
-			isAdd = true
-		} else {
-			if existVal != sv.Value {
-				sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
-				sql = fmt.Sprintf(sql, dataTableName)
-				_, err = to.Raw(sql, sv.Value, edbInfoId, sv.DataTime).Exec()
-				if err != nil {
-					return err
-				}
-			}
-		}
-	}
-	if isAdd {
-		addSql = strings.TrimRight(addSql, ",")
-		_, err = to.Raw(addSql).Exec()
-		if err != nil {
-			return err
-		}
-	}
 	return
 }
 

models/data_manage/edb_data_zz.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -55,17 +55,26 @@ type BaseFromTradeZhengzhouIndex struct {
 }
 
 func GetEdbDataZzMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_zz WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+
+	var tmpDate SmmMaxOrMinDate
+	err = global.DmSQL["data"].Raw(sql, edbCode).Scan(&tmpDate).Error
+	if err != nil {
+		return
+	}
+
+	minDate = tmpDate.MinDate
+	maxDate = tmpDate.MaxDate
+
 	return
 }
 
 // GetBaseInfoFromZhengzhouByIndexCode 获取指标信息
 func GetBaseInfoFromZhengzhouByIndexCode(indexCode, suffix string) (list []*BaseInfoFromZz, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM base_from_trade_zhengzhou_index WHERE %s_code=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, indexCode).QueryRows(&list)
+	err = o.Raw(sql, indexCode).Scan(&list).Error
+
 	return
 }

models/data_manage/edb_info_calculate.go

@@ -1,12 +1,9 @@
 package data_manage
 
 import (
-	"fmt"
-
-	"strings"
+	"eta_gn/eta_api/global"
 	"time"
 
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
@@ -45,12 +42,6 @@ type EdbInfoCalculate struct {
 	ModifyTime         time.Time `description:"修改时间"`
 }
 
-func AddEdbInfoCalculateMulti(items []*EdbInfoCalculate) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(1, items)
-	return
-}
-
 type FromEdbInfoData struct {
 	EdbInfoId int    `description:"指标id"`
 	EdbName   string `description:"指标名称"`
@@ -84,8 +75,6 @@ type EdbInfoCalculateDetail struct {
 }
 
 func GetEdbInfoCalculateDetail(edbInfoId, source int) (list []*EdbInfoCalculateDetail, err error) {
-	o := orm.NewOrmUsingDB("data")
-
 	//calculateTableName := GetEdbInfoCalculateTableName(source)
 	//sql := ` SELECT a.*,b.start_date,b.end_date,b.edb_type FROM %s AS a
 	//		INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
@@ -97,7 +86,8 @@ func GetEdbInfoCalculateDetail(edbInfoId, source int) (list []*EdbInfoCalculateD
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? ORDER BY sort ASC `
 
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, edbInfoId).Scan(&list).Error
+
 	return
 }
 
@@ -119,47 +109,6 @@ type EdbInfoCalculateEditReq struct {
 	EdbInfoIdArr     []EdbInfoFromTag `description:"指标信息"`
 }
 
-func GetCalculateEdbInfo(edbInfoId int) (from_edb_info_id string, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT GROUP_CONCAT(from_edb_info_id ORDER BY sort ASC SEPARATOR ',') AS from_edb_info_id 
-			FROM edb_info_calculate_mapping
-			WHERE edb_info_id=?
-			GROUP BY edb_info_id
-			 `
-	err = o.Raw(sql, edbInfoId).QueryRow(&from_edb_info_id)
-	return
-}
-
-func DeleteCalculateEdbInfo(edbInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			_ = to.Rollback()
-		} else {
-			_ = to.Commit()
-		}
-	}()
-	sql := `DELETE FROM edb_data_calculate WHERE edb_info_id=?`
-	_, err = to.Raw(sql, edbInfoId).Exec()
-	if err != nil {
-		return
-	}
-	sql = `DELETE FROM edb_info_calculate_mapping WHERE edb_info_id=?`
-	_, err = to.Raw(sql, edbInfoId).Exec()
-	return
-}
-
-func DeleteCalculateData(edbInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `DELETE FROM edb_data_calculate WHERE edb_info_id=?`
-	_, err = o.Raw(sql, edbInfoId).Exec()
-	return
-}
-
 type EdbInfoBase struct {
 	EdbInfoId     int    `description:"指标id"`
 	EdbName       string `description:"指标名称"`
@@ -276,8 +225,6 @@ type EdbInfoCalculateBatchEditReqByEdbLib struct {
 }
 
 func GetEdbInfoCalculateMap(edbInfoId, source int) (list []*EdbInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
-
 	//calculateTableName := GetEdbInfoCalculateTableName(source)
 
 	//sql := ` SELECT b.* FROM %s AS a
@@ -289,7 +236,8 @@ func GetEdbInfoCalculateMap(edbInfoId, source int) (list []*EdbInfo, err error)
 	sql := ` SELECT b.* FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? ORDER BY sort ASC `
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&list)
+	err = global.DmSQL["data"].Raw(sql, edbInfoId).Find(&list).Error
+
 	return
 }
 
@@ -298,152 +246,6 @@ type CalculateItems struct {
 	DataMap   map[string]float64
 }
 
-func CheckFormula(formula string) map[string]string {
-	mathFormula := []string{"MAX", "MIN", "ABS", "ACOS", "ASIN", "CEIL", "MOD", "POW", "ROUND", "SIGN", "SIN", "TAN", "LOG10", "LOG2", "LOG", "LN"}
-
-	str := strings.ToUpper(formula)
-	for _, v := range mathFormula {
-		str = strings.Replace(str, v, "", -1)
-	}
-	str = strings.Replace(str, "(", "", -1)
-	str = strings.Replace(str, ")", "", -1)
-
-	byteMap := make(map[string]string)
-	for i := 0; i < len(str); i++ {
-		byteInt := str[i]
-		if byteInt >= 65 && byteInt <= 90 {
-			byteStr := string(byteInt)
-			if _, ok := byteMap[byteStr]; !ok {
-				byteMap[byteStr] = byteStr
-			}
-		}
-	}
-	return byteMap
-}
-
-func ReplaceFormula(edbInfoIdArr []*EdbInfo, valArr map[int]float64, formulaMap map[string]string, formulaStr string, edbInfoIdBytes []string) string {
-	funMap := GetFormulaMap()
-	for k, v := range funMap {
-		formulaStr = strings.Replace(formulaStr, k, v, -1)
-	}
-
-	replaceCount := 0
-	for dk, dv := range edbInfoIdArr {
-		if dk == 0 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 1 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 2 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 3 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 4 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 5 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 6 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 7 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-		if dk == 8 {
-			dKey := edbInfoIdBytes[dk]
-			if _, ok := formulaMap[dKey]; ok { //公式中存在
-				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
-					dvStr := fmt.Sprintf("%v", val)
-					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
-					replaceCount++
-				}
-			}
-		}
-	}
-	for k, v := range funMap {
-		formulaStr = strings.Replace(formulaStr, v, k, -1)
-	}
-	if replaceCount == len(formulaMap) {
-		return formulaStr
-	} else {
-		return ""
-	}
-}
-
-func GetFormulaMap() map[string]string {
-	funMap := make(map[string]string)
-	funMap["MAX"] = "[@@]"
-	funMap["MIN"] = "[@!]"
-	funMap["ABS"] = "[@#]"
-	funMap["CEIL"] = "[@$]"
-	funMap["COS"] = "[@%]"
-	funMap["FLOOR"] = "[@^]"
-	funMap["MOD"] = "[@&]"
-	funMap["POW"] = "[@*]"
-	funMap["ROUND"] = "[@(]"
-	return funMap
-}
-
 // SaveAdjustEdbInfoReq 保存数据调整请求参数（请求指标服务）
 type SaveAdjustEdbInfoReq struct {
 	AdminId       int                    `description:"添加人id"`

models/data_manage/edb_info_calculate_mapping.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"
 )
 
@@ -24,16 +24,11 @@ type EdbInfoCalculateMapping struct {
 	ModifyTime                time.Time `description:"修改时间"`
 }
 
-func AddEdbInfoCalculateMappingMulti(items []*EdbInfoCalculateMapping) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(1, items)
-	return
-}
-
 func GetEdbInfoCalculateMappingCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT COUNT(1) AS count FROM edb_info_calculate_mapping WHERE from_edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&count)
+	err = o.Raw(sql, edbInfoId).Scan(&count).Error
+
 	return
 }
 
@@ -60,11 +55,12 @@ type EdbInfoCalculateMappingView struct {
 }
 
 func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMappingView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT a.*,b.start_date,b.end_date,b.calculate_formula,b.move_type,b.move_frequency FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = o.Raw(sql, edbInfoId).Scan(&item).Error
+
 	return
 }
 
@@ -95,20 +91,22 @@ type EdbInfoCalculateMappingInfo struct {
 
 // GetEdbInfoCalculateMappingListByEdbInfoId 根据生成的指标id获取来源的指标id列表
 func GetEdbInfoCalculateMappingListByEdbInfoId(edbInfoId int) (items []*EdbInfoCalculateMappingInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT a.*,b.edb_type as from_edb_type,b.edb_info_type as from_edb_info_type, b.unique_code AS from_unique_code, b.classify_id AS from_classify_id,b.no_update FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
+	err = o.Raw(sql, edbInfoId).Scan(&items).Error
+
 	return
 }
 
 // GetEdbInfoCalculateMappingListByEdbInfoIds 根据生成的指标id获取来源的指标id列表
 func GetEdbInfoCalculateMappingListByEdbInfoIds(edbInfoIds []int) (items []*EdbInfoCalculateMappingInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT a.*,b.edb_type as from_edb_type,b.edb_info_type as from_edb_info_type, b.unique_code AS from_unique_code, b.classify_id AS from_classify_id,b.no_update FROM edb_info_calculate_mapping AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id in (` + utils.GetOrmInReplace(len(edbInfoIds)) + `) `
-	_, err = o.Raw(sql, edbInfoIds).QueryRows(&items)
+	err = o.Raw(sql, edbInfoIds).Scan(&items).Error
+
 	return
 }

models/data_manage/edb_info_log.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
@@ -22,7 +22,12 @@ type EdbInfoLog struct {
 }
 
 func AddEdbInfoLog(item *EdbInfoLog) (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.EdbInfoLogId)
+
 	return
 }

models/data_manage/edb_info_no_permission_admin.go

@@ -1,7 +1,8 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
 	"time"
 )
 
@@ -13,58 +14,51 @@ type EdbInfoNoPermissionAdmin struct {
 	CreateTime time.Time
 }
 
-func AddEdbInfoNoPermissionAdmin(item *EdbInfoNoPermissionAdmin) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
 // GetAllListByEdbInfoId 根据指标id获取所有的配置
 func (item EdbInfoNoPermissionAdmin) GetAllListByEdbInfoId(edbInfoId int) (items []*EdbInfoNoPermissionAdmin, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT * FROM edb_info_no_permission_admin WHERE edb_info_id = ? ORDER BY create_time desc`
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
+	err = o.Raw(sql, edbInfoId).Find(&items).Error
+
 	return
 }
 
 // GetAllListByAdminId 根据用户id获取该用户的所有配置
 func (item EdbInfoNoPermissionAdmin) GetAllListByAdminId(adminId int) (items []*EdbInfoNoPermissionAdmin, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_info_no_permission_admin WHERE admin_id = ? ORDER BY create_time desc`
-	_, err = o.Raw(sql, adminId).QueryRows(&items)
+	err = global.DmSQL["data"].Raw(sql, adminId).Find(&items).Error
+
 	return
 }
 
 // GetByEdbInfoIdAndAdminId 根据用户id和指标id获取配置
 func (item EdbInfoNoPermissionAdmin) GetByEdbInfoIdAndAdminId(adminId, edbInfoId int) (info *EdbInfoNoPermissionAdmin, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_info_no_permission_admin WHERE admin_id = ? AND edb_info_id = ? ORDER BY create_time desc`
-	err = o.Raw(sql, adminId, edbInfoId).QueryRow(&info)
+	err = global.DmSQL["data"].Raw(sql, adminId, edbInfoId).First(&info).Error
+
 	return
 }
 
 // DeleteAllByEdbInfoId 根据指标id删除所有的配置
 func (item EdbInfoNoPermissionAdmin) DeleteAllByEdbInfoId(edbInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `DELETE FROM edb_info_no_permission_admin WHERE edb_info_id = ? `
-	_, err = o.Raw(sql, edbInfoId).Exec()
+	err = global.DmSQL["data"].Exec(sql, edbInfoId).Error
+
 	return
 }
 
 // DeleteByEdbInfoIdAndAdminId 根据指标id和用户id删除配置
 func (item EdbInfoNoPermissionAdmin) DeleteByEdbInfoIdAndAdminId(edbInfoId, adminId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `DELETE FROM edb_info_no_permission_admin WHERE edb_info_id = ? AND admin_id = ? `
-	_, err = o.Raw(sql, edbInfoId, adminId).Exec()
+	err = o.Exec(sql, edbInfoId, adminId).Error
+
 	return
 }
 
 // ModifyByEdbInfoId 根据指标id和用户ID列表 重新配置
 func (item EdbInfoNoPermissionAdmin) ModifyByEdbInfoId(edbInfoId int, adminIdList []int) (err error) {
-	to, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -73,7 +67,7 @@ func (item EdbInfoNoPermissionAdmin) ModifyByEdbInfoId(edbInfoId int, adminIdLis
 		}
 	}()
 	sql := `DELETE FROM edb_info_no_permission_admin WHERE edb_info_id = ? `
-	_, err = to.Raw(sql, edbInfoId).Exec()
+	err = to.Exec(sql, edbInfoId).Error
 	if err != nil {
 		return
 	}
@@ -88,17 +82,15 @@ func (item EdbInfoNoPermissionAdmin) ModifyByEdbInfoId(edbInfoId int, adminIdLis
 		})
 	}
 	if len(insertArr) > 0 {
-		_, err = to.InsertMulti(len(insertArr), insertArr)
+		err = to.CreateInBatches(insertArr, utils.MultiAddNum).Error
 	}
+
 	return
 }
 
 // AddByEdbInfoId 根据指标id和用户ID列表 添加配置
 func (item EdbInfoNoPermissionAdmin) AddByEdbInfoId(edbInfoId int, adminIdList []int) (err error) {
-	to, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	to := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = to.Rollback()
@@ -109,7 +101,7 @@ func (item EdbInfoNoPermissionAdmin) AddByEdbInfoId(edbInfoId int, adminIdList [
 
 	var items []*EdbInfoNoPermissionAdmin
 	sql := `SELECT * FROM edb_info_no_permission_admin WHERE edb_info_id = ? ORDER BY create_time desc`
-	_, err = to.Raw(sql, edbInfoId).QueryRows(&items)
+	err = to.Raw(sql, edbInfoId).Scan(&items).Error
 	if err != nil {
 		return
 	}
@@ -131,7 +123,7 @@ func (item EdbInfoNoPermissionAdmin) AddByEdbInfoId(edbInfoId int, adminIdList [
 		}
 	}
 	if len(insertArr) > 0 {
-		_, err = to.InsertMulti(len(insertArr), insertArr)
+		err = to.CreateInBatches(insertArr, utils.MultiAddNum).Error
 	}
 	return
 }
@@ -143,20 +135,22 @@ type NoPermissionChart struct {
 
 // GetAllChartListByAdminId 根据用户id获取该用户的所有配置
 func (item EdbInfoNoPermissionAdmin) GetAllChartListByAdminId(adminId int) (items []*NoPermissionChart, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT a.admin_id,b.chart_info_id FROM edb_info_no_permission_admin AS a 
 			JOIN chart_edb_mapping AS b ON a.edb_info_id=b. edb_info_id
 			WHERE a.admin_id = ? ORDER BY a.create_time desc `
-	_, err = o.Raw(sql, adminId).QueryRows(&items)
+	err = o.Raw(sql, adminId).Scan(&items).Error
+
 	return
 }
 
 // GetChartByEdbInfoIdAndAdminId 根据用户id和指标id获取配置
 func (item EdbInfoNoPermissionAdmin) GetChartByEdbInfoIdAndAdminId(adminId, edbInfoId int) (info *NoPermissionChart, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `SELECT a.admin_id,b.chart_info_id FROM edb_info_no_permission_admin AS a 
 			JOIN chart_edb_mapping AS b ON a.edb_info_id=b. edb_info_id
 			WHERE a.admin_id = ? AND a.edb_info_id = ? ORDER BY a.create_time desc`
-	err = o.Raw(sql, adminId, edbInfoId).QueryRow(&info)
+	err = o.Raw(sql, adminId, edbInfoId).Scan(&info).Error
+
 	return
 }

models/data_manage/edb_info_record.go

@@ -1,9 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type EdbInfoRecord struct {
@@ -22,7 +21,7 @@ type EdbInfoRecord struct {
 }
 
 func AddEditEdbInfoRcord(edbRecord *EdbInfoRecord) (e error) {
-	o := orm.NewOrmUsingDB("data")
-	_, e = o.Insert(edbRecord)
+	e = global.DmSQL["data"].Create(edbRecord).Error
+
 	return
 }

models/data_manage/edb_info_relation.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"
 )
@@ -32,42 +32,43 @@ func (e *EdbInfoRelation) TableName() string {
 
 // GetEdbInfoRelationByRelationIds 查询引用的指标ID
 func GetEdbInfoRelationByRelationIds(ids []int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	msql := ` SELECT * FROM edb_info_relation WHERE edb_info_relation_id in (` + utils.GetOrmInReplace(len(ids)) + `) `
-	_, err = o.Raw(msql, ids).QueryRows(&items)
+	err = o.Raw(msql, ids).Find(&items).Error
+
 	return
 }
 
 // GetEdbInfoRelationByReferObjectId 查询直接引用的指标ID
 func GetEdbInfoRelationByReferObjectId(referObjectId int, referObjectType int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	msql := ` SELECT * FROM edb_info_relation WHERE refer_object_id =? and relation_type=0 AND refer_object_type=?  GROUP BY edb_info_id `
-	_, err = o.Raw(msql, referObjectId, referObjectType).QueryRows(&items)
+	err = o.Raw(msql, referObjectId, referObjectType).Find(&items).Error
+
 	return
 }
 
 // GetEdbInfoRelationByReferObjectIds 查询引用的指标ID
 func GetEdbInfoRelationByReferObjectIds(referObjectIds []int, referObjectType int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	msql := ` SELECT * FROM edb_info_relation WHERE refer_object_id in (` + utils.GetOrmInReplace(len(referObjectIds)) + `) AND refer_object_type=? and relation_type=0`
-	_, err = o.Raw(msql, referObjectIds, referObjectType).QueryRows(&items)
+	err = o.Raw(msql, referObjectIds, referObjectType).Find(&items).Error
+
 	return
 }
 
 // GetEdbInfoRelationAllByReferObjectIds 查询引用的指标ID
 func GetEdbInfoRelationAllByReferObjectIds(referObjectIds []int, referObjectType int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	msql := ` SELECT * FROM edb_info_relation WHERE refer_object_id in (` + utils.GetOrmInReplace(len(referObjectIds)) + `) AND refer_object_type=?`
-	_, err = o.Raw(msql, referObjectIds, referObjectType).QueryRows(&items)
+	err = o.Raw(msql, referObjectIds, referObjectType).Find(&items).Error
+
 	return
 }
 
 // 新增记录
 func AddOrUpdateEdbInfoRelation(objectId, objectType int, relationList []*EdbInfoRelation, deleteEdbInfoIds []int, refreshEdbInfoIds []int, indexCodeList []string) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	o := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = o.Rollback()
@@ -78,13 +79,13 @@ func AddOrUpdateEdbInfoRelation(objectId, objectType int, relationList []*EdbInf
 
 	if len(deleteEdbInfoIds) > 0 {
 		sql := ` DELETE FROM edb_info_relation WHERE refer_object_id = ? AND refer_object_type=? AND edb_info_id in (` + utils.GetOrmInReplace(len(deleteEdbInfoIds)) + `) AND relation_type=0`
-		_, err = o.Raw(sql, objectId, objectType, deleteEdbInfoIds).Exec()
+		err = o.Exec(sql, objectId, objectType, deleteEdbInfoIds).Error
 		if err != nil {
 			return
 		}
 		// 同时删除相关连的间接引用的指标ID
 		sql = ` DELETE FROM edb_info_relation WHERE refer_object_id = ? AND refer_object_type=? AND root_edb_info_id in (` + utils.GetOrmInReplace(len(deleteEdbInfoIds)) + `) AND relation_type=1 `
-		_, err = o.Raw(sql, objectId, objectType, deleteEdbInfoIds).Exec()
+		err = o.Exec(sql, objectId, objectType, deleteEdbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -96,7 +97,7 @@ func AddOrUpdateEdbInfoRelation(objectId, objectType int, relationList []*EdbInf
 				relationCodesMap[relation.RelationCode] = struct{}{}
 			}
 		}
-		_, err = o.InsertMulti(len(relationList), relationList)
+		err = o.CreateInBatches(relationList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -105,7 +106,7 @@ func AddOrUpdateEdbInfoRelation(objectId, objectType int, relationList []*EdbInf
 	if len(refreshEdbInfoIds) > 0 {
 		//todo 是否需要所有指标的刷新状态
 		sql := ` UPDATE edb_info SET no_update = 0 WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) AND  no_update = 1`
-		_, err = o.Raw(sql, refreshEdbInfoIds).Exec()
+		err = o.Exec(sql, refreshEdbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -115,7 +116,7 @@ func AddOrUpdateEdbInfoRelation(objectId, objectType int, relationList []*EdbInf
 	if len(indexCodeList) > 0 {
 		// 更改数据源的更新状态
 		sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = 0 WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodeList)) + `) and is_stop=1`
-		_, err = o.Raw(sql, indexCodeList).Exec()
+		err = o.Exec(sql, indexCodeList).Error
 		if err != nil {
 			return
 		}
@@ -134,21 +135,19 @@ SET e1.parent_relation_id = e2.edb_info_relation_id
 WHERE  
     e1.relation_type = 1   
     AND e2.relation_type = 0 AND e1.parent_relation_id !=e2.edb_info_relation_id AND e1.relation_code in (` + utils.GetOrmInReplace(len(relationCodes)) + `)`
-			_, err = o.Raw(sql, relationCodes).Exec()
+			err = o.Exec(sql, relationCodes).Error
 			if err != nil {
 				return
 			}
 		}
 	}
+
 	return
 }
 
 // 新增记录
 func AddOrUpdateEdbInfoRelationMulti(relationList []*EdbInfoRelation, refreshEdbInfoIds []int, indexCodeList []string) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	o := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = o.Rollback()
@@ -164,7 +163,7 @@ func AddOrUpdateEdbInfoRelationMulti(relationList []*EdbInfoRelation, refreshEdb
 				relationCodesMap[relation.RelationCode] = struct{}{}
 			}
 		}
-		_, err = o.InsertMulti(len(relationList), relationList)
+		err = o.CreateInBatches(relationList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -173,7 +172,7 @@ func AddOrUpdateEdbInfoRelationMulti(relationList []*EdbInfoRelation, refreshEdb
 	if len(refreshEdbInfoIds) > 0 {
 		// todo 更新指标的刷新状态
 		sql := ` UPDATE edb_info SET no_update = 0 WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) AND no_update = 1`
-		_, err = o.Raw(sql, refreshEdbInfoIds).Exec()
+		err = o.Exec(sql, refreshEdbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -183,7 +182,7 @@ func AddOrUpdateEdbInfoRelationMulti(relationList []*EdbInfoRelation, refreshEdb
 	if len(indexCodeList) > 0 {
 		// 更改数据源的更新状态
 		sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = 0 WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodeList)) + `) and is_stop=1`
-		_, err = o.Raw(sql, indexCodeList).Exec()
+		err = o.Exec(sql, indexCodeList).Error
 		if err != nil {
 			return
 		}
@@ -202,28 +201,30 @@ SET e1.parent_relation_id = e2.edb_info_relation_id
 WHERE  
     e1.relation_type = 1   
     AND e2.relation_type = 0 AND e1.parent_relation_id !=e2.edb_info_relation_id AND e1.relation_code in (` + utils.GetOrmInReplace(len(relationCodes)) + `)`
-			_, err = o.Raw(sql, relationCodes).Exec()
+			err = o.Exec(sql, relationCodes).Error
 			if err != nil {
 				return
 			}
 		}
 	}
+
 	return
 }
 
 // 删除指标引用内容
 func DeleteEdbRelationByObjectIds(referObjectIds []int, referObjectType int) (err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` DELETE FROM edb_info_relation WHERE refer_object_id in (` + utils.GetOrmInReplace(len(referObjectIds)) + `) AND refer_object_type=?`
-	_, err = o.Raw(sql, referObjectIds, referObjectType).Exec()
+	err = global.DmSQL["data"].Exec(sql, referObjectIds, referObjectType).Error
+
 	return
 }
 
 // DeleteEdbRelationByObjectId 删除指标引用内容
 func DeleteEdbRelationByObjectId(referObjectId int, referObjectType int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` DELETE FROM edb_info_relation WHERE refer_object_id =? AND refer_object_type=?`
-	_, err = o.Raw(sql, referObjectId, referObjectType).Exec()
+	err = o.Exec(sql, referObjectId, referObjectType).Error
+
 	return
 }
 
@@ -263,7 +264,7 @@ type BaseRelationEdbInfoDetailResp struct {
 
 // 查询指标引用列表
 func GetEdbInfoRelationList(condition string, pars []interface{}, addFieldStr, joinTableStr, orderBy string, startSize, pageSize int) (total int, items []*BaseRelationEdbInfo, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	// 数量汇总
 	totalSql := ` SELECT count(1) FROM edb_info e LEFT JOIN (
 SELECT count(edb_info_id) as relation_num, edb_info_id, max(relation_time) as relation_time FROM edb_info_relation GROUP BY edb_info_id) r on e.edb_info_id=r.edb_info_id  `
@@ -275,7 +276,7 @@ SELECT count(edb_info_id) as relation_num, edb_info_id, max(relation_time) as re
 	if condition != "" {
 		totalSql += condition
 	}
-	err = o.Raw(totalSql, pars).QueryRow(&total)
+	err = o.Raw(totalSql, pars).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -299,77 +300,78 @@ SELECT count(edb_info_id) as relation_num, edb_info_id, max(relation_time) as re
 		sql += ` ORDER BY edb_info_id ASC `
 	}
 	sql += `  LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, pars, startSize, pageSize).Scan(&items).Error
 
 	return
 }
 
 // GetEdbInfoRelationDetailList 查询指标引用详情列表
 func GetEdbInfoRelationDetailList(edbInfoId int, startSize, pageSize int) (total int, items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	// 数量汇总
 	totalSql := ` SELECT count(*) FROM edb_info_relation where edb_info_id=?`
-	err = o.Raw(totalSql, edbInfoId).QueryRow(&total)
+	err = o.Raw(totalSql, edbInfoId).Scan(&total).Error
 	if err != nil {
 		return
 	}
 
 	// 列表数据
-	sql := ` SELECT *FROM edb_info_relation where edb_info_id=? ORDER BY relation_time desc, edb_info_id ASC `
+	sql := ` SELECT * FROM edb_info_relation where edb_info_id=? ORDER BY relation_time desc, edb_info_id ASC `
 	sql += `  LIMIT ?,? `
-	_, err = o.Raw(sql, edbInfoId, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, edbInfoId, startSize, pageSize).Find(&items).Error
 
 	return
 }
 
 // 查询相关的指标记录总数
 func GetReplaceChildEdbInfoRelationTotal(edbInfoId int) (total int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	// 数量汇总
 	totalSql := ` SELECT count(*) FROM edb_info_relation where  relation_type=1 and (child_edb_info_id=? or edb_info_id=? ) group by parent_relation_id`
-	err = o.Raw(totalSql, edbInfoId, edbInfoId).QueryRow(&total)
+	err = o.Raw(totalSql, edbInfoId, edbInfoId).Scan(&total).Error
 	if err != nil {
 		return
 	}
+
 	return
 }
 
 // 查询相关的指标记录列表
 func GetReplaceChildEdbInfoRelationList(edbInfoId int, startSize, pageSize int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	// 列表数据
 	sql := ` SELECT * FROM edb_info_relation where  relation_type=1 and (child_edb_info_id=? or edb_info_id=? )  group by parent_relation_id ORDER BY edb_info_relation_id ASC  LIMIT ?,? `
-	_, err = o.Raw(sql, edbInfoId, edbInfoId, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, edbInfoId, edbInfoId, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 // 查询相关的指标记录总数
 func GetReplaceEdbInfoRelationTotal(edbInfoId int) (total int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	// 数量汇总
 	totalSql := ` SELECT count(*) FROM edb_info_relation where edb_info_id=? and relation_type = 0`
-	err = o.Raw(totalSql, edbInfoId).QueryRow(&total)
+	err = o.Raw(totalSql, edbInfoId).Scan(&total).Error
 	if err != nil {
 		return
 	}
+
 	return
 }
 
 // 查询相关的指标记录列表
 func GetReplaceEdbInfoRelationList(edbInfoId int, startSize, pageSize int) (items []*EdbInfoRelation, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	// 列表数据
 	sql := ` SELECT * FROM edb_info_relation where edb_info_id=? and relation_type = 0 ORDER BY edb_info_relation_id ASC LIMIT ?,? `
-	_, err = o.Raw(sql, edbInfoId, startSize, pageSize).QueryRows(&items)
+	err = o.Raw(sql, edbInfoId, startSize, pageSize).Scan(&items).Error
+
 	return
 }
 
 // 替换指标引用表中直接引用的指标
 func ReplaceRelationEdbInfoId(oldEdbInfo, newEdbInfo *EdbInfo, edbRelationIds []int, relationList []*EdbInfoRelation, refreshEdbInfoIds []int, indexCodeList []string) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	o := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = o.Rollback()
@@ -381,7 +383,7 @@ func ReplaceRelationEdbInfoId(oldEdbInfo, newEdbInfo *EdbInfo, edbRelationIds []
 	now := time.Now()
 	// 删除相关的间接引用
 	sql := ` DELETE FROM edb_info_relation WHERE root_edb_info_id=?  and relation_type=1 and parent_relation_id in (` + utils.GetOrmInReplace(len(edbRelationIds)) + `)`
-	_, err = o.Raw(sql, oldEdbInfo.EdbInfoId, edbRelationIds).Exec()
+	err = o.Exec(sql, oldEdbInfo.EdbInfoId, edbRelationIds).Error
 	if err != nil {
 		return
 	}
@@ -389,14 +391,14 @@ func ReplaceRelationEdbInfoId(oldEdbInfo, newEdbInfo *EdbInfo, edbRelationIds []
 	sourceWhere := ` and (refer_object_type in (1,2 ) or (refer_object_type=4 and refer_object_sub_type !=5) )` //平衡表和事件日历中的直接引用无需替换，
 	// 替换edb_info_id
 	sql = ` UPDATE edb_info_relation SET edb_info_id=?, source=?, edb_name=?, edb_code=?, modify_time=?, relation_time=?  WHERE edb_info_id=? ` + sourceWhere + ` and relation_type=0 and edb_info_relation_id in (` + utils.GetOrmInReplace(len(edbRelationIds)) + `)`
-	_, err = o.Raw(sql, newEdbInfo.EdbInfoId, newEdbInfo.Source, newEdbInfo.EdbName, newEdbInfo.EdbCode, now, now, oldEdbInfo.EdbInfoId, edbRelationIds).Exec()
+	err = o.Exec(sql, newEdbInfo.EdbInfoId, newEdbInfo.Source, newEdbInfo.EdbName, newEdbInfo.EdbCode, now, now, oldEdbInfo.EdbInfoId, edbRelationIds).Error
 	if err != nil {
 		return
 	}
 
 	// 更新code值
 	sql = ` UPDATE edb_info_relation SET relation_code=CONCAT_WS("_", edb_info_id,refer_object_id,refer_object_type,refer_object_sub_type)  WHERE relation_type=0 ` + sourceWhere + `  and edb_info_relation_id in (` + utils.GetOrmInReplace(len(edbRelationIds)) + `)`
-	_, err = o.Raw(sql, edbRelationIds).Exec()
+	err = o.Exec(sql, edbRelationIds).Error
 	if err != nil {
 		return
 	}
@@ -408,7 +410,7 @@ func ReplaceRelationEdbInfoId(oldEdbInfo, newEdbInfo *EdbInfo, edbRelationIds []
 				relationCodesMap[relation.RelationCode] = struct{}{}
 			}
 		}
-		_, err = o.InsertMulti(len(relationList), relationList)
+		err = o.CreateInBatches(relationList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -417,7 +419,7 @@ func ReplaceRelationEdbInfoId(oldEdbInfo, newEdbInfo *EdbInfo, edbRelationIds []
 	if len(refreshEdbInfoIds) > 0 {
 		// todo 更新指标的刷新状态
 		sql := ` UPDATE edb_info SET no_update = 0 WHERE  edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) AND no_update = 1`
-		_, err = o.Raw(sql, refreshEdbInfoIds).Exec()
+		err = o.Exec(sql, refreshEdbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -427,7 +429,7 @@ func ReplaceRelationEdbInfoId(oldEdbInfo, newEdbInfo *EdbInfo, edbRelationIds []
 	if len(indexCodeList) > 0 {
 		// 更改数据源的更新状态
 		sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = 0 WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodeList)) + `) and is_stop=1`
-		_, err = o.Raw(sql, indexCodeList).Exec()
+		err = o.Exec(sql, indexCodeList).Error
 		if err != nil {
 			return
 		}
@@ -445,21 +447,19 @@ SET e1.parent_relation_id = e2.edb_info_relation_id
 WHERE  
     e1.relation_type = 1   
     AND e2.relation_type = 0 AND e1.parent_relation_id !=e2.edb_info_relation_id AND e1.relation_code in (` + utils.GetOrmInReplace(len(relationCodes)) + `)`
-			_, err = o.Raw(sql, relationCodes).Exec()
+			err = o.Exec(sql, relationCodes).Error
 			if err != nil {
 				return
 			}
 		}
 	}
+
 	return
 }
 
 // UpdateSecondRelationEdbInfoId 更新指标替换后的间接引用记录
 func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfoRelation, refreshEdbInfoIds []int, indexCodeList []string) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
+	o := global.DmSQL["data"].Begin()
 	defer func() {
 		if err != nil {
 			_ = o.Rollback()
@@ -469,7 +469,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 	}()
 	// 删除相关的间接引用
 	sql := ` DELETE FROM edb_info_relation WHERE relation_type=1 and parent_relation_id in (` + utils.GetOrmInReplace(len(edbRelationIds)) + `)`
-	_, err = o.Raw(sql, edbRelationIds).Exec()
+	err = o.Exec(sql, edbRelationIds).Error
 	if err != nil {
 		return
 	}
@@ -482,7 +482,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 				relationCodesMap[relation.RelationCode] = struct{}{}
 			}
 		}
-		_, err = o.InsertMulti(len(relationList), relationList)
+		err = o.CreateInBatches(relationList, utils.MultiAddNum).Error
 		if err != nil {
 			return
 		}
@@ -491,7 +491,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 	if len(refreshEdbInfoIds) > 0 {
 		// todo 更新指标的刷新状态
 		sql := ` UPDATE edb_info SET no_update = 0 WHERE  edb_info_id IN (` + utils.GetOrmInReplace(len(refreshEdbInfoIds)) + `) AND no_update = 1`
-		_, err = o.Raw(sql, refreshEdbInfoIds).Exec()
+		err = o.Exec(sql, refreshEdbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -501,7 +501,7 @@ func UpdateSecondRelationEdbInfoId(edbRelationIds []int, relationList []*EdbInfo
 	if len(indexCodeList) > 0 {
 		// 更改数据源的更新状态
 		sql := ` UPDATE base_from_mysteel_chemical_index SET is_stop = 0 WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodeList)) + `) and is_stop=1`
-		_, err = o.Raw(sql, indexCodeList).Exec()
+		err = o.Exec(sql, indexCodeList).Error
 		if err != nil {
 			return
 		}
@@ -519,7 +519,7 @@ SET e1.parent_relation_id = e2.edb_info_relation_id
 WHERE  
     e1.relation_type = 1   
     AND e2.relation_type = 0 AND e1.parent_relation_id !=e2.edb_info_relation_id AND e1.relation_code in (` + utils.GetOrmInReplace(len(relationCodes)) + `)`
-			_, err = o.Raw(sql, relationCodes).Exec()
+			err = o.Exec(sql, relationCodes).Error
 			if err != nil {
 				return
 			}

models/data_manage/edb_info_updates.go

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

models/data_manage/edb_python_code.go

@@ -1,7 +1,7 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta_gn/eta_api/global"
 	"time"
 )
 
@@ -17,22 +17,15 @@ type EdbPythonCode struct {
 
 // Update 更新EdbPythonCode信息
 func (edbPythonCode *EdbPythonCode) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(edbPythonCode, cols...)
-	return
-}
+	err = global.DmSQL["data"].Select(cols).Updates(edbPythonCode).Error
 
-// AddEdbPythonCode python指标运算代码
-func AddEdbPythonCode(item *EdbPythonCode) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
 	return
 }
 
 // GetEdbPythonCodeById 根据指标id获取python代码
 func GetEdbPythonCodeById(edbInfoId int) (item *EdbPythonCode, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_python_code WHERE edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, edbInfoId).First(&item).Error
+
 	return
 }

models/data_manage/edb_source.go

@@ -4,7 +4,6 @@ import (
 	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strings"
 )
 
@@ -56,9 +55,9 @@ type EdbSourceChild struct {
 
 // GetEdbSourceItemByCondition 获取指标来源
 func GetEdbSourceItemByCondition(condition string, pars []interface{}) (item *EdbSource, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := fmt.Sprintf(`SELECT * FROM edb_source WHERE 1=1 %s`, condition)
-	err = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, pars).First(&item).Error
+
 	return
 }
 

models/data_manage/edb_terminal.go

@@ -1,8 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -43,9 +43,10 @@ type EdbTerminalCode struct {
 
 // GetEdbTerminalListBySource 根据指标来源类型获取所有的终端列表
 func GetEdbTerminalListBySource(source int) (items []*EdbTerminal, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT *  FROM edb_terminal WHERE source = ? and status=1 ORDER BY terminal_id ASC `
-	_, err = o.Raw(sql, source).QueryRows(&items)
+	err = o.Raw(sql, source).Find(&items).Error
+
 	return
 }
 
@@ -81,58 +82,62 @@ type SetEdbTerminalStatusReq struct {
 
 // GetBaseIndexTerminalCode 获取数据源的终端code
 func GetBaseIndexTerminalCode(edbCode, tableName string) (item BaseIndexTerminalCode, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := fmt.Sprintf(`select terminal_code, index_name from %s where index_code = ? `, tableName)
-	err = o.Raw(sql, edbCode).QueryRow(&item)
+	err = o.Raw(sql, edbCode).Scan(&item).Error
+
 	return
 }
 
 // GetEdbTerminalById 主键获取终端
 func GetEdbTerminalById(id int) (item *EdbTerminal, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_terminal WHERE terminal_id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, id).First(&item).Error
+
 	return
 }
 
 func GetEdbTerminalByTerminalCode(terminalCode string) (item *EdbTerminal, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_terminal WHERE terminal_code = ? LIMIT 1`
-	err = o.Raw(sql, terminalCode).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, terminalCode).First(&item).Error
+
 	return
 }
 
 func GetEdbTerminalList() (item []*EdbTerminalItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_terminal ORDER BY terminal_id ASC`
-	_, err = o.Raw(sql).QueryRows(&item)
+	err = o.Raw(sql).Scan(&item).Error
+
 	return
 }
 
 func GetEdbTerminalBySource(source int) (item []*EdbTerminalItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := ` SELECT * FROM edb_terminal where source=? ORDER BY terminal_id ASC`
-	_, err = o.Raw(sql, source).QueryRows(&item)
+	err = o.Raw(sql, source).Scan(&item).Error
+
 	return
 }
 
 func (item *EdbTerminal) Add() (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Insert(item)
+	err = global.DmSQL["data"].Create(item).Error
+
 	return
 }
 
 func (item *EdbTerminal) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(item, cols...)
+	o := global.DmSQL["data"]
+	err = o.Select(cols).Updates(item).Error
+
 	return
 }
 
 // GetEdbTerminalByCode 根据终端编码获取终端信息
 func GetEdbTerminalByCode(terminalCode string) (item *EdbTerminal, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT *  FROM edb_terminal WHERE terminal_code = ? `
-	err = o.Raw(sql, terminalCode).QueryRow(&item)
+	err = global.DmSQL["data"].Raw(sql, terminalCode).First(&item).Error
+
 	return
 }
 
@@ -143,8 +148,9 @@ type TerminalCodeCountGroup struct {
 
 // GetEdbCountGroupByTerminal 获取终端code分组总数
 func GetEdbCountGroupByTerminal(source int) (list []TerminalCodeCountGroup, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DmSQL["data"]
 	sql := `select terminal_code,count(1) total from edb_info where source = ? AND no_update=0 AND terminal_code != "" group by terminal_code; `
-	_, err = o.Raw(sql, source).QueryRows(&list)
+	err = o.Raw(sql, source).Scan(&list).Error
+
 	return
 }

models/data_manage/excel_style.go

@@ -1,9 +1,8 @@
 package data_manage
 
 import (
+	"eta_gn/eta_api/global"
 	"time"
-
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type ExcelStyle struct {
@@ -173,35 +172,35 @@ type ExcelEdbdataMapping struct {
 }
 
 func AddExcelEdbdataMapping(item *ExcelEdbdataMapping) (err error) {
-	o := orm.NewOrmUsingDB("edb")
-	_, err = o.Insert(item)
+	err = global.DmSQL["edb"].Create(item).Error
+
 	return
 }
 
 func GetExcelEdbdataMappingByTradeCode(classifyId int, frequency string) (excelId *int, err error) {
-	o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT excel_id FROM excel_edbdata_mapping WHERE classify_id = ? AND frequency=?`
-	err = o.Raw(sql, classifyId, frequency).QueryRow(&excelId)
+	err = global.DmSQL["edb"].Raw(sql, classifyId, frequency).Scan(&excelId).Error
+
 	return
 }
 
 func GetExcelStyleById(excelId int) (item *ExcelStyle, err error) {
-	o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT * FROM excel_style WHERE excel_id = ? `
-	err = o.Raw(sql, excelId).QueryRow(&item)
+	err = global.DmSQL["edb"].Raw(sql, excelId).First(&item).Error
+
 	return
 }
 
 func GetExcelEdbdataMappingCount(classifyId int, tradeCode, frequency string) (count int, err error) {
 	sql := `SELECT COUNT(1) AS count FROM excel_edbdata_mapping WHERE classify_id=? AND trade_code=? AND frequency=? `
-	o := orm.NewOrmUsingDB("edb")
-	err = o.Raw(sql, classifyId, tradeCode, frequency).QueryRow(&count)
+	err = global.DmSQL["edb"].Raw(sql, classifyId, tradeCode, frequency).Scan(&count).Error
+
 	return
 }
 
 //func ModifyExcelEdbdataMapping(classifyId int, tradeCode, frequency string) (err error) {
 //	sql := `UPDATE  excel_edbdata_mapping SET CLOSE=?,modify_time=NOW() WHERE  TRADE_CODE=? AND DT=? `
-//	o := orm.NewOrmUsingDB("edb")
+//	o := global.DmSQL["edb"]
 //	_, err = o.Raw(sql, close, tradeCode, dt).Exec()
 //	return
 //}

models/data_manage/manual.go

@@ -27,7 +27,7 @@ func GetManualClassifyEdbInfoCount() (items []*ManualClassifyEdbInfoCount, err e
 			INNER JOIN edbinfo AS b ON a.classify_id=b.classify_id
 			WHERE a.is_show=1
 			GROUP BY a.classify_id `
-	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
+	err = global.DmSQL["edb"].Raw(sql).Find(&items).Error
 	return
 }
 
@@ -42,6 +42,6 @@ func GetManualEdbInfoCountByClassifyId(classifyId int) (total int, err error) {
 	sql := ` SELECT COUNT(1) AS total FROM edbdata_classify AS a
 			INNER JOIN edbinfo AS b ON a.classify_id=b.classify_id
 			WHERE a.is_show=1 AND b.classify_id = ?`
-	err = global.DmSQL["data"].Raw(sql, classifyId).Scan(&total).Error
+	err = global.DmSQL["edb"].Raw(sql, classifyId).Scan(&total).Error
 	return
 }

models/data_manage/manual_classify.go

@@ -27,7 +27,7 @@ type EdbdataClassifyList struct {
 func AddEdbdataClassify(item *EdbdataClassify) (lastId int64, err error) {
 	//o := orm.NewOrmUsingDB("edb")
 	//lastId, err = o.Insert(item)
-	err = global.DmSQL["data"].Create(item).Error
+	err = global.DmSQL["edb"].Create(item).Error
 	return
 }
 
@@ -49,7 +49,7 @@ func GetManualClassifyAll(adminId int) (items []*ManualClassifyList, err error)
 	//}
 
 	sql := ` SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id=0 AND is_show=1 ORDER BY sort ASC ,classify_id ASC `
-	err = global.DmSQL["data"].Raw(sql).Find(&newItems).Error
+	err = global.DmSQL["edb"].Raw(sql).Find(&newItems).Error
 	if err != nil {
 		return
 	}
@@ -66,7 +66,7 @@ func GetManualClassifyAll(adminId int) (items []*ManualClassifyList, err error)
 		//}
 
 		childSql = "SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id=? AND is_show=1 ORDER BY sort ASC ,classify_id ASC "
-		err = global.DmSQL["data"].Raw(childSql, parentId).Find(&childItems).Error
+		err = global.DmSQL["edb"].Raw(childSql, parentId).Find(&childItems).Error
 		if err != nil {
 			return
 		}
@@ -116,7 +116,7 @@ func GetManualClassifyAllV2() (items []*ManualClassifyList, err error) {
 	//}
 
 	sql := ` SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id=0 AND is_show=1 ORDER BY sort ASC ,classify_id ASC `
-	err = global.DmSQL["data"].Raw(sql).Find(&newItems).Error
+	err = global.DmSQL["edb"].Raw(sql).Find(&newItems).Error
 	if err != nil {
 		return
 	}
@@ -132,7 +132,7 @@ func GetManualClassifyAllV2() (items []*ManualClassifyList, err error) {
 		//}
 
 		childSql = "SELECT classify_id,classify_name,parent_id FROM edbdata_classify WHERE parent_id=? AND is_show=1 ORDER BY sort ASC ,classify_id ASC "
-		err = global.DmSQL["data"].Raw(childSql, parentId).Find(&childItems).Error
+		err = global.DmSQL["edb"].Raw(childSql, parentId).Find(&childItems).Error
 		if err != nil {
 			return
 		}
@@ -163,7 +163,7 @@ func GetManualClassifyByClassifyName(classifyName string) (item *EdbdataClassify
 	//err = o.Raw(sql, classifyName).QueryRow(&item)
 
 	sql := `SELECT * FROM edbdata_classify WHERE classify_name=? `
-	err = global.DmSQL["data"].Raw(sql, classifyName).First(&item).Error
+	err = global.DmSQL["edb"].Raw(sql, classifyName).First(&item).Error
 	return
 }
 
@@ -173,7 +173,7 @@ func ModifyManualClassifyIsShow(isShow, classifyId, parentId int) (err error) {
 	//_, err = o.Raw(sql, isShow, parentId, classifyId).Exec()
 
 	sql := `UPDATE edbdata_classify SET is_show=?,parent_id=? WHERE classify_id=? `
-	err = global.DmSQL["data"].Exec(sql, isShow, parentId, classifyId).Error
+	err = global.DmSQL["edb"].Exec(sql, isShow, parentId, classifyId).Error
 	return
 }
 
@@ -194,7 +194,7 @@ func GetManualClassifyById(classifyId int) (item *EdbdataClassify, err error) {
 	//err = o.Raw(sql, classifyId).QueryRow(&item)
 
 	sql := ` SELECT * FROM edbdata_classify WHERE classify_id=? `
-	err = global.DmSQL["data"].Raw(sql, classifyId).First(&item).Error
+	err = global.DmSQL["edb"].Raw(sql, classifyId).First(&item).Error
 	return
 }
 
@@ -220,7 +220,7 @@ func ModifyManualClassifyName(classifyName string, classifyId, parentId int) (er
 	sql := `UPDATE edbdata_classify SET ` + updateStr + ` WHERE classify_id=? `
 
 	pars = append(pars, classifyId)
-	err = global.DmSQL["data"].Exec(sql, pars).Error
+	err = global.DmSQL["edb"].Exec(sql, pars).Error
 	return
 }
 
@@ -238,7 +238,7 @@ func GetManualClassifyAllByCondition(condition string) (items []*EdbdataClassify
 		sql += condition
 	}
 	sql += `  ORDER BY sort ASC `
-	err = global.DmSQL["data"].Raw(sql).Find(&items).Error
+	err = global.DmSQL["edb"].Raw(sql).Find(&items).Error
 	return
 }
 
@@ -249,6 +249,6 @@ func GetChildManualClassifyCount(parentId int) (count int, err error) {
 	//err = o.Raw(sql, parentId).QueryRow(&count)
 
 	sql := `SELECT COUNT(1) AS count FROM edbdata_classify WHERE parent_id=? AND is_show = 1`
-	err = global.DmSQL["data"].Raw(sql, parentId).Scan(&count).Error
+	err = global.DmSQL["edb"].Raw(sql, parentId).Scan(&count).Error
 	return
 }