fix:柱形图增加单位配置

controller/chart/chart_info.go

@@ -254,6 +254,12 @@ func GetChartInfoDetail(c *gin.Context) {
 		myChartInfo.CreateTime = utils.TimeTransferString(utils.FormatDateTime, exists.CreateTime)
 	}
 
+	// 单位
+	if chartType == utils.CHART_TYPE_BAR && len(yDataList) > 0 {
+		chartInfo.Unit = yDataList[0].Unit
+		chartInfo.UnitEn = yDataList[0].UnitEn
+	}
+
 	// 图表的指标来源
 	sourceNameList, sourceNameEnList := chart.GetEdbSourceByEdbInfoIdList(edbList)
 	chartInfo.ChartSource = strings.Join(sourceNameList, ",")
@@ -397,6 +403,12 @@ func getChartInfoDetail(chartInfo *chartInfoModel.ChartInfoView, myChartClassify
 		}
 	}
 
+	// 单位
+	if chartType == utils.CHART_TYPE_BAR && len(yDataList) > 0 {
+		chartInfo.Unit = yDataList[0].Unit
+		chartInfo.UnitEn = yDataList[0].UnitEn
+	}
+
 	sourceArr = append(sourceArr, "弘则研究")
 	chartInfo.ChartSource = strings.Join(sourceArr, ",")
 

models/request/chart.go

@@ -5,6 +5,8 @@ type BarChartInfoReq struct {
 	EdbInfoIdList []BarChartInfoEdbItemReq `description:"指标信息"`
 	DateList      []BarChartInfoDateReq    `description:"日期配置"`
 	Sort          BarChartInfoSortReq      `description:"排序"`
+	Unit          string                   `description:"中文单位名称"`
+	UnitEn        string                   `description:"英文单位名称"`
 }
 
 // BarChartInfoEdbItemReq 柱方图预览请求数据（指标相关）

models/response/chart_info/chart_info.go

@@ -39,6 +39,8 @@ type YData struct {
 	M              []int           `description:"对应开始日期的间隔值" json:"-"`
 	NameList       []string        `description:"每个值对应的名称"`
 	EnNameList     []string        `description:"每个值对应的英文名称"`
+	Unit           string          `description:"中文单位名称"`
+	UnitEn         string          `description:"英文单位名称"`
 }
 
 type CorrelationInfo struct {

models/tables/chart_info/query.go

@@ -39,6 +39,7 @@ type ChartInfoView struct {
 	BarConfig         string `description:"柱方图的配置，json数据" json:"-"`
 	ChartNameEn       string `description:"英文图表名称"`
 	UnitEn            string `description:"英文单位名称"`
+	Unit              string `description:"图表单位"`
 	Source            int    `description:"1：ETA图库；2：商品价格"`
 	ExtraConfig       string `description:"图表额外配置,json数据"`
 	//ChartClassify     []*chart_classify.ChartClassifyView

services/chart/chart_info.go

@@ -459,6 +459,12 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 				}
 			}
 		}
+
+		for k := range yDataList {
+			yDataList[k].Unit = barChartConf.Unit
+			yDataList[k].UnitEn = barChartConf.UnitEn
+		}
+
 	case 10: // 截面散点图
 		sectionScatterConf := extraConfig.(request.SectionScatterReq)
 		xEdbIdValue, dataResp, err = GetSectionScatterChartData(mappingList, edbDataListMap, sectionScatterConf)