新增向前插入参数函数

models/data_manage/chart_theme/chart_theme.go

@@ -2,6 +2,8 @@ package chart_theme
 
 import (
 	"errors"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
@@ -9,7 +11,7 @@ import (
 // ChartTheme
 // @Description: 图表主题表
 type ChartTheme struct {
-	ChartThemeId     int       `description:"图表主题类型ID" orm:"column(chart_theme_id);pk"`
+	ChartThemeId     int       `description:"图表主题类型ID" orm:"column(chart_theme_id);pk" gorm:"primaryKey" `
 	ChartThemeName   string    `description:"图表主题名称"`
 	ChartThemeTypeId int       `description:"图表主题类型ID"`
 	ChartImage       string    `description:"缩略图"`
@@ -30,10 +32,8 @@ type ChartTheme struct {
 // @return item *ChartTheme
 // @return err error
 func GetChartThemeId(chartThemeId int) (item *ChartTheme, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_theme where chart_theme_id = ? AND is_delete = 0`
-	err = o.Raw(sql, chartThemeId).QueryRow(&item)
-
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, chartThemeId).First(&item).Error
 	return
 }
 
@@ -49,13 +49,7 @@ func (m *ChartTheme) Add() (err error) {
 		err = errors.New("该配置已存在")
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	lastId, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.ChartThemeId = int(lastId)
-
+	err = global.DbMap[utils.DbNameIndex].Create(m).Error
 	return
 }
 
@@ -67,8 +61,7 @@ func (m *ChartTheme) Add() (err error) {
 // @param cols []string
 // @return err error
 func (m *ChartTheme) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(m).Error
 	return
 }
 
@@ -125,12 +118,10 @@ type ChartThemeItem struct {
 // @return list []*ChartThemeConfig
 // @return err error
 func GetChartThemeItemList(chartThemeTypeId int) (list []*ChartThemeItem, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT a.*,b.default_chart_theme_id FROM chart_theme a 
-         JOIN chart_theme_type b on a.chart_theme_type_id =b.chart_theme_type_id 
-         WHERE a.chart_theme_type_id = ? AND a.is_delete=0 ORDER BY a.chart_theme_id ASC `
-	_, err = o.Raw(sql, chartThemeTypeId).QueryRows(&list)
-
+	sql := `SELECT a.*,b.default_chart_theme_id FROM chart_theme a
+	    JOIN chart_theme_type b on a.chart_theme_type_id =b.chart_theme_type_id
+	    WHERE a.chart_theme_type_id = ? AND a.is_delete=0 ORDER BY a.chart_theme_id ASC `
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, chartThemeTypeId).Find(&list).Error
 	return
 }
 
@@ -142,10 +133,9 @@ func GetChartThemeItemList(chartThemeTypeId int) (list []*ChartThemeItem, err er
 // @return item *ChartTheme
 // @return err error
 func GetSystemChartTheme(chartThemeTypeId int) (item *ChartTheme, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT a.* FROM chart_theme a
-         WHERE a.chart_theme_type_id = ? AND a.is_system_theme=1 ORDER BY a.chart_theme_id ASC `
-	err = o.Raw(sql, chartThemeTypeId).QueryRow(&item)
+	    WHERE a.chart_theme_type_id = ? AND a.is_system_theme=1 ORDER BY a.chart_theme_id ASC `
 
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, chartThemeTypeId).First(&item).Error
 	return
 }

models/data_manage/chart_theme/chart_theme_default_data.go

@@ -1,6 +1,7 @@
 package chart_theme
 
 import (
+	"eta/eta_api/global"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/utils"
 	"github.com/beego/beego/v2/client/orm"
@@ -10,7 +11,7 @@ import (
 // ChartThemeDefaultData
 // @Description: 图表默认数据
 type ChartThemeDefaultData struct {
-	EdbDataId     int       `description:"指标数据ID" orm:"column(edb_data_id);pk"`
+	EdbDataId     int       `description:"指标数据ID" orm:"column(edb_data_id);pk" gorm:"primaryKey" `
 	EdbInfoId     int       `description:"指标ID"`
 	EdbCode       string    `description:"指标编码"`
 	DataTime      string    //`json:"-" description:"数据日期"`
@@ -44,9 +45,7 @@ func GetChartThemeDefaultDataList(endInfoId int) (list []*ChartThemeDefaultData,
 // @param cols []string
 // @return err error
 func (m *ChartThemeDefaultData) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
-
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(m).Error
 	return
 }
 
@@ -66,8 +65,8 @@ func GetChartThemeDefaultDataItemList(endInfoId int, startDate string) (list []*
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, endInfoId, pars).QueryRows(&list)
+
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, utils.ForwardPars(pars, endInfoId)...).Find(&list).Error
 	return
 }
 
@@ -83,10 +82,7 @@ func GetChartEdbMappingListByEdbInfoId(edbInfoIdList []int) (list []*data_manage
 	if num <= 0 {
 		return
 	}
-	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM chart_theme_default_edb_info WHERE edb_info_id IN(` + utils.GetOrmInReplace(num) + `)
-              `
-	_, err = o.Raw(sql, edbInfoIdList).QueryRows(&list)
-
+	sql := ` SELECT * FROM chart_theme_default_edb_info WHERE edb_info_id IN(` + utils.GetOrmInReplace(num) + `) `
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, edbInfoIdList).Find(&list).Error
 	return
 }

models/data_manage/chart_theme/chart_theme_type.go

@@ -1,14 +1,15 @@
 package chart_theme
 
 import (
-	"github.com/beego/beego/v2/client/orm"
+	"eta/eta_api/global"
+	"eta/eta_api/utils"
 	"time"
 )
 
 // ChartThemeType
 // @Description: 图表主题类型表
 type ChartThemeType struct {
-	ChartThemeTypeId    int       `description:"图表主题类型ID" orm:"column(chart_theme_type_id);pk"`
+	ChartThemeTypeId    int       `description:"图表主题类型ID" orm:"column(chart_theme_type_id);pk" gorm:"primaryKey" `
 	ChartTypeName       string    `description:"类型名称"`
 	ChartType           int       `description:"图表类型"`
 	ChartSource         int       `description:"图表来源"`
@@ -18,14 +19,14 @@ type ChartThemeType struct {
 }
 
 type ChartThemeTypeList struct {
-	ChartThemeTypeId    int    `description:"图表主题类型ID" `
-	ChartTypeName       string `description:"类型名称"`
-	ChartTypeNameEn     string `description:"类型名称"`
-	ChartType           int    `description:"图表类型"`
-	ChartSource         int    `description:"图表来源"`
-	ParentId            int    `description:"父级ID"`
-	DefaultChartThemeId int    `description:"默认使用的主题id"`
-	Child               []*ChartThemeTypeList
+	ChartThemeTypeId    int                   `description:"图表主题类型ID" `
+	ChartTypeName       string                `description:"类型名称"`
+	ChartTypeNameEn     string                `description:"类型名称"`
+	ChartType           int                   `description:"图表类型"`
+	ChartSource         int                   `description:"图表来源"`
+	ParentId            int                   `description:"父级ID"`
+	DefaultChartThemeId int                   `description:"默认使用的主题id"`
+	Child               []*ChartThemeTypeList `gorm:"-"`
 }
 
 // Update
@@ -36,8 +37,7 @@ type ChartThemeTypeList struct {
 // @param cols []string
 // @return err error
 func (m *ChartThemeType) Update(cols []string) (err error) {
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Update(m, cols...)
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(m).Error
 	return
 }
 
@@ -48,12 +48,10 @@ func (m *ChartThemeType) Update(cols []string) (err error) {
 // @return list []*ChartThemeType
 // @return err error
 func GetAllChartThemeTypeList() (list []*ChartThemeTypeList, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT c.chart_type_id AS chart_type, c.chart_type_name,c.chart_type_name_en, parent_id, t.chart_theme_type_id,t.chart_source,t.default_chart_theme_id FROM chart_type c 
-left JOIN chart_theme_type t on c.chart_type_id=t.chart_type
-ORDER BY c.sort ASC`
-	_, err = o.Raw(sql).QueryRows(&list)
-
+	left JOIN chart_theme_type t on c.chart_type_id=t.chart_type
+	ORDER BY c.sort ASC`
+	err = global.DbMap[utils.DbNameIndex].Raw(sql).Find(&list).Error
 	return
 }
 
@@ -65,10 +63,8 @@ ORDER BY c.sort ASC`
 // @return list []*ChartThemeType
 // @return err error
 func GetChartThemeTypeListBySource(source int) (list []*ChartThemeType, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_theme_type WHERE chart_source = ?  ORDER BY chart_theme_type_id ASC `
-	_, err = o.Raw(sql, source).QueryRows(&list)
-
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, source).Find(&list).Error
 	return
 }
 
@@ -80,10 +76,9 @@ func GetChartThemeTypeListBySource(source int) (list []*ChartThemeType, err erro
 // @return item *ChartThemeType
 // @return err error
 func GetChartThemeTypeById(chartThemeTypeId int) (item *ChartThemeType, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_theme_type where chart_theme_type_id = ? `
-	err = o.Raw(sql, chartThemeTypeId).QueryRow(&item)
 
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, chartThemeTypeId).First(&item).Error
 	return
 }
 
@@ -95,10 +90,8 @@ func GetChartThemeTypeById(chartThemeTypeId int) (item *ChartThemeType, err erro
 // @return item *ChartThemeType
 // @return err error
 func GetChartThemeTypeByChartTypeAndSource(chartType, source int) (item *ChartThemeType, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_theme_type where chart_type = ? AND chart_source = ? `
-	err = o.Raw(sql, chartType, source).QueryRow(&item)
-
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, chartType, source).First(&item).Error
 	return
 }
 
@@ -110,9 +103,7 @@ func GetChartThemeTypeByChartTypeAndSource(chartType, source int) (item *ChartTh
 // @return item *ChartThemeType
 // @return err error
 func GetChartThemeTypeByChartType(chartType int) (item *ChartThemeType, err error) {
-	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM chart_theme_type where chart_type = ?`
-	err = o.Raw(sql, chartType).QueryRow(&item)
-
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, chartType).First(&item).Error
 	return
 }

utils/common.go

@@ -2857,3 +2857,15 @@ func GetExcelDate(strDate string) (newDate time.Time, err error) {
 
 	return
 }
+
+// ForwardPars
+// @Description: 向前插入参数
+// @param pars
+// @param values
+// @return []interface{}
+func ForwardPars(pars []interface{}, values ...interface{}) []interface{} {
+	if len(values) <= 0 {
+		return pars
+	}
+	return append(values, pars...)
+}