改成gorm

models/data_manage/chart_series.go

@@ -2,14 +2,14 @@ package data_manage
 
 import (
 	"encoding/json"
+	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 type ChartSeries struct {
-	ChartSeriesId int       `orm:"column(chart_series_id);pk"`
+	ChartSeriesId int       `orm:"column(chart_series_id);pk" gorm:"primaryKey"`
 	SeriesName    string    `description:"系列名称"`
 	SeriesNameEn  string    `description:"系列英文名称"`
 	ChartInfoId   int       `description:"图表ID"`
@@ -32,18 +32,18 @@ func (c *ChartSeries) TableName() string {
 }
 
 func GetChartSeriesByChartInfoId(chartInfoId int) (items []*ChartSeries, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := "SELECT * FROM chart_series WHERE chart_info_id = ?"
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&items)
+	err = o.Raw(sql, chartInfoId).Find(&items).Error
 	return
 }
 
 // EditChartSeriesAndEdbMapping
 func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
+	o := global.DbMap[utils.DbNameIndex]
+	to := o.Begin()
+	if to.Error != nil {
+		return to.Error
 	}
 	defer func() {
 		if err != nil {
@@ -73,7 +73,7 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 	}
 
 	// 删除所有的指标映射
-	_, err = o.Raw("DELETE FROM chart_series_edb_mapping WHERE chart_info_id = ?", chartInfoId).Exec()
+	err = o.Raw("DELETE FROM chart_series_edb_mapping WHERE chart_info_id = ?", chartInfoId).Error
 	if err != nil {
 		return
 	}
@@ -103,18 +103,18 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 			}
 			//新增
 			tmp.CreateTime = time.Now()
-			seriesIdTmp, e := to.Insert(tmp)
-			if e != nil {
-				err = fmt.Errorf("AddChartSeries Err:" + e.Error())
+			err = to.Create(tmp).Error
+			if err != nil {
+				err = fmt.Errorf("AddChartSeries Err:" + err.Error())
 				return
 			}
-			seriesId = int(seriesIdTmp)
+			seriesId = tmp.ChartSeriesId
 		} else {
 			//编辑
 			delete(seriesDeleteMap, v.ChartSeriesId)
-			_, e := to.Update(tmp)
-			if e != nil {
-				err = fmt.Errorf("UpdateChartSeries Err:" + e.Error())
+			err = to.Model(tmp).Updates(tmp).Error
+			if err != nil {
+				err = fmt.Errorf("UpdateChartSeries Err:" + err.Error())
 				return
 			}
 		}
@@ -142,7 +142,7 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 			addSeriesEdbList = append(addSeriesEdbList, edbTmp)
 		}
 		if len(addSeriesEdbList) > 0 {
-			_, err = to.InsertMulti(len(addSeriesEdbList), addSeriesEdbList)
+			err = to.CreateInBatches(addSeriesEdbList, utils.MultiAddNum).Error
 			if err != nil {
 				err = fmt.Errorf("AddChartSeries Err:" + err.Error())
 				return
@@ -156,13 +156,13 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 	}
 	if len(seriesIds) > 0 {
 		sql := `DELETE FROM chart_series WHERE chart_series_id IN (` + utils.GetOrmInReplace(len(seriesIds)) + `) and chart_info_id=?`
-		_, err = to.Raw(sql, seriesIds, chartInfoId).Exec()
+		err = to.Exec(sql, seriesIds, chartInfoId).Error
 		if err != nil {
 			err = fmt.Errorf("删除系列失败 Err:" + err.Error())
 			return
 		}
 		sql = `DELETE FROM chart_series_edb_mapping WHERE chart_series_id IN (` + utils.GetOrmInReplace(len(seriesIds)) + `) and chart_info_id=?`
-		_, err = to.Raw(sql, seriesIds, chartInfoId).Exec()
+		err = to.Exec(sql, seriesIds, chartInfoId).Error
 		if err != nil {
 			err = fmt.Errorf("删除系列指标 Err:" + err.Error())
 			return
@@ -173,10 +173,10 @@ func EditChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err e
 }
 
 func AddChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
+	o := global.DbMap[utils.DbNameIndex]
+	to := o.Begin()
+	if to.Error != nil {
+		return to.Error
 	}
 	defer func() {
 		if err != nil {
@@ -210,12 +210,12 @@ func AddChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err er
 			CreateTime:   time.Now(),
 			ModifyTime:   time.Now(),
 		}
-		seriesIdTmp, e := to.Insert(tmp)
-		if e != nil {
-			err = fmt.Errorf("AddChartSeries Err:" + e.Error())
+		err = to.Create(tmp).Error
+		if err != nil {
+			err = fmt.Errorf("AddChartSeries Err:" + err.Error())
 			return
 		}
-		seriesId := int(seriesIdTmp)
+		seriesId := tmp.ChartSeriesId
 		addSeriesEdbList := make([]*ChartSeriesEdbMapping, 0)
 		for _, edbItem := range v.EdbInfoList {
 			dateConfStrByte, e := json.Marshal(edbItem.DateConf)
@@ -239,9 +239,9 @@ func AddChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err er
 			addSeriesEdbList = append(addSeriesEdbList, edbTmp)
 		}
 		if len(addSeriesEdbList) > 0 {
-			_, e = to.InsertMulti(len(addSeriesEdbList), addSeriesEdbList)
-			if e != nil {
-				err = fmt.Errorf("AddChartSeries Err:" + e.Error())
+			err = to.CreateInBatches(addSeriesEdbList, utils.MultiAddNum).Error
+			if err != nil {
+				err = fmt.Errorf("AddChartSeries Err:" + err.Error())
 				return
 			}
 		}
@@ -250,10 +250,10 @@ func AddChartSeriesAndEdbMapping(extraConfigStr string, chartInfoId int) (err er
 }
 
 func DeleteChartSeriesAndEdbMapping(chartInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
+	o := global.DbMap[utils.DbNameIndex]
+	to := o.Begin()
+	if to.Error != nil {
+		return to.Error
 	}
 	defer func() {
 		if err != nil {
@@ -264,20 +264,20 @@ func DeleteChartSeriesAndEdbMapping(chartInfoId int) (err error) {
 	}()
 
 	sql := ` DELETE FROM chart_series WHERE chart_info_id=? `
-	_, err = to.Raw(sql, chartInfoId).Exec()
+	err = to.Exec(sql, chartInfoId).Error
 	if err != nil {
 		return
 	}
 	sql = ` DELETE FROM  chart_series_edb_mapping WHERE chart_info_id=? `
-	_, err = to.Raw(sql, chartInfoId).Exec()
+	err = to.Exec(sql, chartInfoId).Error
 	return
 }
 
 func CopyChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList []*ChartSeriesEdbMapping, chartInfoId int) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	to, err := o.Begin()
-	if err != nil {
-		return
+	o := global.DbMap[utils.DbNameIndex]
+	to := o.Begin()
+	if to.Error != nil {
+		return to.Error
 	}
 	defer func() {
 		if err != nil {
@@ -306,12 +306,12 @@ func CopyChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList [
 			CreateTime:   time.Now(),
 			ModifyTime:   time.Now(),
 		}
-		seriesIdTmp, e := to.Insert(tmp)
-		if e != nil {
-			err = fmt.Errorf("AddChartSeries Err:" + e.Error())
+		err = to.Create(tmp).Error
+		if err != nil {
+			err = fmt.Errorf("AddChartSeries Err:" + err.Error())
 			return
 		}
-		seriesId := int(seriesIdTmp)
+		seriesId := tmp.ChartSeriesId
 		addSeriesEdbList := make([]*ChartSeriesEdbMapping, 0)
 		mappingList, ok := seriesEdbMap[v.ChartSeriesId]
 		if ok {
@@ -331,9 +331,9 @@ func CopyChartSeriesAndEdbMapping(seriesList []*ChartSeries, seriesEdbInfoList [
 				addSeriesEdbList = append(addSeriesEdbList, edbTmp)
 			}
 			if len(addSeriesEdbList) > 0 {
-				_, e = to.InsertMulti(len(addSeriesEdbList), addSeriesEdbList)
-				if e != nil {
-					err = fmt.Errorf("AddChartSeries Err:" + e.Error())
+				err = to.CreateInBatches(addSeriesEdbList, utils.MultiAddNum).Error
+				if err != nil {
+					err = fmt.Errorf("AddChartSeries Err:" + err.Error())
 					return
 				}
 			}
@@ -378,8 +378,8 @@ func (c *ChartSeries) CreateMulti(items []*ChartSeries) (err error) {
 	if len(items) == 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(utils.MultiAddNum, items)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.CreateInBatches(items, utils.MultiAddNum).Error
 	return
 }
 
@@ -387,8 +387,8 @@ func (m *ChartSeries) RemoveByCondition(condition string, pars []interface{}) (e
 	if condition == "" {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := fmt.Sprintf(`DELETE FROM %s WHERE %s`, m.TableName(), condition)
-	_, err = o.Raw(sql, pars).Exec()
+	err = o.Exec(sql, pars...).Error
 	return
 }

models/data_manage/chart_series_edb_mapping.go

@@ -1,12 +1,13 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
 type ChartSeriesEdbMapping struct {
-	ChartSeriesEdbMappingId int       `orm:"column(chart_series_edb_mapping_id);pk"`
+	ChartSeriesEdbMappingId int       `orm:"column(chart_series_edb_mapping_id);pk" gorm:"primaryKey"`
 	ChartSeriesId           int       `description:"系列ID"`
 	ChartInfoId             int       `description:"图表ID"`
 	EdbInfoId               int       `description:"指标id"`
@@ -22,8 +23,8 @@ func (c *ChartSeriesEdbMapping) TableName() string {
 }
 
 func GetChartSeriesEdbByChartInfoId(chartInfoId int) (items []*ChartSeriesEdbMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := "SELECT * FROM chart_series_edb_mapping WHERE chart_info_id = ?"
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&items)
+	err = o.Raw(sql, chartInfoId).Find(&items).Error
 	return
 }

models/data_manage/chart_type.go

@@ -1,11 +1,12 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 )
 
 type ChartType struct {
-	ChartTypeId     int    `orm:"column(chart_type_id);pk"`
+	ChartTypeId     int    `orm:"column(chart_type_id);pk" gorm:"primaryKey"`
 	ChartTypeName   string `description:"图表类型名称"`
 	ChartTypeNameEn string `description:"英文图表类型名称"`
 	ParentId        int    `description:"父级ID"`
@@ -31,8 +32,8 @@ func (c *ChartType) TableName() string {
 
 // 查询所有图表类型
 func GetChartTypeList() (items []ChartType, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM chart_type order by sort asc`
-	_, err = o.Raw(sql).QueryRows(&items)
+	err = o.Raw(sql).Find(&items).Error
 	return
 }

models/data_manage/coal_data.go

@@ -1,13 +1,13 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 type BaseFromCoalmineMapping struct {
-	BaseFromCoalmineMappingId int    `orm:"column(base_from_coalmine_mapping_id);pk"`
+	BaseFromCoalmineMappingId int    `orm:"column(base_from_coalmine_mapping_id);pk" gorm:"primaryKey"`
 	IndexName                 string `description:"持买单量指标名称"`
 	IndexCode                 string `description:"持买单量指标编码"`
 	CreateTime                string `description:"时间"`
@@ -15,16 +15,16 @@ type BaseFromCoalmineMapping struct {
 
 // GetCoalItemList 模糊查询Smm数据库指标列表
 func GetCoalItemList(keyword string) (items []*BaseFromCoalmineMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := "SELECT * FROM base_from_coalmine_mapping WHERE CONCAT(index_name,index_code) LIKE ? "
-	_, err = o.Raw(sql, utils.GetLikeKeyword(keyword)).QueryRows(&items)
+	err = o.Raw(sql, utils.GetLikeKeyword(keyword)).Find(&items).Error
 	return
 }
 
 func GetCoalCompanyMaxCount(suffix, classifyName string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT
-	MAX( t.num ) AS count 
+	COALESCE(MAX(t.num), 0) AS count
 FROM
 	(
 	SELECT
@@ -36,14 +36,14 @@ FROM
 GROUP BY
 	index_name ) AS t `
 	sql = fmt.Sprintf(sql, suffix)
-	err = o.Raw(sql, classifyName).QueryRow(&count)
+	err = o.Raw(sql, classifyName).Scan(&count).Error
 	return
 }
 
 func GetCoalJsmMaxCount(classifyName string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT
-	MAX( t.num ) AS count 
+	COALESCE(MAX(t.num), 0) AS count
 FROM
 	(
 	SELECT
@@ -54,12 +54,12 @@ FROM
 		province =? 
 GROUP BY
 	index_name ) AS t `
-	err = o.Raw(sql, classifyName).QueryRow(&count)
+	err = o.Raw(sql, classifyName).Scan(&count).Error
 	return
 }
 
 func GetCoalCount(suffix, indexCode string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT
 		COUNT( 1 ) AS num 
 	FROM
@@ -67,7 +67,7 @@ func GetCoalCount(suffix, indexCode string) (count int, err error) {
 	WHERE
 		index_code =? `
 	sql = fmt.Sprintf(sql, suffix)
-	err = o.Raw(sql, indexCode).QueryRow(&count)
+	err = o.Raw(sql, indexCode).Scan(&count).Error
 	return
 }
 
@@ -88,17 +88,17 @@ type BaseFromCoalmineIndex struct {
 }
 
 func GetBaseFromCoalIndexByCode(suffix, indexCode string) (items []*BaseFromCoalmineIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM base_from_coalmine_%s WHERE index_code=? ORDER BY data_time DESC`
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, indexCode).QueryRows(&items)
+	err = o.Raw(sql, indexCode).Find(&items).Error
 	return
 }
 
 func GetClassifyFromCoalByGroupName(suffix, groupName string) (items []*string, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT DISTINCT index_code FROM base_from_coalmine_%s WHERE group_name=? `
 	sql = fmt.Sprintf(sql, suffix)
-	_, err = o.Raw(sql, groupName).QueryRows(&items)
+	err = o.Raw(sql, groupName).Find(&items).Error
 	return
 }

models/data_manage/com_trade_country.go

@@ -1,13 +1,14 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
 // ComTradeCountry 联合国商品贸易数据库的国家编码表
 type ComTradeCountry struct {
-	Id         int       `orm:"column(id);pk"`
+	Id         int       `orm:"column(id);pk" gorm:"primaryKey"`
 	ThirdId    int       `description:"第三方的国家id"`
 	Name       string    `description:"国家名称（英文）"`
 	NameCn     string    `description:"国家名称（中文）"`
@@ -17,12 +18,12 @@ type ComTradeCountry struct {
 
 // AddComTradeCountry 添加联合国商品贸易数据库的国家编码
 func AddComTradeCountry(item *ComTradeCountry) (lastId int64, err error) {
-	o := orm.NewOrmUsingDB("data")
-	lastId, err = o.Insert(item)
+	o := global.DbMap[utils.DbNameIndex]
+	err = o.Create(item).Error
 	if err != nil {
 		return
 	}
-	item.Id = int(lastId)
+	lastId = int64(item.Id)
 	return
 }
 
@@ -35,8 +36,8 @@ type ComTradeCountryItem struct {
 
 // GetComTradeCountryItemAll 获取所有的国家
 func GetComTradeCountryItemAll() (list []*ComTradeCountryItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM com_trade_country`
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }

models/data_manage/com_trade_data.go

@@ -1,14 +1,15 @@
 package data_manage
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
 // ComTradeData 联合国商品贸易数据表
 type ComTradeData struct {
-	ComTradeDataId     int       `orm:"column(com_trade_data_id);pk"`
+	ComTradeDataId     int       `orm:"column(com_trade_data_id);pk" gorm:"primaryKey"`
 	ComTradeId         int       `description:"指标id"`
 	IndexCode          string    `description:"联合国商品贸易编码"`
 	Flow               string    `description:"贸易流向：X（Export：出口）；M（Import：进口）"`
@@ -30,7 +31,7 @@ type ComTradeData struct {
 
 // ComTradeDataListItem 联合国商品贸易数据列表数据
 type ComTradeDataListItem struct {
-	ComTradeDataId     int       `orm:"column(com_trade_data_id);pk"`
+	ComTradeDataId     int       `orm:"column(com_trade_data_id);pk" gorm:"primaryKey"`
 	ComTradeId         int       `description:"指标id"`
 	IndexCode          string    `description:"联合国商品贸易编码"`
 	IndexNameCn        string    `description:"联合国商品贸易名称（中文）"`
@@ -61,24 +62,25 @@ type ComTradeDataListResp struct {
 
 // GetComTradeListCount 获取指标数据汇总数
 func GetComTradeListCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT COUNT(1) AS count FROM com_trade_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).QueryRow(&count)
+	err = o.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
 // GetComTradeList 获取指标数据列表
 func GetComTradeList(condition string, pars []interface{}, startSize, pageSize int, orderBy string) (list []*ComTradeDataListItem, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM com_trade_data WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += ` ORDER BY ` + orderBy
 	sql += `  limit ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	pars = append(pars, startSize, pageSize)
+	err = o.Raw(sql, pars...).Find(&list).Error
 	return
 }

models/data_manage/com_trade_index.go

@@ -1,14 +1,14 @@
 package data_manage
 
 import (
+	"eta/eta_api/global"
 	"eta/eta_api/utils"
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
 // ComTradeIndex 联合国商品贸易数据指标表
 type ComTradeIndex struct {
-	ComTradeId  int       `orm:"column(com_trade_id);pk"`
+	ComTradeId  int       `orm:"column(com_trade_id);pk" gorm:"primaryKey"`
 	IndexCode   string    `description:"联合国商品贸易编码"`
 	IndexName   string    `description:"联合国商品名称"`
 	IndexNameCn string    `description:"联合国商品名称（中文）"`
@@ -18,13 +18,13 @@ type ComTradeIndex struct {
 
 // GetComTradeIndexList 获取指标数据列表
 func GetComTradeIndexList(condition string, pars []interface{}) (list []*ComTradeIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM com_trade_index WHERE 1=1 `
 	if condition != "" {
 		sql += condition
 	}
 	sql += `ORDER BY com_trade_id DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	err = o.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -34,23 +34,23 @@ func GetComTradeIndexByIdList(idList []int) (list []*ComTradeIndex, err error) {
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM com_trade_index WHERE com_trade_id in (` + utils.GetOrmInReplace(num) + `) `
-	_, err = o.Raw(sql, idList).QueryRows(&list)
+	err = o.Raw(sql, idList).Find(&list).Error
 	return
 }
 
 // GetAllComTradeIndexList 获取指标数据列表
 func GetAllComTradeIndexList() (list []*ComTradeIndex, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM com_trade_index  ORDER BY com_trade_id DESC `
-	_, err = o.Raw(sql).QueryRows(&list)
+	err = o.Raw(sql).Find(&list).Error
 	return
 }
 
 // ComTradeCodeMapping 联合国商品贸易数据指标编码与分类编码的关系表
 type ComTradeCodeMapping struct {
-	Code       int       `orm:"column(code);pk"`
+	Code       int       `orm:"column(code);pk" gorm:"primaryKey"`
 	IndexCode  string    `description:"联合国商品贸易编码"`
 	Type       int       `description:"1:价格；2：重量"`
 	Name       string    `description:"指标名称"`
@@ -59,8 +59,8 @@ type ComTradeCodeMapping struct {
 
 // GetComTradeIndex 根据指标code获取指标信息
 func GetComTradeIndex(indexCode string) (item *ComTradeCodeMapping, err error) {
-	o := orm.NewOrmUsingDB("data")
+	o := global.DbMap[utils.DbNameIndex]
 	sql := `SELECT * FROM com_trade_code_mapping WHERE code=? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
+	err = o.Raw(sql, indexCode).First(&item).Error
 	return
 }