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

# Conflicts:
#	models/data_manage/edb_data_insert_config.go

models/data_manage/edb_data_cffex.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -29,7 +30,8 @@ type BaseInfoFromCffex struct {
 }
 
 type BaseFromTradeCFFEXIndex struct {
-	BaseFromTradeCffexIndexId int `orm:"column(base_from_trade_cffex_index_id);pk"`
+	//BaseFromTradeCffexIndexId int `orm:"column(base_from_trade_cffex_index_id);pk"`
+	BaseFromTradeCffexIndexId int `gorm:"column:base_from_trade_cffex_index_id;primaryKey"`
 	Rank                      int
 	DealShortName             string
 	DealName                  string
@@ -53,19 +55,32 @@ type BaseFromTradeCFFEXIndex struct {
 	ModifyTime                time.Time
 	DataTime                  string
 }
+type MaxAndMinDate struct {
+	MaxDate time.Time `gorm:"column:maxDate"`
+	MinDate time.Time `gorm:"column:minDate"`
+}
 
 func GetEdbDataCffexMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 // GetBaseInfoFromCffexByIndexCode 获取指标信息
 func GetBaseInfoFromCffexByIndexCode(indexCode, suffix string) (list []*BaseInfoFromCffex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexCode).Find(&list).Error
 	return
 }

models/data_manage/edb_data_coal.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -12,7 +13,8 @@ type CoalData struct {
 }
 
 type BaseFromCoalDataSimple struct {
-	Id        int `orm:"column(base_from_trade_coal_index_id);pk"`
+	//Id        int `orm:"column(base_from_trade_coal_index_id);pk"`
+	Id        int `gorm:"column:base_from_trade_coal_index_id;primaryKey"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -29,7 +31,8 @@ type BaseInfoFromCoal struct {
 }
 
 type BaseFromTradeCoalIndex struct {
-	BaseFromTradeCoalIndexId int `orm:"column(base_from_trade_coal_index_id);pk"`
+	//BaseFromTradeCoalIndexId int `orm:"column(base_from_trade_coal_index_id);pk"`
+	BaseFromTradeCoalIndexId int `gorm:"column:base_from_trade_coal_index_id;primaryKey"`
 	Rank                     int
 	DealShortName            string
 	DealName                 string
@@ -55,17 +58,25 @@ type BaseFromTradeCoalIndex struct {
 }
 
 func GetEdbDataCoalMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 // GetBaseInfoFromCoalByIndexCode 获取指标信息
 func GetBaseInfoFromCoalByIndexCode(indexCode, suffix string) (list []*BaseInfoFromCoal, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexCode).Find(&list).Error
 	return
 }

models/data_manage/edb_data_dl.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -12,7 +13,8 @@ type DlData struct {
 }
 
 type BaseFromDlDataSimple struct {
-	Id        int `orm:"column(base_from_trade_dalian_index_id);pk"`
+	//Id        int `orm:"column(base_from_trade_dalian_index_id);pk"`
+	Id        int `gorm:"column:base_from_trade_dalian_index_id;primaryKey"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -29,7 +31,8 @@ type BaseInfoFromDl struct {
 }
 
 type BaseFromTradeDalianIndex struct {
-	BaseFromTradeDalianIndexId int `orm:"column(base_from_trade_dalian_index_id);pk"`
+	//BaseFromTradeDalianIndexId int `orm:"column(base_from_trade_dalian_index_id);pk"`
+	BaseFromTradeDalianIndexId int `gorm:"column:base_from_trade_dalian_index_id;primaryKey"`
 	Rank                       int
 	DealShortName              string
 	DealName                   string
@@ -55,17 +58,25 @@ type BaseFromTradeDalianIndex struct {
 }
 
 func GetEdbDataDlMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 // GetBaseInfoFromDalianByIndexCode 获取指标信息
 func GetBaseInfoFromDalianByIndexCode(indexCode, suffix string) (list []*BaseInfoFromDl, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexCode).Find(&list).Error
 	return
 }

models/data_manage/edb_data_from_python.go

@@ -1,13 +1,15 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
 // EdbDataPython python指标数据结构体
 type EdbDataPython 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
@@ -19,9 +21,10 @@ type EdbDataPython struct {
 
 // GetAllEdbDataPythonByEdbInfoId 根据指标id获取全部的数据
 func GetAllEdbDataPythonByEdbInfoId(edbInfoId int) (items []*EdbDataPython, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbInfoId).Find(&items).Error
+	//_, err = o.Raw(sql, edbInfoId).QueryRows(&items)
 	return
 }
 

models/data_manage/edb_data_fubao.go

@@ -1,13 +1,22 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 )
 
 // 富宝数据
 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)
+	//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)
+	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_ths WHERE edb_code=? `
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	min_date = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	max_date = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }

models/data_manage/edb_data_gie.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -12,14 +13,22 @@ type GieData struct {
 }
 
 func GetEdbDataGieMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 type EicIndexV2 struct {
-	BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+	//BaseFromEicIndexId     int `orm:"column(base_from_eic_index_id);pk"`
+	BaseFromEicIndexId     int `gorm:"column:base_from_eic_index_id;primaryKey"`
 	Type                   string
 	EicCode                string
 	Name                   string
@@ -53,7 +62,7 @@ type EicIndexV2 struct {
 }
 
 func GetBaseFromEicDataAllByIndexCodeV2(indexCode, suffix string) (list []*BaseFromTradeEicIndexV2, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	var name string
 	if suffix == "" {
 		name = "eic_code"
@@ -80,6 +89,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 = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexCode).Find(&list).Error
 	return
 }

models/data_manage/edb_data_gl.go

@@ -1,13 +1,22 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 )
 
 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)
+	//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)
+	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_gl WHERE edb_code=? `
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	min_date = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	max_date = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 

models/data_manage/edb_data_gz.go

@@ -1,6 +1,8 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 )
@@ -11,9 +13,16 @@ type GzData struct {
 }
 
 func GetEdbDataGzMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 

models/data_manage/edb_data_hisugar.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type HisugarData struct {
@@ -11,14 +12,22 @@ type HisugarData struct {
 }
 
 func GetEdbDataHisugarMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_hisugar WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 type BaseFromHisugarIndexItem struct {
-	BaseFromSciIndexId int    `orm:"column(base_from_hisugar_index_id);pk"` // 主键，自动递增
+	//BaseFromSciIndexId int    `orm:"column(base_from_hisugar_index_id);pk"` // 主键，自动递增
+	BaseFromSciIndexId int    `gorm:"column:base_from_hisugar_index_id;primaryKey"` // 主键，自动递增
 	IndexCode          string // 指标编码
 	IndexName          string // 指标名称
 	ClassifyId         int    // 分类Id
@@ -31,9 +40,10 @@ type BaseFromHisugarIndexItem struct {
 
 // GetBaseInfoFromHisugarByIndexCode 获取指标信息
 func GetBaseInfoFromHisugarByIndexCode(indexCode string) (item *BaseFromHisugarIndexItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM base_from_hisugar_index WHERE index_code=? `
 	sql = fmt.Sprintf(sql)
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	//err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexCode).First(&item).Error
 	return
 }

models/data_manage/edb_data_icpi.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type IcpiData struct {
@@ -11,9 +12,16 @@ type IcpiData struct {
 }
 
 func GetEdbDataIcpiMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
@@ -31,9 +39,10 @@ type IcpiIndexView struct {
 
 // GetBaseInfoFromShByIndexCode 获取指标信息
 func GetBaseInfoFromIcpiByIndexCode(indexCode string) (item *IcpiIndexView, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexCode).First(&item).Error
 	return
 }

models/data_manage/edb_data_insert_config.go

@@ -2,19 +2,21 @@ package data_manage
 
 import (
 	"errors"
+	"eta/eta_api/global"
 	"eta/eta_api/models/mgo"
 	"eta/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"
 )
 
 // EdbDataInsertConfig 指标数据插入配置表
 type EdbDataInsertConfig struct {
-	EdbInfoId  int       `orm:"column(edb_info_id);pk" description:"指标id"`
+	//EdbInfoId  int       `orm:"column(edb_info_id);pk" description:"指标id"`
+	EdbInfoId  int       `gorm:"column:edb_info_id;primaryKey" description:"指标id"`
 	Date       time.Time `description:"插入的日期"`
 	Value      string    `description:"插入的值"`
 	RealDate   time.Time `description:"实际数据的值日期"`
@@ -24,9 +26,10 @@ type EdbDataInsertConfig struct {
 
 // GetEdbDataInsertConfigByEdbId 根据指标id 获取数据插入配置详情
 func GetEdbDataInsertConfigByEdbId(edbInfoId int) (item *EdbDataInsertConfig, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM edb_data_insert_config WHERE edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	//err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbInfoId).First(&item).Error
 	return
 }
 
@@ -37,9 +40,11 @@ func GetEdbDataInsertConfigByEdbIdList(edbInfoIdList []int) (items []*EdbDataIns
 		return
 	}
 
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM edb_data_insert_config WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, edbInfoIdList).QueryRows(&items)
+	//o := orm.NewOrmUsingDB("data")
+	//sql := ` SELECT * FROM edb_data_insert_config WHERE edb_info_id in (` + utils.GetOrmInReplace(num) + `) `
+	sql := ` SELECT * FROM edb_data_insert_config WHERE edb_info_id in ? `
+	//_, err = o.Raw(sql, edbInfoIdList).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbInfoIdList).Find(&items).Error
 	return
 }
 
@@ -66,7 +71,8 @@ func CreateEdbDataInsertConfigAndData(edbInfo *EdbInfo, date time.Time, value st
 		saveValue = utils.SubFloatToString(floatValue, 30)
 	}
 
-	to, err := orm.NewOrmUsingDB("data").Begin()
+	//to, err := orm.NewOrmUsingDB("data").Begin()
+	to := global.DbMap[utils.DbNameIndex].Begin()
 	if err != nil {
 		return
 	}
@@ -83,7 +89,8 @@ 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
+		//err = to.Raw(sql, edbInfo.EdbInfoId).QueryRow(&item)
 		if err != nil && !utils.IsErrNoRow(err) {
 			return
 		}
@@ -112,7 +119,8 @@ func CreateEdbDataInsertConfigAndData(edbInfo *EdbInfo, date time.Time, value st
 				ModifyTime: time.Now(),
 				CreateTime: time.Now(),
 			}
-			_, err = to.Insert(item)
+			err = to.Create(&item).Error
+			//_, err = to.Insert(item)
 		} else {
 			if date.Equal(item.RealDate) || date.Before(item.RealDate) {
 				errMsg = `选择日期不能早于/等于数据最新日期`
@@ -125,7 +133,8 @@ 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.Update(item, "Date", "Value", "ModifyTime")
+			err = to.Model(&item).Select([]string{"Date", "Value", "ModifyTime"}).Updates(&item).Error
 		}
 		if err != nil {
 			return
@@ -146,8 +155,8 @@ func CreateEdbDataInsertConfigAndData(edbInfo *EdbInfo, date time.Time, value st
 
 	// 指标信息更新
 	edbInfo.EndDate = dateStr
-	_, err = to.Update(edbInfo, "EndDate")
-
+	//_, err = to.Update(edbInfo, "EndDate")
+	err = to.Model(&edbInfo).Select([]string{"EndDate"}).Updates(&edbInfo).Error
 	return
 }
 
@@ -162,7 +171,8 @@ 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 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 +200,8 @@ 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, tableName, edbInfo.EdbInfoId, oldConfigDate.Format(utils.FormatDate)).First(&edbDateData).Error
+			//err = to.Raw(sql, edbInfo.EdbInfoId, oldConfigDate.Format(utils.FormatDate)).QueryRow(&edbDateData)
 			if err != nil && !utils.IsErrNoRow(err) {
 				return
 			}
@@ -201,12 +212,14 @@ 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
+			//_, err = to.Raw(addSql).Exec()
 		} 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).QueryRow(&offsetDate)
+			err = to.Raw(sql, edbInfo.EdbInfoId).Scan(&offsetDate).Error
 			if err != nil && !utils.IsErrNoRow(err) {
 				return
 			}
@@ -215,11 +228,13 @@ 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.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.Raw(updateSql).Exec()
+			err = to.Exec(updateSql).Error
 		}
 		if err != nil {
 			return
@@ -240,7 +255,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 +354,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,21 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 )
 
 func GetEdbDataLzMaxOrMinDate(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_lz WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+	//o := orm.NewOrmUsingDB("data")
+	//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)
+	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_lz WHERE edb_code=? `
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	min_date = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	max_date = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }

models/data_manage/edb_data_manual.go

@@ -1,19 +1,29 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
 func GetEdbDataManualMaxOrMinDate(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_manual WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+	//o := orm.NewOrmUsingDB("data")
+	//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)
+	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_manual WHERE edb_code=? `
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	min_date = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	max_date = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 type ManualEdbdata struct {
-	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
+	TradeCode string `gorm:"column:TRADE_CODE;primaryKey" description:"指标编码"`
+	//TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
 	Dt         string    `orm:"column(DT)" description:"日期"`
 	Close      string    `orm:"column(CLOSE)" description:"值"`
 	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`

models/data_manage/edb_data_mysteel_chemical.go

@@ -1,21 +1,30 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 )
 
 // GetEdbDataMysteelChemicalMaxOrMinDate 根据钢联化工指标code获取最大、最小日期
 func GetEdbDataMysteelChemicalMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 // 更新钢联化工指标的刷新状态
 func UpdateMysteelChemicalRefreshStatus(edbCode string, isStop int) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, isStop, edbCode).Exec()
+	err = global.DbMap[utils.DbNameIndex].Exec(sql, isStop, edbCode).Error
 	return
 }

models/data_manage/edb_data_oilchem.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type OilchemData struct {
@@ -11,14 +12,22 @@ type OilchemData struct {
 }
 
 func GetEdbDataOilchemMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 type BaseFromOilchemIndexItem struct {
-	BaseFromSciIndexId int    `orm:"column(base_from_oilchem_index_id);pk"` // 主键，自动递增
+	//BaseFromSciIndexId int    `orm:"column(base_from_oilchem_index_id);pk"` // 主键，自动递增
+	BaseFromSciIndexId int    `gorm:"column:base_from_oilchem_index_id;primaryKey"` // 主键，自动递增
 	IndexCode          string // 指标编码
 	IndexName          string // 指标名称
 	ClassifyId         int    // 分类Id
@@ -31,9 +40,10 @@ type BaseFromOilchemIndexItem struct {
 
 // GetBaseInfoFromOilchemByIndexCode 获取指标信息
 func GetBaseInfoFromOilchemByIndexCode(indexCode string) (item *BaseFromOilchemIndexItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("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).QueryRow(&item)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexCode).First(&item).Error
 	return
 }

models/data_manage/edb_data_pb.go

@@ -1,12 +1,14 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
 type EdbDataPb 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
@@ -20,8 +22,16 @@ type EdbDataPb struct {
 }
 
 func GetEdbDataPbMaxOrMinDate(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_pb WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+	//o := orm.NewOrmUsingDB("data")
+	//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)
+	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_pb WHERE edb_code=? `
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	min_date = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	max_date = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }

models/data_manage/edb_data_quarter.go

@@ -1,9 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"sort"
 	"strconv"
 	"strings"
@@ -13,16 +13,18 @@ import (
 )
 
 func GetEdbDataQuarterCount(edbInfoId int) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(hsql, edbInfoId).QueryRow(&count)
+	err = global.DbMap[utils.DbNameIndex].Raw(hsql, edbInfoId).Scan(&count).Error
 	return
 }
 
 // 指标季度数据计算
 func AddCalculateQuarter(edbInfoId, source int, edbCode string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
+	//o := orm.NewOrmUsingDB("data")
+	//to, err := o.Begin()
+	to := global.DbMap[utils.DbNameIndex].Begin()
 	if err != nil {
 		return
 	}
@@ -74,7 +76,8 @@ 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).QueryRow(&currentHolidayObj)
+		err = to.Raw(hsql, currentYear).First(currentHolidayObj).Error
 		if err != nil {
 			fmt.Println("get holiday err:" + err.Error())
 			return err
@@ -193,7 +196,8 @@ 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.Raw(addSql).Exec()
+		err = to.Exec(addSql).Error
 		fmt.Println("err:", err)
 		if err != nil {
 			return err
@@ -741,9 +745,10 @@ type HzTestEdbdata struct {
 }
 
 func GetHzTestEdbdata() (list []*HzTestEdbdata, err error) {
-	o := orm.NewOrm()
+	//o := orm.NewOrm()
 	sql := ` SELECT * FROM hz_test_edbdata WHERE TRADE_CODE=? ORDER BY DT DESC `
-	_, err = o.Raw(sql, "ST_0000577845").QueryRows(&list)
+	//_, err = o.Raw(sql, "ST_0000577845").QueryRows(&list)
+	err = global.DEFAULT_DB.Raw(sql, "ST_0000577845").Find(&list).Error
 	return
 }
 

models/data_manage/edb_data_sci.go

@@ -1,12 +1,21 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 )
 
 func GetEdbDataSciMaxAndMinDate(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_sci WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+	//o := orm.NewOrmUsingDB("data")
+	//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)
+	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_sci WHERE edb_code=? `
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	min_date = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	max_date = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }

models/data_manage/edb_data_sci99.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type Sci99Data struct {
@@ -11,14 +12,22 @@ type Sci99Data struct {
 }
 
 func GetEdbDataSci99MaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 type BaseFromSci99IndexItem struct {
-	BaseFromSciIndexId int    `orm:"column(base_from_sci99_index_id);pk"` // 主键，自动递增
+	//BaseFromSciIndexId int    `orm:"column(base_from_sci99_index_id);pk"` // 主键，自动递增
+	BaseFromSciIndexId int    `gorm:"column:base_from_sci99_index_id;primaryKey"` // 主键，自动递增
 	IndexCode          string // 指标编码
 	IndexName          string // 指标名称
 	ClassifyId         int    // 分类Id
@@ -31,9 +40,10 @@ type BaseFromSci99IndexItem struct {
 
 // GetBaseInfoFromSci99ByIndexCode 获取指标信息
 func GetBaseInfoFromSci99ByIndexCode(indexCode string) (item *BaseFromSci99IndexItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, indexCode).QueryRow(&item)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexCode).First(&item).Error
 	return
 }

models/data_manage/edb_data_sci_hq.go

@@ -1,10 +1,21 @@
 package data_manage
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
+)
 
 func GetEdbDataSciHqMaxAndMinDate(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_sci_hq WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+	//o := orm.NewOrmUsingDB("data")
+	//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)
+	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_sci_hq WHERE edb_code=? `
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	min_date = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	max_date = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }

models/data_manage/edb_data_sh.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -12,7 +13,8 @@ type ShData struct {
 }
 
 type BaseFromShDataSimple struct {
-	Id        int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	//Id        int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	Id        int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -29,7 +31,8 @@ type BaseInfoFromSh struct {
 }
 
 type BaseFromTradeShIndex struct {
-	BaseFromTradeShIndexId int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	//BaseFromTradeShIndexId int `orm:"column(base_from_trade_shanghai_index_id);pk"`
+	BaseFromTradeShIndexId int `gorm:"column:base_from_trade_shanghai_index_id;primaryKey"`
 	Rank                   int
 	DealShortName          string
 	DealName               string
@@ -55,17 +58,25 @@ type BaseFromTradeShIndex struct {
 }
 
 func GetEdbDataShMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 // GetBaseInfoFromShByIndexCode 获取指标信息
 func GetBaseInfoFromShByIndexCode(indexCode, suffix string) (list []*BaseInfoFromSh, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexCode).Find(&list).Error
 	return
 }

models/data_manage/edb_data_shfe.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -12,7 +13,8 @@ type ShfeData struct {
 }
 
 type BaseFromShfeDataSimple struct {
-	Id        int `orm:"column(base_from_trade_ine_index_id);pk"`
+	//Id        int `orm:"column(base_from_trade_ine_index_id);pk"`
+	Id        int `gorm:"column:base_from_trade_ine_index_id;primaryKey"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -29,7 +31,8 @@ type BaseInfoFromShfe struct {
 }
 
 type BaseFromTradeShfeIndex struct {
-	BaseFromTradeShfeIndexId int `orm:"column(base_from_trade_ine_index_id);pk"`
+	//BaseFromTradeShfeIndexId int `orm:"column(base_from_trade_ine_index_id);pk"`
+	BaseFromTradeShfeIndexId int `gorm:"column:base_from_trade_ine_index_id;primaryKey"`
 	Rank                     int
 	DealShortName            string
 	DealName                 string
@@ -55,17 +58,25 @@ type BaseFromTradeShfeIndex struct {
 }
 
 func GetEdbDataShfeMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 // GetBaseInfoFromShfeByIndexCode 获取指标信息
 func GetBaseInfoFromShfeByIndexCode(indexCode, suffix string) (list []*BaseInfoFromShfe, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, indexCode).QueryRows(&list)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexCode).Find(&list).Error
 	return
 }

models/data_manage/edb_data_ths.go

@@ -1,12 +1,14 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
 type EdbDataThs 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
@@ -18,8 +20,16 @@ type EdbDataThs struct {
 }
 
 func GetEdbDataThsMaxOrMinDate(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)
+	//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)
+	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_ths WHERE edb_code=? `
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	min_date = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	max_date = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }

models/data_manage/edb_data_wind.go

@@ -1,13 +1,14 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 type EdbDataWind 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
@@ -19,43 +20,56 @@ type EdbDataWind struct {
 }
 
 func AddEdbDataWindBySql(sqlStr string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sqlStr).Exec()
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Raw(sqlStr).Exec()
+	err = global.DbMap[utils.DbNameIndex].Exec(sqlStr).Error
 	return
 }
 
 func DeleteEdbDataWind(edbCode string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("data")
 	sql := `DELETE FROM edb_data_wind WHERE edb_code=? `
-	_, err = o.Raw(sql, edbCode).Exec()
+	//_, err = o.Raw(sql, edbCode).Exec()
+	err = global.DbMap[utils.DbNameIndex].Exec(sql, edbCode).Error
 	return
 }
 
 func ModifyEdbDataWind(edbInfoId int64, dataTime string, value float64) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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()
+	//_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
+	err = global.DbMap[utils.DbNameIndex].Exec(sql, value, edbInfoId, dataTime).Error
 	return
 }
 
 func GetEdbDataWindByCode(edbCode string, size int) (items []*EdbInfoSearchData, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//_, err = o.Raw(sql, edbCode, size).QueryRows(&items)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode, size).Find(&items).Error
 	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)
+	//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)
+	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_wind WHERE edb_code=? `
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	min_date = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	max_date = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 func GetEdbDataWindByCodeAndDate(edbCode string, startDate string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode, startDate).First(&count).Error
 	return
 }
 
@@ -66,7 +80,8 @@ type EdbDataFromWind struct {
 }
 
 func EdbInfoUpdateStatusByEdbInfoId(edbInfoIds []int, isStop int, calculateEdbInfoIds []int) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
+	//o, err := orm.NewOrmUsingDB("data").Begin()
+	o := global.DbMap[utils.DbNameIndex].Begin()
 	if err != nil {
 		return
 	}
@@ -81,13 +96,16 @@ func EdbInfoUpdateStatusByEdbInfoId(edbInfoIds []int, isStop int, calculateEdbIn
 	// 更改指标的更新状态
 	if len(edbInfoIds) == 1 {
 		sql := ` UPDATE edb_info SET no_update = ?, set_update_time=? WHERE edb_info_id=? `
-		_, err = o.Raw(sql, isStop, time.Now(), edbInfoIds[0]).Exec()
+		//_, err = o.Raw(sql, isStop, time.Now(), edbInfoIds[0]).Exec()
+		err = o.Exec(sql, isStop, time.Now(), edbInfoIds[0]).Error
 		if err != nil {
 			return
 		}
 	} else {
-		sql := ` UPDATE edb_info SET no_update = ?, set_update_time=? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(edbInfoIds)) + `) `
-		_, err = o.Raw(sql, isStop, time.Now(), edbInfoIds).Exec()
+		//sql := ` UPDATE edb_info SET no_update = ?, set_update_time=? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(edbInfoIds)) + `) `
+		//_, err = o.Raw(sql, isStop, time.Now(), edbInfoIds).Exec()
+		sql := ` UPDATE edb_info SET no_update = ?, set_update_time=? WHERE edb_info_id IN ? `
+		err = o.Exec(sql, isStop, time.Now(), edbInfoIds).Error
 		if err != nil {
 			return
 		}
@@ -95,8 +113,10 @@ func EdbInfoUpdateStatusByEdbInfoId(edbInfoIds []int, isStop int, calculateEdbIn
 
 	if len(calculateEdbInfoIds) > 0 {
 		// 批量更新相关联的指标ID
-		sql := ` UPDATE edb_info SET no_update = ?, set_update_time=? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(calculateEdbInfoIds)) + `) `
-		_, err = o.Raw(sql, isStop, time.Now(), calculateEdbInfoIds).Exec()
+		//sql := ` UPDATE edb_info SET no_update = ?, set_update_time=? WHERE edb_info_id IN (` + utils.GetOrmInReplace(len(calculateEdbInfoIds)) + `) `
+		//_, err = o.Raw(sql, isStop, time.Now(), calculateEdbInfoIds).Exec()
+		sql := ` UPDATE edb_info SET no_update = ?, set_update_time=? WHERE edb_info_id IN ? `
+		err = o.Exec(sql, isStop, time.Now(), calculateEdbInfoIds).Error
 		if err != nil {
 			return
 		}

models/data_manage/edb_data_wind_wsd.go

@@ -1,15 +1,17 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 func ModifyEdbInfoWindWsdDataStatus(source, subSource int, edbInfoId int64, edbCode string) (err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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 = o.Raw(sql, edbInfoId, edbCode).Exec()
+	err = global.DbMap[utils.DbNameIndex].Exec(sql, edbInfoId, edbCode).Error
 	return
 }

models/data_manage/edb_data_ys.go

@@ -10,6 +10,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"errors"
+	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
@@ -22,7 +23,8 @@ import (
 )
 
 type BaseFromSmmDataSimple struct {
-	SmmDataId          int `orm:"column(smm_data_id);pk"`
+	//SmmDataId          int `orm:"column(smm_data_id);pk"`
+	SmmDataId          int `gorm:"column:smm_data_id;primaryKey"`
 	BaseFromSmmIndexId int
 	IndexCode          string
 	DataTime           string
@@ -30,9 +32,17 @@ type BaseFromSmmDataSimple struct {
 }
 
 func GetEdbDataYsMaxAndMinDate(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_ys WHERE edb_code=? `
-	err = o.Raw(sql, edbCode).QueryRow(&min_date, &max_date)
+	//o := orm.NewOrmUsingDB("data")
+	//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)
+	sql := ` SELECT MIN(data_time) AS minDate,MAX(data_time) AS maxDate FROM edb_data_ys WHERE edb_code=? `
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	min_date = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	max_date = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 

models/data_manage/edb_data_zz.go

@@ -1,8 +1,9 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -12,7 +13,8 @@ type ZzData struct {
 }
 
 type BaseFromZzDataSimple struct {
-	Id        int `orm:"column(base_from_trade_zhengzhou_index_id);pk"`
+	//Id        int `orm:"column(base_from_trade_zhengzhou_index_id);pk"`
+	Id        int `gorm:"column:base_from_trade_zhengzhou_index_id;primaryKey"`
 	DealCode  string
 	BuyCode   string
 	SoldCode  string
@@ -29,43 +31,52 @@ type BaseInfoFromZz struct {
 }
 
 type BaseFromTradeZhengzhouIndex struct {
-	BaseFromTradeZhengzhouIndexId int `orm:"column(base_from_trade_zhengzhou_index_id);pk"`
-	Rank                          int
-	DealShortName                 string
-	DealName                      string
-	DealCode                      string
-	DealValue                     string
-	DealChange                    int
-	BuyShortName                  string
-	BuyName                       string
-	BuyCode                       string
-	BuyValue                      string
-	BuyChange                     int
-	SoldShortName                 string
-	SoldName                      string
-	SoldCode                      string
-	SoldValue                     string
-	SoldChange                    int
-	Frequency                     string
-	ClassifyName                  string
-	ClassifyType                  string
-	CreateTime                    time.Time
-	ModifyTime                    time.Time
-	DataTime                      string
+	BaseFromTradeZhengzhouIndexId int `gorm:"column:base_from_trade_zhengzhou_index_id;primaryKey"`
+	//BaseFromTradeZhengzhouIndexId int `orm:"column(base_from_trade_zhengzhou_index_id);pk"`
+	Rank          int
+	DealShortName string
+	DealName      string
+	DealCode      string
+	DealValue     string
+	DealChange    int
+	BuyShortName  string
+	BuyName       string
+	BuyCode       string
+	BuyValue      string
+	BuyChange     int
+	SoldShortName string
+	SoldName      string
+	SoldCode      string
+	SoldValue     string
+	SoldChange    int
+	Frequency     string
+	ClassifyName  string
+	ClassifyType  string
+	CreateTime    time.Time
+	ModifyTime    time.Time
+	DataTime      string
 }
 
 func GetEdbDataZzMaxOrMinDate(edbCode string) (minDate, maxDate string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//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)
+	//err = o.Raw(sql, edbCode).QueryRow(&minDate, &maxDate)
+	var maxAndMinDate MaxAndMinDate
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbCode).First(&maxAndMinDate).Error
+	if err != nil {
+		return
+	}
+	minDate = maxAndMinDate.MinDate.Format(utils.FormatDate)
+	maxDate = maxAndMinDate.MaxDate.Format(utils.FormatDate)
 	return
 }
 
 // GetBaseInfoFromZhengzhouByIndexCode 获取指标信息
 func GetBaseInfoFromZhengzhouByIndexCode(indexCode, suffix string) (list []*BaseInfoFromZz, err error) {
-	o := orm.NewOrmUsingDB("data")
+	//o := orm.NewOrmUsingDB("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).QueryRows(&list)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, indexCode).Find(&list).Error
 	return
 }