Merge branch 'feature/eta1.9.5_feature_good' into debug

# Conflicts:
#	models/data_manage/chart_info.go
#	services/data/future_good/chart_info.go

models/data_manage/chart_info.go

@@ -265,6 +265,11 @@ type EditChartInfoReq struct {
 	ChartAlias           string                  `description:"图表别名"`
 }
 
+type EditFutureGoodChartInfoReq struct {
+	EditChartInfoReq
+	BarChartInfo FutureGoodBarChartInfoReq
+}
+
 type MarkersLine struct {
 	Axis             int             `json:"axis" description:"1左轴 2右轴 3横轴"`
 	AxisName         string          `json:"axisName" description:"轴的名称，例如'左轴'"`
@@ -313,11 +318,6 @@ type EdbDateConfDateChange struct {
 	ChangeType   int    `json:"changeType" description:"日期变换类型1日期位移，2指定频率"`
 }
 
-type EditFutureGoodChartInfoReq struct {
-	EditChartInfoReq
-	BarChartInfo FutureGoodBarChartInfoReq
-}
-
 type EditChartEnInfoReq struct {
 	ChartInfoId      int                       `description:"图表ID"`
 	ChartNameEn      string                    `description:"英文图表名称"`

services/data/future_good/chart_info.go

@@ -439,7 +439,6 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, baseEdbInfoMapp
 // BarChartData 获取数据
 func BarChartData(baseEdbInfoMapping *data_manage.ChartEdbInfoMapping, edbInfoMappingList []*data_manage.ChartEdbInfoMapping, futureGoodMappingList []*future_good2.FutureGoodEdbInfo, edbDataListMap map[int][]*data_manage.EdbDataList, barChartInfoDateList []data_manage.BarChartInfoDateReq, regionType, latestDate string) (edbIdList []int, yDataList []data_manage.YData, err error) {
 	// 指标数据数组（10086:{"2022-12-02":100.01,"2022-12-01":102.3}）
-	edbDataMap := make(map[int]map[string]float64)
 	// 现货指标数据map
 	baseEdbDataMap := make(map[int]map[string]float64)
 	edbInfoMappingMap := make(map[int]struct{})
@@ -456,12 +455,8 @@ func BarChartData(baseEdbInfoMapping *data_manage.ChartEdbInfoMapping, edbInfoMa
 		}
 	}
 
-	// 期货指标数据map
-	//futureGoodEdbDataMap := make(map[int]map[string]float64)
+	edbDataMap := make(map[int]map[string]float64)
 	for edbInfoId, edbDataList := range edbDataListMap {
-		if _, ok := edbInfoMappingMap[edbInfoId]; ok {
-			continue
-		}
 		edbDateData := make(map[string]float64)
 		for _, edbData := range edbDataList {
 			edbDateData[edbData.DataTime] = edbData.Value
@@ -552,7 +547,9 @@ func BarChartData(baseEdbInfoMapping *data_manage.ChartEdbInfoMapping, edbInfoMa
 		// 用实际日期的月份作为基准，往前推12个月（2024-5-13 16:26:43修改）
 		currMonth := realDateTime.Month() // 当前月份
 		currYear := realDateTime.Year()   // 当前年份
-		mList := make([]int, 0)           // 间隔月份
+
+		mList := make([]int, 0) // 间隔月份
+
 		indexList := make([]int, 0)
 		if regionType == `国内` {
 			for i := currMonth + 1; i <= 12; i++ {