fix：截面散点图变量名调整

models/request/chart.go

@@ -30,8 +30,8 @@ type BarChartInfoSortReq struct {
 	DateIndex int `description:"日期数据的下标，从0开始"`
 }
 
-// TimeSectionReq 时间截面请求
-type TimeSectionReq struct {
+// SectionScatterReq 截面散点请求
+type SectionScatterReq struct {
 	XName       string `description:"x轴名称"`
 	XNameEn     string `description:"x轴名称(英文)"`
 	XUnitName   string `description:"x轴单位名称"`
@@ -44,23 +44,23 @@ type TimeSectionReq struct {
 	XMaxValue   string `description:"X轴的最大值"`
 	YMinValue   string `description:"Y轴的最小值"`
 	YMaxValue   string `description:"Y轴的最大值"`
-	//EdbList     []TimeSectionEdbItemReq    `description:"指标数据"`
-	SeriesList []TimeSectionSeriesItemReq `description:"系列数据"`
+	//EdbList     []SectionScatterEdbItemReq    `description:"指标数据"`
+	SeriesList []SectionScatterSeriesItemReq `description:"系列数据"`
 }
 
-// TimeSectionSeriesItemReq 系列的请求
-type TimeSectionSeriesItemReq struct {
+// SectionScatterSeriesItemReq 系列的请求
+type SectionScatterSeriesItemReq struct {
 	Name            string `description:"系列名"`
 	NameEn          string `description:"系列名(英文)"`
 	Color           string `description:"颜色"`
-	EdbInfoList     []TimeSectionEdbItemReq
+	EdbInfoList     []SectionScatterEdbItemReq
 	ShowTrendLine   bool `description:"是否展示趋势线"`
 	ShowFitEquation bool `description:"是否展示方程式"`
 	ShowRSquare     bool `description:"是否展示R平方"`
 }
 
-// TimeSectionEdbItemReq 时间截面请求的指标
-type TimeSectionEdbItemReq struct {
+// SectionScatterEdbItemReq 截面散点请求的指标
+type SectionScatterEdbItemReq struct {
 	XEdbInfoId int    `description:"X轴的指标ID"`
 	YEdbInfoId int    `description:"Y轴的指标ID"`
 	Name       string `description:"别名"`
@@ -74,29 +74,29 @@ type TimeSectionEdbItemReq struct {
 	IsShow     bool   `description:"是否展示"`
 }
 
-// TimeSectionInfoResp 时间截面图数据
-type TimeSectionInfoResp struct {
-	XName       string                      `description:"x轴名称"`
-	XNameEn     string                      `description:"x轴名称(英文)"`
-	XUnitName   string                      `description:"x轴单位名称"`
-	XUnitNameEn string                      `description:"x轴单位名称(英文)"`
-	YName       string                      `description:"y轴名称"`
-	YNameEn     string                      `description:"y轴名称(英文)"`
-	YUnitName   string                      `description:"y轴单位名称"`
-	YUnitNameEn string                      `description:"y轴单位名称(英文)"`
-	XMinValue   string                      `description:"X轴的最小值"`
-	XMaxValue   string                      `description:"X轴的最大值"`
-	YMinValue   string                      `description:"Y轴的最小值"`
-	YMaxValue   string                      `description:"Y轴的最大值"`
-	DataList    []TimeSectionSeriesItemResp `description:"数据列"`
+// SectionScatterInfoResp 截面散点图数据
+type SectionScatterInfoResp struct {
+	XName       string                         `description:"x轴名称"`
+	XNameEn     string                         `description:"x轴名称(英文)"`
+	XUnitName   string                         `description:"x轴单位名称"`
+	XUnitNameEn string                         `description:"x轴单位名称(英文)"`
+	YName       string                         `description:"y轴名称"`
+	YNameEn     string                         `description:"y轴名称(英文)"`
+	YUnitName   string                         `description:"y轴单位名称"`
+	YUnitNameEn string                         `description:"y轴单位名称(英文)"`
+	XMinValue   string                         `description:"X轴的最小值"`
+	XMaxValue   string                         `description:"X轴的最大值"`
+	YMinValue   string                         `description:"Y轴的最小值"`
+	YMaxValue   string                         `description:"Y轴的最大值"`
+	DataList    []SectionScatterSeriesItemResp `description:"数据列"`
 }
 
-// TimeSectionSeriesItemResp 系列的返回
-type TimeSectionSeriesItemResp struct {
+// SectionScatterSeriesItemResp 系列的返回
+type SectionScatterSeriesItemResp struct {
 	Name            string `description:"系列名"`
 	NameEn          string `description:"系列名(英文)"`
 	Color           string `description:"颜色"`
-	EdbInfoList     []TimeSectionEdbItemResp
+	EdbInfoList     []SectionScatterEdbItemResp
 	ShowTrendLine   bool              `description:"是否展示趋势线"`
 	ShowFitEquation bool              `description:"是否展示方程式"`
 	ShowRSquare     bool              `description:"是否展示R平方"`
@@ -105,8 +105,8 @@ type TimeSectionSeriesItemResp struct {
 	TrendLimitData  []CoordinatePoint `description:"趋势线的前后坐标点"`
 }
 
-// TimeSectionEdbItemResp 时间截面的返回参数
-type TimeSectionEdbItemResp struct {
+// SectionScatterEdbItemResp 截面散点的返回参数
+type SectionScatterEdbItemResp struct {
 	XEdbInfoId int     `description:"X轴指标id"`
 	XDate      string  `description:"X轴指标实际日期"`
 	XName      string  `description:"X轴指标名称"`

services/chart/chart_info.go

@@ -421,16 +421,16 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 			return
 		}
 		extraConfig = barConfig
-	case 10: // 时间截面图
-		var tmpExtraConfig request.TimeSectionReq
+	case 10: // 截面散点图
+		var tmpExtraConfig request.SectionScatterReq
 		if extraConfigStr == `` {
-			errMsg = "时间截面图未配置"
+			errMsg = "截面散点图未配置"
 			err = errors.New(errMsg)
 			return
 		}
 		err = json.Unmarshal([]byte(extraConfigStr), &tmpExtraConfig)
 		if err != nil {
-			errMsg = "时间截面配置异常"
+			errMsg = "截面散点配置异常"
 			err = errors.New(errMsg)
 			return
 		}
@@ -459,9 +459,9 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 				}
 			}
 		}
-	case 10: // 时间截面图
-		timeSectionConf := extraConfig.(request.TimeSectionReq)
-		xEdbIdValue, dataResp, err = GetTimeSectionChartData(mappingList, edbDataListMap, timeSectionConf)
+	case 10: // 截面散点图
+		sectionScatterConf := extraConfig.(request.SectionScatterReq)
+		xEdbIdValue, dataResp, err = GetSectionScatterChartData(mappingList, edbDataListMap, sectionScatterConf)
 
 		// 这个数据没有必要返回给前端
 		for _, v := range edbList {
@@ -1016,8 +1016,8 @@ func ChartInfoRefreshV2(chartInfoId int) (err error) {
 // CheckChartExtraConfig 校验图表额外配置的信息,并且获取相关联的指标id
 func CheckChartExtraConfig(chartType int, extraConfigStr string) (edbIdList []int, err error, errMsg string) {
 	switch chartType {
-	case 10: //时间截面
-		var extraConfig request.TimeSectionReq
+	case 10: //截面散点
+		var extraConfig request.SectionScatterReq
 		err = json.Unmarshal([]byte(extraConfigStr), &extraConfig)
 		if err != nil {
 			return
@@ -1057,8 +1057,8 @@ func CheckChartExtraConfig(chartType int, extraConfigStr string) (edbIdList []in
 	return
 }
 
-// GetTimeSectionChartData 柱方图的数据处理
-func GetTimeSectionChartData(mappingList []*chartEdbMappingModel.ChartEdbInfoMapping, edbDataListMap map[int][]*edbDataModel.EdbDataList, extraConfig request.TimeSectionReq) (edbIdList []int, chartDataResp request.TimeSectionInfoResp, err error) {
+// GetSectionScatterChartData 柱方图的数据处理
+func GetSectionScatterChartData(mappingList []*chartEdbMappingModel.ChartEdbInfoMapping, edbDataListMap map[int][]*edbDataModel.EdbDataList, extraConfig request.SectionScatterReq) (edbIdList []int, chartDataResp request.SectionScatterInfoResp, err error) {
 	// 指标数据数组（10086:{"2022-12-02":100.01,"2022-12-01":102.3}）
 	edbDataMap := make(map[int]map[string]float64)
 	for edbInfoId, edbDataList := range edbDataListMap {
@@ -1076,18 +1076,18 @@ func GetTimeSectionChartData(mappingList []*chartEdbMappingModel.ChartEdbInfoMap
 		edbIdList = append(edbIdList, v.EdbInfoId)
 		edbMappingMap[v.EdbInfoId] = v
 	}
-	//TimeSectionSeriesInfoResp
+	//SectionScatterSeriesInfoResp
 
-	dataListResp := make([]request.TimeSectionSeriesItemResp, 0) //y轴的数据列表
+	dataListResp := make([]request.SectionScatterSeriesItemResp, 0) //y轴的数据列表
 
 	for _, seriesItem := range extraConfig.SeriesList {
 		var maxDate time.Time
 		// 系列中的指标数据
-		tmpSeriesEdbInfoList := make([]request.TimeSectionEdbItemResp, 0)
+		tmpSeriesEdbInfoList := make([]request.SectionScatterEdbItemResp, 0)
 
 		var minXVal, maxXVal, minYVal, maxYVal float64
 		for _, edbConf := range seriesItem.EdbInfoList {
-			tmpItem := request.TimeSectionEdbItemResp{
+			tmpItem := request.SectionScatterEdbItemResp{
 				IsShow: edbConf.IsShow,
 				Name:   edbConf.Name,
 				NameEn: edbConf.NameEn,
@@ -1320,7 +1320,7 @@ func GetTimeSectionChartData(mappingList []*chartEdbMappingModel.ChartEdbInfoMap
 			})
 		}
 
-		dataListResp = append(dataListResp, request.TimeSectionSeriesItemResp{
+		dataListResp = append(dataListResp, request.SectionScatterSeriesItemResp{
 			Name:            seriesItem.Name,
 			NameEn:          seriesItem.NameEn,
 			Color:           seriesItem.Color,
@@ -1334,7 +1334,7 @@ func GetTimeSectionChartData(mappingList []*chartEdbMappingModel.ChartEdbInfoMap
 		})
 	}
 
-	chartDataResp = request.TimeSectionInfoResp{
+	chartDataResp = request.SectionScatterInfoResp{
 		XName:       extraConfig.XName,
 		XNameEn:     extraConfig.XNameEn,
 		XUnitName:   extraConfig.XUnitName,