data_manage数据库兼容

models/data_manage/edb_classify.go

@@ -1,15 +1,15 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"strconv"
 	"time"
 )
 
 type EdbClassify struct {
-	ClassifyId             int       `orm:"column(classify_id);pk"`
+	ClassifyId             int       `gorm:"column:classify_id;primaryKey"`
 	ClassifyType           uint8     `description:"分类类型，0：普通指标分类，1：预测指标分类"`
 	ClassifyName           string    `description:"分类名称"`
 	ParentId               int       `description:"父级id"`
@@ -29,8 +29,13 @@ type EdbClassify struct {
 }
 
 func AddEdbClassify(item *EdbClassify) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	//o := orm.NewOrmUsingDB("data")
+	//lastId, err = o.Insert(item)
+	err = global.DbMap[utils.DbNameIndex].Create(item).Error
+	if err != nil {
+		return
+	}
+	lastId = int64(item.ClassifyId)
 	return
 }
 
@@ -51,9 +56,10 @@ 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")
+	//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.DbMap[utils.DbNameIndex].Raw(sql, parentId, classifyName, classifyType).Scan(&count).Error
+	//err = o.Raw(sql, parentId, classifyName, classifyType).QueryRow(&count)
 	return
 }
 
@@ -67,9 +73,10 @@ 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")
+	//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 = o.Raw(sql, parentId, classifyNameEn, classifyType).QueryRow(&count)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, parentId, classifyNameEn, classifyType).Scan(&count).Error
 	return
 }
 
@@ -80,16 +87,18 @@ type EditEdbClassifyReq struct {
 }
 
 func GetEdbClassifyById(classifyId int) (item *EdbClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&item)
+	//err = o.Raw(sql, classifyId).QueryRow(&item)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyId).First(&item).Error
 	return
 }
 
 func GetEdbClassifyCountById(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT count(1) AS count FROM edb_classify WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&count)
+	//err = o.Raw(sql, classifyId).QueryRow(&count)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyId).Scan(&count).Error
 	return
 }
 
@@ -103,9 +112,10 @@ 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")
+	//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 = o.Raw(sql, classifyName, userId, userRealName, classifyId).Exec()
+	err = global.DbMap[utils.DbNameIndex].Exec(sql, classifyName, userId, userRealName, classifyId).Error
 	return
 }
 
@@ -119,9 +129,10 @@ 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")
+	//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 = o.Raw(sql, classifyNameEn, userId, userRealName, classifyId).Exec()
+	err = global.DbMap[utils.DbNameIndex].Exec(sql, classifyNameEn, userId, userRealName, classifyId).Error
 	return
 }
 
@@ -131,7 +142,7 @@ type DeleteEdbClassifyReq struct {
 }
 
 func GetEdbInfoCountByClassifyId(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 
@@ -144,12 +155,13 @@ 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 = o.Raw(sql, classifyId).QueryRow(&count)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyId).Scan(&count).Error
 	return
 }
 
 func DeleteEdbClassify(classifyId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` DELETE FROM edb_classify
 				WHERE classify_id IN(
 				SELECT t.classify_id FROM
@@ -162,19 +174,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 = o.Raw(sql, classifyId).Exec()
+	err = global.DbMap[utils.DbNameIndex].Exec(sql, classifyId).Error
 	return
 }
 
 func GetEdbClassifyByParentId(parentId int, classifyType int8) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("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).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, parentId, classifyType).Find(&items).Error
 	return
 }
 
 func GetEdbClassifyByRootIdLevel(rootId int, classifyType uint8, orderStr string) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_classify WHERE root_id=? AND classify_type = ? `
 	if orderStr != "" {
 		sql += orderStr
@@ -182,54 +196,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).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, rootId, classifyType).Find(&items).Error
 	return
 }
 
 func GetEdbClassifyByRootIdLevelOrder(rootId int, classifyType uint8) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("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).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, rootId, classifyType).Find(&items).Error
 	return
 }
 
 // GetEdbClassifyAll 获取普通指标的分类列表
 func GetEdbClassifyAll() (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("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).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql).Find(&items).Error
 	return
 }
 
 // GetAllEdbClassify 获取所有的普通指标的分类列表（包含第一级）
 func GetAllEdbClassify() (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("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).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql).Find(&items).Error
 	return
 }
 
 // GetNormalEdbClassifyAll 获取普通指标的分类列表
 func GetNormalEdbClassifyAll() (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("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).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql).Find(&items).Error
 	return
 }
 
 // GetPredictEdbClassifyAll 获取预测指标的分类列表
 func GetPredictEdbClassifyAll() (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("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).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql).Find(&items).Error
 	return
 }
 
 // GetAllEdbClassifyByType 根据类型获取分类列表
 func GetAllEdbClassifyByType(classifyType int) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("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).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyType).Find(&items).Error
 	return
 }
 
@@ -321,7 +342,7 @@ type ClassifyDeleteCheckReq struct {
 }
 
 func GetClassifyCountByClassifyId(classifyId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT COUNT(1) AS count FROM (
 			SELECT rd.*
 			FROM (SELECT * FROM edb_classify WHERE parent_id IS NOT NULL) rd,
@@ -331,7 +352,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).QueryRow(&count)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyId, classifyId).Scan(&count).Error
 	return
 }
 
@@ -344,12 +366,13 @@ type EdbClassifySimplify struct {
 // 递归获取所有目录
 func GetClassifyAllByClassifyId(classifyId int) (resultList []*EdbClassifySimplify, err error) {
 	fmt.Println("185")
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, classifyId).QueryRow(&item)
+		err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyId).Scan(item).Error
 		if err != nil {
 			break
 		}
@@ -376,43 +399,48 @@ type MoveEdbClassifyReq struct {
 
 // GetFirstEdbClassifyByParentId 获取当前父级分类下，且排序数相同 的排序第一条的数据
 func GetFirstEdbClassifyByParentId(parentId int) (item *EdbClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("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).QueryRow(&item)
+	err = global.DbMap[utils.DbNameIndex].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")
+	//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 = o.Raw(sql, parentId, nowSort, classifyType).Exec()
+	err = global.DbMap[utils.DbNameIndex].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...)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Update(edbClassify, cols...)
+	err = global.DbMap[utils.DbNameIndex].Model(&edbClassify).Select(cols).Updates(edbClassify).Error
 	return
 }
 
 // GetEdbClassifyMaxSort 获取分类下最大的排序数
 func GetEdbClassifyMaxSort(parentId int, classifyType uint8) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, parentId, classifyType).QueryRow(&sort)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, parentId, classifyType).Scan(&sort).Error
 	return
 }
 
 // GetEdbInfoMaxSortByClassifyId 获取分类下指标的最大的排序数
 func GetEdbInfoMaxSortByClassifyId(classifyId int) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT Max(sort) AS sort FROM edb_info WHERE classify_id=? `
-	err = o.Raw(sql, classifyId).QueryRow(&sort)
+	//err = o.Raw(sql, classifyId).QueryRow(&sort)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyId).Scan(&sort).Error
 	return
 }
 
@@ -422,16 +450,18 @@ type ClassifyEdbInfoListResp struct {
 
 // GetEdbClassifyAllV2 获取普通指标的分类列表
 func GetEdbClassifyAllV2(classifyType int8) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, classifyType).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyType).Find(&items).Error
 	return
 }
 
 func GetEdbClassifyByParentIdTwo(classifyType int8) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, classifyType).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyType).Find(&items).Error
 	return
 }
 
@@ -444,23 +474,26 @@ type AddEdbClassifyReqV2 struct {
 
 // GetEdbClassifyMaxSortV2 获取分类下最大的排序数
 func GetEdbClassifyMaxSortV2(parentId int, classifyType uint8) (sort int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, parentId, classifyType).QueryRow(&sort)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, parentId, classifyType).Scan(&sort).Error
 	return
 }
 
 func GetEdbClassifyByLevel(level, source int) (items []*EdbClassifyItems, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_classify WHERE level=? AND classify_type = ? `
-	_, err = o.Raw(sql, level, source).QueryRows(&items)
+	//_, err = o.Raw(sql, level, source).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, level, source).Find(&items).Error
 	return
 }
 
 func FIXEdbClassifyId(newId, oldId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` UPDATE edb_info SET classify_id=? WHERE classify_id=? `
-	_, err = o.Raw(sql, newId, oldId).Exec()
+	//_, err = o.Raw(sql, newId, oldId).Exec()
+	err = global.DbMap[utils.DbNameIndex].Exec(sql, newId, oldId).Error
 	return
 }
 
@@ -543,7 +576,7 @@ func FixPredictEdbClassify() {
 }
 
 func GetEdbClassify(classifyId int) (classifyIds string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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=?
@@ -557,7 +590,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 = o.Raw(sql, classifyId, classifyId, classifyId).QueryRow(&classifyIds)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyId, classifyId, classifyId).Scan(&classifyIds).Error
 	return
 }
 
@@ -578,9 +612,10 @@ func FixEdbClassifySysUser() {
 }
 
 func EditEdbClassifySysUser(classifyId, sysUserId int, chartClassifyName string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, sysUserId, chartClassifyName, classifyId).Exec()
+	err = global.DbMap[utils.DbNameIndex].Exec(sql, sysUserId, chartClassifyName, classifyId).Error
 	return
 }
 
@@ -601,7 +636,7 @@ func FixPredictEdbClassifySysUser() {
 }
 
 func UpdateEdbClassifyChildByParentClassifyId(classifyIds []int, rootId int, levelStep int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	var pars []interface{}
 	pars = append(pars, rootId, levelStep)
 	pars = append(pars, classifyIds)
@@ -609,7 +644,8 @@ 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 = o.Raw(sql, pars).Exec()
+	err = global.DbMap[utils.DbNameIndex].Exec(sql, pars...).Error
 	if err != nil {
 		return
 	}
@@ -618,9 +654,10 @@ where classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
 
 // GetEdbClassifyByParentIdAndName 根据父级ID和名称获取分类
 func GetEdbClassifyByParentIdAndName(parentId int, classifyName string, classifyId int) (item *EdbClassify, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, parentId, classifyName, classifyId).QueryRow(&item)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, parentId, classifyName, classifyId).First(&item).Error
 	return
 }
 
@@ -636,9 +673,11 @@ 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)
+	//o := orm.NewOrmUsingDB("data")
+	//sql := `SELECT * FROM edb_classify WHERE classify_id in (` + utils.GetOrmInReplace(num) + `) `
+	//_, err = o.Raw(sql, classifyIdList).QueryRows(&item)
+	sql := `SELECT * FROM edb_classify WHERE classify_id in ? `
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyIdList).Find(&item).Error
 	return
 }
 
@@ -651,16 +690,19 @@ 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")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM edb_classify WHERE   classify_type = ? AND is_join_permission = ? `
-	_, err = o.Raw(sql, classifyType, isJoinPermission).QueryRows(&items)
+	//_, err = o.Raw(sql, classifyType, isJoinPermission).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyType, isJoinPermission).Find(&items).Error
 	return
 }
 
 // GetEdbClassifyRootIdsByClassifyIds 获取普通指标的顶级分类列表
 func GetEdbClassifyRootIdsByClassifyIds(classifyIds []int) (items []int, err error) {
-	o := orm.NewOrmUsingDB("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)
+	//o := orm.NewOrmUsingDB("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)
+	sql := `SELECT distinct root_id FROM edb_classify WHERE classify_type=0 and classify_id in ?`
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, classifyIds).Find(&items).Error
 	return
 }

models/data_manage/edb_config.go

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

models/data_manage/edb_data_baiinfo.go

@@ -1,20 +1,34 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
+	"time"
 )
 
 type BaseFromBaiinfoDataSimple struct {
-	BaiinfoDataId          int `orm:"column(baiinfo_data_id);pk"`
+	//BaiinfoDataId          int `orm:"column(baiinfo_data_id);pk"`
+	BaiinfoDataId          int `gorm:"column:baiinfo_data_id;primaryKey"`
 	BaseFromBaiinfoIndexId int
 	IndexCode              string
 	DataTime               string
 	Value                  string
 }
+type BaseFromBaiinfoDataDateStruct struct {
+	MinDate time.Time `gorm:"column:min_date"`
+	MaxDate time.Time `gorm:"column:max_date"`
+}
 
 func GetEdbDataBaiinfoMaxAndMinDate(edbCode string) (min_date, max_date string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+	var ormItem BaseFromBaiinfoDataDateStruct
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).Scan(&ormItem).Error
+	if err != nil {
+		return
+	}
+	min_date = ormItem.MinDate.Format(utils.FormatDate)
+	max_date = ormItem.MaxDate.Format(utils.FormatDate)
 	return
 }

models/data_manage/edb_data_base.go

@@ -1,13 +1,13 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
 	"eta/eta_api/models/mgo"
 	"eta/eta_api/utils"
 	"fmt"
 	"strconv"
 	"time"
 
-	"github.com/beego/beego/v2/client/orm"
 	"go.mongodb.org/mongo-driver/bson"
 )
 
@@ -222,7 +222,8 @@ func GetEdbDataTableName(source, subSource int) (tableName string) {
 //}
 
 type EdbDataBase struct {
-	EdbDataId     int `orm:"column(edb_data_id);pk"`
+	//EdbDataId     int `orm:"column(edb_data_id);pk"`
+	EdbDataId     int `gorm:"column:edb_data_id;primaryKey"`
 	EdbInfoId     int
 	EdbCode       string
 	DataTime      string
@@ -248,7 +249,7 @@ 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")
+	//o := orm.NewOrmUsingDB("data")
 
 	tableName := GetEdbDataTableName(source, subSource)
 	sql := ` SELECT * FROM %s WHERE edb_code=? ORDER BY data_time DESC`
@@ -257,19 +258,21 @@ 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 = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
 func GetEdbDataBaseByEdbInfoId(edbInfoId int, source, subSource int) (items []*EdbDataBase, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, edbInfoId).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbInfoId).Find(&items).Error
 	return
 }
 
@@ -333,7 +336,7 @@ 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")
+	//o := orm.NewOrmUsingDB("data")
 
 	tableName := GetBaseIndexTableName(source)
 	if tableName == "" {
@@ -343,7 +346,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 = o.Raw(sql, pars).QueryRow(&item)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&item).Error
 	return
 }
 
@@ -357,7 +361,7 @@ 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")
+	//o := orm.NewOrmUsingDB("data")
 
 	tableName := GetEdbDataTableNameAndSubSource(source, subSource)
 	sql := ` SELECT * FROM %s WHERE edb_code=? ORDER BY data_time DESC`
@@ -366,7 +370,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 = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -399,14 +404,16 @@ 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")
+	//o := orm.NewOrmUsingDB("data")
 
-	sql := ` SELECT * FROM edb_data_ys WHERE edb_code IN (` + utils.GetOrmInReplace(len(edbCodes)) + `) ORDER BY data_time DESC`
+	//sql := ` SELECT * FROM edb_data_ys WHERE edb_code IN (` + utils.GetOrmInReplace(len(edbCodes)) + `) ORDER BY data_time DESC`
+	sql := ` SELECT * FROM edb_data_ys WHERE edb_code IN ? ORDER BY data_time DESC`
 	if limit > 0 {
 		sql += `  LIMIT ?  `
 		pars = append(pars, limit)
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	//_, err = o.Raw(sql, pars).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
 	return
 }