Merge branch 'eta/1.4.1' into debug

controllers/data_manage/chart_theme.go

@@ -154,8 +154,6 @@ func (c *ChartThemeController) GetThemePreviewData() {
 	}
 	calendar := "公历"
 
-	chartInfo := new(data_manage.ChartInfoView)
-
 	mappingList, err := chart_theme.GetChartEdbMappingListByEdbInfoId(edbInfoIdList)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -170,6 +168,9 @@ func (c *ChartThemeController) GetThemePreviewData() {
 		mappingList[3].ChartStyle = "column"
 		mappingList[4].ChartStyle = "column"
 	}
+	chartInfo := new(data_manage.ChartInfoView)
+	chartInfo.Source = chartThemeType.ChartSource
+	chartInfo.ChartType = chartThemeType.ChartType
 
 	yearMax := 0
 	if dateType == utils.DateTypeNYears {
@@ -341,8 +342,12 @@ func (c *ChartThemeController) Edit() {
 	}
 
 	// 更新
-	chartTheme.ChartThemeName = req.ChartThemeName
-	chartTheme.Config = req.Config
+	if req.ChartThemeName != `` {
+		chartTheme.ChartThemeName = req.ChartThemeName
+	}
+	if req.Config != `` {
+		chartTheme.Config = req.Config
+	}
 	chartTheme.ModifyTime = time.Now()
 	err = chartTheme.Update([]string{"ChartThemeName", "Config", "ModifyTime"})
 	if err != nil {
@@ -511,3 +516,100 @@ func (c *ChartThemeController) SetDefaultTheme() {
 	br.Success = true
 	br.Msg = "配置成功"
 }
+
+// TypeListBySource
+// @Title 根据来源获取主题类型列表
+// @Description 获取主题类型列表接口
+// @Param   Source   query   int  true       "图表主题类型id"
+// @Success 200 {object} []*chart_theme.ChartThemeType
+// @router /chart/theme/type/list_by_source [get]
+func (c *ChartThemeController) TypeListBySource() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		c.Data["json"] = br
+		c.ServeJSON()
+	}()
+	sysUser := c.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	source, _ := c.GetInt("Source")
+	if source <= 0 {
+		br.Msg = "请选择来源"
+		br.ErrMsg = "请选择来源"
+		br.IsSendEmail = false
+		return
+	}
+
+	list, err := chart_theme.GetChartThemeTypeListBySource(source)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取图表样式类型信息失败，Err:" + err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = list
+}
+
+// ListBySource
+// @Title 根据来源获取主题列表
+// @Description 获取主题列表接口
+// @Param   ChartType   query   int  true       "图表类型"
+// @Param   Source   query   int  true       "来源"
+// @Success 200 {object} []*chart_theme.ChartTheme
+// @router /chart/theme/list_by_source [get]
+func (c *ChartThemeController) ListBySource() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		c.Data["json"] = br
+		c.ServeJSON()
+	}()
+	sysUser := c.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	chartType, _ := c.GetInt("ChartType")
+	if chartType < 0 {
+		br.Msg = "请选择图表类型"
+		br.ErrMsg = "请选择图表类型"
+		br.IsSendEmail = false
+		return
+	}
+	source, _ := c.GetInt("Source")
+	if chartType < 0 {
+		br.Msg = "请选择图表来源"
+		br.ErrMsg = "请选择图表来源"
+		br.IsSendEmail = false
+		return
+	}
+
+	chartThemeType, err := chart_theme.GetChartThemeTypeByChartTypeAndSource(chartType, source)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取图表样式类型信息失败，Err:" + err.Error()
+		return
+	}
+
+	list, err := chart_theme.GetChartThemeItemList(chartThemeType.ChartThemeTypeId)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取图表样式类型信息失败，Err:" + err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = list
+}

models/data_manage/chart_theme/chart_theme_type.go

@@ -34,7 +34,6 @@ func (m *ChartThemeType) Update(cols []string) (err error) {
 // @Description: 获取所有图表主题类型列表
 // @author: Roc
 // @datetime 2023-12-13 17:31:03
-// @param endInfoId int
 // @return list []*ChartThemeType
 // @return err error
 func GetAllChartThemeTypeList() (list []*ChartThemeType, err error) {
@@ -45,6 +44,21 @@ func GetAllChartThemeTypeList() (list []*ChartThemeType, err error) {
 	return
 }
 
+// GetChartThemeTypeListBySource
+// @Description: 根据来源获取图表主题类型列表
+// @author: Roc
+// @datetime 2023-12-13 17:31:03
+// @param source int
+// @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)
+
+	return
+}
+
 // GetChartThemeTypeById
 // @Description: 通过类型id获取类型
 // @author: Roc
@@ -59,3 +73,18 @@ func GetChartThemeTypeById(chartThemeTypeId int) (item *ChartThemeType, err erro
 
 	return
 }
+
+// GetChartThemeTypeByChartTypeAndSource
+// @Description: 通过图表类型和来源获取类型
+// @author: Roc
+// @datetime 2023-12-14 09:53:58
+// @param chartThemeTypeId int
+// @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)
+
+	return
+}

routers/commentsRouter.go

@@ -2284,6 +2284,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ChartThemeController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ChartThemeController"],
+        beego.ControllerComments{
+            Method: "ListBySource",
+            Router: `/chart/theme/list_by_source`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ChartThemeController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ChartThemeController"],
         beego.ControllerComments{
             Method: "GetThemePreviewData",
@@ -2311,6 +2320,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ChartThemeController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ChartThemeController"],
+        beego.ControllerComments{
+            Method: "TypeListBySource",
+            Router: `/chart/theme/type/list_by_source`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbClassifyController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:EdbClassifyController"],
         beego.ControllerComments{
             Method: "AddEdbClassify",

services/data/chart_theme.go

@@ -145,8 +145,8 @@ func getThemePreviewEdbDataMapList(chartType int, calendar, startDate, endDate s
 		item.ChartColor = v.ChartColor
 		item.ChartWidth = v.ChartWidth
 		item.IsOrder = v.IsOrder
-		item.MaxData = v.MaxData
-		item.MinData = v.MinData
+		item.MaxData = v.MaxValue
+		item.MinData = v.MaxValue
 		item.LatestValue = v.LatestValue
 		item.LatestDate = v.LatestDate
 		item.UniqueCode = v.UniqueCode