Browse Source

feat:新增时,不需要传递配置,从系统默认配置获取

Roc 1 year ago
parent
commit
ef680cd97e

+ 6 - 4
controllers/data_manage/chart_theme.go

@@ -260,9 +260,11 @@ func (c *ChartThemeController) Add() {
 		return
 	}
 
-	if req.Config == `` {
-		br.Msg = "请填写配置"
-		br.IsSendEmail = false
+	// 获取系统默认配置
+	systemChartTheme, err := chart_theme.GetSystemChartThemeItem(req.ChartThemeTypeId)
+	if err != nil {
+		br.Msg = "添加失败"
+		br.ErrMsg = "添加失败,查询系统默认配置异常,Err:" + err.Error()
 		return
 	}
 
@@ -270,7 +272,7 @@ func (c *ChartThemeController) Add() {
 		ChartThemeId:     0,
 		ChartThemeName:   req.ChartThemeName,
 		ChartThemeTypeId: req.ChartThemeTypeId,
-		Config:           req.Config,
+		Config:           systemChartTheme.Config,
 		IsDelete:         0,
 		SysUserId:        sysUser.AdminId,
 		SysUserRealName:  sysUser.RealName,

+ 18 - 2
models/data_manage/chart_theme/chart_theme.go

@@ -99,7 +99,7 @@ func GetAllChartThemeList() (list []*ChartTheme, err error) {
 	return
 }
 
-// ChartThemeConfigItem
+// ChartThemeItem
 // @Description: 图表主题配置
 type ChartThemeItem struct {
 	ChartThemeId        int       `description:"图表主题类型ID" orm:"column(chart_theme_id);pk"`
@@ -114,7 +114,7 @@ type ChartThemeItem struct {
 	DefaultChartThemeId int       `description:"默认使用的图表主题ID"`
 }
 
-// GetChartThemeConfigItemList
+// GetChartThemeItemList
 // @Description: 根据图表类型id获取配置列表
 // @author: Roc
 // @datetime 2023-12-14 14:26:35
@@ -130,3 +130,19 @@ func GetChartThemeItemList(chartThemeTypeId int) (list []*ChartThemeItem, err er
 
 	return
 }
+
+// GetSystemChartThemeItem
+// @Description: 根据图表类型id获取系统配置
+// @author: Roc
+// @datetime 2023-12-14 14:26:35
+// @param chartThemeTypeId int
+// @return list []*ChartThemeConfig
+// @return err error
+func GetSystemChartThemeItem(chartThemeTypeId int) (item *ChartThemeItem, 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)
+
+	return
+}

+ 0 - 1
models/data_manage/chart_theme/request/theme.go

@@ -5,7 +5,6 @@ package request
 type AddThemeReq struct {
 	ChartThemeName   string `description:"主题名称"`
 	ChartThemeTypeId int    `description:"图表类型id"`
-	Config           string `description:"配置的值"`
 }
 
 // EditThemeReq