盘面价格曲线

models/data_manage/future_good/future_good_edb_info.go

@@ -12,7 +12,11 @@ type FutureGoodEdbInfo struct {
 	FutureGoodEdbName   string    `description:"期货指标名称"`
 	FutureGoodEdbNameEn string    `description:"期货指标英文名称"`
 	ParentId            int       `description:"上级期货id"`
+	RegionType          string    `description:"交易所来源，海外还是国内"`
 	Exchange            string    `description:"所属交易所"`
+	FutureGoodEdbType   int       `description:"指标类型,1:年月是固定的合约；2：只有M+N期的合约，未固定年月"`
+	DateSourceId        int       `description:"画图时，日期来源的指标id"`
+	Year                int       `description:"所属年份"`
 	Month               int       `description:"所属月份"`
 	StartDate           string    `description:"起始日期"`
 	EndDate             string    `description:"终止日期"`

services/data/future_good/chart_info.go

@@ -8,6 +8,7 @@ import (
 	future_good2 "hongze/hongze_ETA_mobile_api/models/data_manage/future_good"
 	"hongze/hongze_ETA_mobile_api/services/data"
 	"hongze/hongze_ETA_mobile_api/utils"
+	"sort"
 	"strconv"
 	"time"
 )
@@ -83,8 +84,45 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, edbInfoMapping,
 		})
 	}
 
+	// 获取主力合约和最新日期
+	var zlFutureGoodEdbInfo *future_good2.FutureGoodEdbInfo
+	var latestDate string // 最新日期是这个
+	var regionType string // 交易所来源：“国内”，“海外”
+	var futureGoodEdbType int
+	{
+		// 寻找主力合约
+		zlFutureGoodEdbInfo, err = future_good2.GetFutureGoodEdbInfo(futureGoodEdbInfoMapping.EdbInfoId)
+		if err != nil {
+			return
+		}
+		regionType = zlFutureGoodEdbInfo.RegionType
+		futureGoodEdbType = zlFutureGoodEdbInfo.FutureGoodEdbType
+
+		// 如果当前合约配置的 "画图时，日期来源的指标id" 并不是自己的话，那么就去查找对应配置的合约
+		if zlFutureGoodEdbInfo.DateSourceId != zlFutureGoodEdbInfo.FutureGoodEdbInfoId {
+			sourceDateFutureGoodEdbInfo, tmpErr := future_good2.GetFutureGoodEdbInfo(zlFutureGoodEdbInfo.DateSourceId)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			latestDate = sourceDateFutureGoodEdbInfo.EndDate // 最新日期是这个
+		} else {
+			latestDate = zlFutureGoodEdbInfo.EndDate // 最新日期是这个
+		}
+		if latestDate == `0000-00-00` {
+			err = errors.New("日期异常")
+			return
+		}
+	}
+
 	// 获取期货指标以及期货数据
-	futureGoodEdbInfoList, err := future_good2.GetFutureGoodEdbInfoListByParentId(futureGoodEdbInfoMapping.EdbInfoId)
+	tmpFutureGoodEdbInfoList, err := future_good2.GetFutureGoodEdbInfoListByParentId(futureGoodEdbInfoMapping.EdbInfoId)
+	if err != nil {
+		return
+	}
+
+	latestDateTime, _ := time.ParseInLocation(utils.FormatDate, latestDate, time.Local)
+	_, futureGoodEdbInfoList, err := getFutureGoodEdbInfoList(latestDateTime, tmpFutureGoodEdbInfoList, barChartInfoDateList)
 	if err != nil {
 		return
 	}
@@ -162,8 +200,54 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, edbInfoMapping,
 		v.DataList = dataList
 	}
 
-	edbList = append(edbList, futureGoodMappingList...)
-	xEdbIdValue, yDataList, err = BarChartData(edbList[0], futureGoodMappingList, edbDataListMap, barChartInfoDateList, barChartInfoSort)
+	if regionType == `海外` {
+		zlFutureGoodEdbMapping := &data_manage.ChartEdbInfoMapping{
+			EdbInfoId:           zlFutureGoodEdbInfo.FutureGoodEdbInfoId,
+			SourceName:          zlFutureGoodEdbInfo.Exchange,
+			Source:              0,
+			EdbCode:             zlFutureGoodEdbInfo.FutureGoodEdbCode,
+			EdbName:             zlFutureGoodEdbInfo.FutureGoodEdbName,
+			EdbAliasName:        zlFutureGoodEdbInfo.FutureGoodEdbName,
+			EdbNameEn:           zlFutureGoodEdbInfo.FutureGoodEdbNameEn,
+			EdbType:             edbInfoMapping.EdbType,
+			Frequency:           edbInfoMapping.Frequency,
+			FrequencyEn:         edbInfoMapping.FrequencyEn,
+			Unit:                edbInfoMapping.Unit,
+			UnitEn:              edbInfoMapping.UnitEn,
+			StartDate:           zlFutureGoodEdbInfo.StartDate,
+			EndDate:             zlFutureGoodEdbInfo.EndDate,
+			ModifyTime:          zlFutureGoodEdbInfo.ModifyTime.Format(utils.FormatDateTime),
+			ChartEdbMappingId:   zlFutureGoodEdbInfo.FutureGoodEdbInfoId,
+			ChartInfoId:         edbInfoMapping.ChartInfoId,
+			MaxData:             zlFutureGoodEdbInfo.MaxValue,
+			MinData:             zlFutureGoodEdbInfo.MinValue,
+			IsOrder:             edbInfoMapping.IsOrder,
+			IsAxis:              edbInfoMapping.IsAxis,
+			EdbInfoType:         edbInfoMapping.EdbInfoType,
+			EdbInfoCategoryType: edbInfoMapping.EdbInfoCategoryType,
+			LeadValue:           edbInfoMapping.LeadValue,
+			LeadUnit:            edbInfoMapping.LeadUnit,
+			LeadUnitEn:          edbInfoMapping.LeadUnitEn,
+			ChartStyle:          edbInfoMapping.ChartStyle,
+			ChartColor:          edbInfoMapping.ChartColor,
+			PredictChartColor:   edbInfoMapping.PredictChartColor,
+			ChartWidth:          edbInfoMapping.ChartWidth,
+			ChartType:           edbInfoMapping.ChartType,
+			LatestDate:          zlFutureGoodEdbInfo.LatestDate.Format(utils.FormatDateTime),
+			LatestValue:         zlFutureGoodEdbInfo.LatestValue,
+			UniqueCode:          futureGoodEdbInfoMapping.UniqueCode + strconv.Itoa(0),
+			MinValue:            zlFutureGoodEdbInfo.MinValue,
+			MaxValue:            zlFutureGoodEdbInfo.MaxValue,
+			DataList:            nil,
+			IsNullData:          false,
+		}
+		edbList = append(edbList, zlFutureGoodEdbMapping)
+		edbList = append(edbList, futureGoodMappingList...)
+	} else {
+		edbList = append(edbList, futureGoodMappingList...)
+	}
+
+	xEdbIdValue, yDataList, err = BarChartData(edbList[0], futureGoodEdbInfoList, edbDataListMap, barChartInfoDateList, regionType, latestDate)
 
 	xDataList = []data_manage.XData{
 		{
@@ -171,19 +255,114 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, edbInfoMapping,
 			NameEn: "Spot Price",
 		},
 	}
+	//yDataList =make([]data_manage.YData,0)
+	//data_manage.YData{
+	//	Date:           "",
+	//	Color:          "",
+	//	Name:           "",
+	//	NameEn:         "",
+	//	Value:          nil,
+	//	NoDataEdbList:  nil,
+	//	XEdbInfoIdList: nil,
+	//}
+	futureGoodEdbInfoIndexMap := make(map[int]int)
+	for index, v := range futureGoodEdbInfoList {
+		futureGoodEdbInfoIndexMap[v.FutureGoodEdbInfoId] = index
+	}
+	nMap := make(map[int]int)
+	maxIndex := 0 // 最大x轴的下标
+	for k, tmpYData := range yDataList {
+		yDataMap := tmpYData.EdbValMap
+		edbInfoIdList := make([]int, 0)
+		noDataEdbInfoIdList := make([]int, 0)
+		valueList := make([]float64, 0)
+		noDataEdbIdMap := make(map[int]int)
+
+		// 所有的N值
+		for _, n := range tmpYData.M {
+			nMap[n] = n
+		}
 
-	for i := 1; i <= 11; i++ {
-		xDataList = append(xDataList, data_manage.XData{
-			Name:   fmt.Sprint("M+", i),
-			NameEn: fmt.Sprint("M+", i),
-		})
+		// 基础指标
+		{
+			baseEdbInfId := edbList[0].EdbInfoId
+			edbInfoIdList = append(edbInfoIdList, baseEdbInfId)
+			tmpVal, ok := yDataMap[baseEdbInfId]
+			valueList = append(valueList, tmpVal)
+			if !ok || tmpVal == 0 {
+				noDataEdbInfoIdList = append(noDataEdbInfoIdList, baseEdbInfId)
+				noDataEdbIdMap[baseEdbInfId] = baseEdbInfId
+			}
+		}
+
+		for _, futureGoodEdbInfo := range futureGoodEdbInfoList {
+			tmpEdbInfId := futureGoodEdbInfo.FutureGoodEdbInfoId
+			edbInfoIdList = append(edbInfoIdList, tmpEdbInfId)
+			tmpVal, ok := yDataMap[tmpEdbInfId]
+			valueList = append(valueList, tmpVal)
+			if !ok || tmpVal == 0 {
+				noDataEdbInfoIdList = append(noDataEdbInfoIdList, tmpEdbInfId)
+				noDataEdbIdMap[tmpEdbInfId] = tmpEdbInfId
+			}
+		}
+		//tmpYData.Value = valueList
+		tmpYData.NoDataEdbList = noDataEdbInfoIdList
+		yDataList[k] = tmpYData
+
+		lenEdbId := len(edbInfoIdList)
+		tmpMaxIndex := lenEdbId - 1 // 当前数据的最大x轴的下标
+
+		for i := lenEdbId - 1; i >= 0; i-- {
+			// 如果没有在无数据的指标列表中找到，那么就找到了最大x轴的下标
+			if _, ok := noDataEdbIdMap[edbInfoIdList[i]]; !ok {
+				// 如果最大x轴的下标 小于 当前下标，那么就重新赋值
+				if maxIndex < i-1 {
+					maxIndex = i - 1
+				}
+				break
+			}
+
+			tmpMaxIndex = i - 1
+		}
+
+		// 如果最大x轴的下标 小于 当前下标，那么就重新赋值
+		if maxIndex < tmpMaxIndex {
+			maxIndex = tmpMaxIndex
+		}
+	}
+
+	//xEdbIdValue = xEdbIdValue[0:maxIndex]
+
+	// 找出所有的N值，并进行正序排列
+	nList := make([]int, 0)
+	for _, n := range nMap {
+		nList = append(nList, n)
+	}
+	sort.Slice(nList, func(i, j int) bool {
+		return nList[i] < nList[j]
+	})
+
+	for k, v := range yDataList {
+		if len(v.XEdbInfoIdList) >= maxIndex+1 {
+			yDataList[k].XEdbInfoIdList = v.XEdbInfoIdList[0 : maxIndex+1]
+		}
+		if len(v.Value) >= maxIndex+1 {
+			yDataList[k].Value = v.Value[0 : maxIndex+1]
+		}
 	}
 
+	tmpXDataList, newYDataList, err := handleResultData(regionType, futureGoodEdbType, yDataList, futureGoodEdbInfoList, maxIndex)
+	if err != nil {
+		return
+	}
+	xDataList = append(xDataList, tmpXDataList...)
+	yDataList = newYDataList
+
 	return
 }
 
-// BarChartData 柱方图的数据处理
-func BarChartData(edbInfoMapping *data_manage.ChartEdbInfoMapping, futureGoodMappingList []*data_manage.ChartEdbInfoMapping, edbDataListMap map[int][]*data_manage.EdbDataList, barChartInfoDateList []data_manage.BarChartInfoDateReq, barChartInfoSort data_manage.BarChartInfoSortReq) (edbIdList []int, yDataList []data_manage.YData, err error) {
+// BarChartData 获取数据
+func BarChartData(edbInfoMapping *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)
 	for edbInfoId, edbDataList := range edbDataListMap {
@@ -197,27 +376,16 @@ func BarChartData(edbInfoMapping *data_manage.ChartEdbInfoMapping, futureGoodMap
 	// edbIdList 指标展示顺序；x轴的指标顺序
 	edbIdList = make([]int, 0)
 	edbIdList = append(edbIdList, edbInfoMapping.EdbInfoId)
-	if barChartInfoSort.Sort == 0 {
-		for _, v := range futureGoodMappingList {
-			edbIdList = append(edbIdList, v.EdbInfoId)
-		}
+	for _, v := range futureGoodMappingList {
+		edbIdList = append(edbIdList, v.FutureGoodEdbInfoId)
 	}
 
-	//固定取螺纹期货主力合约的时间序列，最新值为该合约最新日期、N天前为该合约最新日期N天前
-	rbzlInfo, err := future_good2.GetFutureGoodEdbInfoByCode("RBZL.SHF")
-	if err != nil {
-		return
-	}
-	latestDate := rbzlInfo.EndDate // 最新日期是这个
-	if rbzlInfo.EndDate == `0000-00-00` {
-		err = errors.New("日期异常")
-		return
-	}
 	latestDateTime, _ := time.ParseInLocation(utils.FormatDate, latestDate, time.Local)
 
 	yDataList = make([]data_manage.YData, 0) //y轴的数据列表
 
 	for _, barChartInfoDate := range barChartInfoDateList {
+		yDataMap := make(map[int]float64)
 		var maxDate time.Time
 
 		var findDateTime time.Time
@@ -255,6 +423,7 @@ func BarChartData(edbInfoMapping *data_manage.ChartEdbInfoMapping, futureGoodMap
 			return
 		}
 		findDataList = append(findDataList, findDataValue)
+		yDataMap[edbInfoMapping.EdbInfoId] = findDataValue
 		if isFind {
 			maxDate = realDateTime
 		} else {
@@ -262,48 +431,58 @@ func BarChartData(edbInfoMapping *data_manage.ChartEdbInfoMapping, futureGoodMap
 			noDataIdMap[edbInfoMapping.EdbInfoId] = edbInfoMapping.EdbInfoId
 		}
 		currMonth := findDateTime.Month() // 当前月份
+		currYear := findDateTime.Year()   // 当前年份
 		xEdbInfoIdList = append(xEdbInfoIdList, edbInfoMapping.EdbInfoId)
-
-		// 当前月的后面月份合约的数据
-		for i := currMonth; i < 12; i++ {
-			futureGoodMapping := futureGoodMappingList[i] // 当前的期货指标
-			tmpRealDateTime, tmpFindDataValue, tmpIsFind, tmpErr := GetNeedDateData(findDateTime, edbDataListMap[futureGoodMapping.EdbInfoId], edbDataMap[futureGoodMapping.EdbInfoId])
-			if tmpErr != nil {
-				err = tmpErr
-				return
+		mList := make([]int, 0) // 间隔月份
+		indexList := make([]int, 0)
+		if regionType == `国内` {
+			for i := currMonth + 1; i <= 12; i++ {
+				indexList = append(indexList, int(i))
+				mList = append(mList, int(i-currMonth))
 			}
-			findDataList = append(findDataList, tmpFindDataValue)
-			if tmpIsFind {
-				if maxDate.IsZero() || maxDate.Before(tmpRealDateTime) {
-					maxDate = tmpRealDateTime
+			for i := 1; i < int(currMonth); i++ {
+				indexList = append(indexList, i)
+				mList = append(mList, 12+i-int(currMonth))
+			}
+		} else {
+			for i, v := range futureGoodMappingList {
+				if v.FutureGoodEdbType == 2 {
+					if i == 0 {
+						continue
+					}
+					indexList = append(indexList, i)
+					mList = append(mList, v.Month)
+				} else {
+					if v.Year > currYear || (v.Year == currYear && v.Month > int(currMonth)) {
+						indexList = append(indexList, i)
+						mList = append(mList, (v.Year-currYear)*12+v.Month-int(currMonth))
+					}
 				}
-			} else {
-				noDataIdList = append(noDataIdList, futureGoodMapping.EdbInfoId)
-				noDataIdMap[futureGoodMapping.EdbInfoId] = futureGoodMapping.EdbInfoId
 			}
-			// 当前期货合约的指标
-			xEdbInfoIdList = append(xEdbInfoIdList, futureGoodMapping.EdbInfoId)
 		}
 
-		// 当前月的前面月份合约的数据
-		for i := 1; i < int(currMonth); i++ {
-			futureGoodMapping := futureGoodMappingList[i-1] // 当前的期货指标
-			tmpRealDateTime, tmpFindDataValue, tmpIsFind, tmpErr := GetNeedDateData(findDateTime, edbDataListMap[futureGoodMapping.EdbInfoId], edbDataMap[futureGoodMapping.EdbInfoId])
-			if tmpErr != nil {
-				err = tmpErr
-				return
-			}
+		for _, i := range indexList {
+			futureGoodMapping := futureGoodMappingList[i] // 当前的期货指标
+			//tmpRealDateTime, tmpFindDataValue, tmpIsFind, tmpErr := GetNeedDateData(findDateTime, edbDataListMap[futureGoodMapping.FutureGoodEdbInfoId], edbDataMap[futureGoodMapping.FutureGoodEdbInfoId])
+			//if tmpErr != nil {
+			//	err = tmpErr
+			//	return
+			//}
+			tmpRealDateTime := findDateTime
+			tmpFindDataValue, tmpIsFind := edbDataMap[futureGoodMapping.FutureGoodEdbInfoId][findDateTime.Format(utils.FormatDate)]
+			yDataMap[futureGoodMapping.FutureGoodEdbInfoId] = tmpFindDataValue
+
 			findDataList = append(findDataList, tmpFindDataValue)
 			if tmpIsFind {
 				if maxDate.IsZero() || maxDate.Before(tmpRealDateTime) {
 					maxDate = tmpRealDateTime
 				}
 			} else {
-				noDataIdList = append(noDataIdList, futureGoodMapping.EdbInfoId)
-				noDataIdMap[futureGoodMapping.EdbInfoId] = futureGoodMapping.EdbInfoId
+				noDataIdList = append(noDataIdList, futureGoodMapping.FutureGoodEdbInfoId)
+				noDataIdMap[futureGoodMapping.FutureGoodEdbInfoId] = futureGoodMapping.FutureGoodEdbInfoId
 			}
 			// 当前期货合约的指标
-			xEdbInfoIdList = append(xEdbInfoIdList, futureGoodMapping.EdbInfoId)
+			xEdbInfoIdList = append(xEdbInfoIdList, futureGoodMapping.FutureGoodEdbInfoId)
 		}
 
 		yName := barChartInfoDate.Name
@@ -356,18 +535,317 @@ func BarChartData(edbInfoMapping *data_manage.ChartEdbInfoMapping, futureGoodMap
 
 		yDataList = append(yDataList, data_manage.YData{
 			Date:           yDate,
+			ConfigDate:     findDateTime,
 			Value:          findDataList,
 			NoDataEdbList:  noDataIdList,
 			XEdbInfoIdList: xEdbInfoIdList,
 			Color:          barChartInfoDate.Color,
 			Name:           yName,
 			NameEn:         yNameEn,
+			EdbValMap:      yDataMap,
+			M:              mList,
 		})
 	}
 
 	return
 }
 
+// handleResultData 处理成最终的结果数据
+func handleResultData(regionType string, futureGoodEdbType int, yDataList []data_manage.YData, futureGoodEdbInfoList []*future_good2.FutureGoodEdbInfo, maxIndex int) (xDataList []data_manage.XData, newYDataList []data_manage.YData, err error) {
+	xDataList = make([]data_manage.XData, 0)
+	newYDataList = yDataList
+
+	if regionType == `国内` {
+		for i := 1; i < 12; i++ {
+			if i > maxIndex {
+				break
+			}
+			xDataList = append(xDataList, data_manage.XData{
+				Name:   fmt.Sprint("M+", i),
+				NameEn: fmt.Sprint("M+", i),
+			})
+		}
+		return
+	}
+
+	futureGoodEdbInfoMap := make(map[int]*future_good2.FutureGoodEdbInfo)
+	for _, v := range futureGoodEdbInfoList {
+		futureGoodEdbInfoMap[v.FutureGoodEdbInfoId] = v
+	}
+
+	if futureGoodEdbType == 2 { // 	FutureGoodEdbType   int       `description:"指标类型,1:年月是固定的合约；2：只有M+N期的合约，未固定年月"`
+		nList := []int{3, 15, 27}
+		for _, i := range nList {
+			xDataList = append(xDataList, data_manage.XData{
+				Name:   fmt.Sprint("M+", i),
+				NameEn: fmt.Sprint("M+", i),
+			})
+		}
+
+		for yIndex, yData := range yDataList {
+			newYDataList[yIndex].XEdbInfoIdList = []int{}
+			newYDataList[yIndex].Value = []float64{}
+			tmpNList := nList
+
+			//当前的主力合约
+			newYDataList[yIndex].XEdbInfoIdList = append(newYDataList[yIndex].XEdbInfoIdList, yData.XEdbInfoIdList[0])
+			newYDataList[yIndex].Value = append(newYDataList[yIndex].Value, yData.Value[0])
+
+			xEdbInfoIdList := yData.XEdbInfoIdList[1:]
+			valIndex := 1
+			needNum := 0
+			for _, n := range tmpNList {
+				if len(xEdbInfoIdList) > 0 {
+					edbInfoId := xEdbInfoIdList[0]
+					futureGoodEdbInfo, ok := futureGoodEdbInfoMap[edbInfoId]
+					if !ok {
+						err = errors.New("找不到指标")
+						return
+					}
+					// 当前距离最早的日期相差的N数
+					if futureGoodEdbInfo.Month == n {
+						if needNum > 0 {
+							currVal := yData.Value[valIndex]
+							preVal := yData.Value[valIndex-1]
+							hcValDeci := decimal.NewFromFloat(currVal).Sub(decimal.NewFromFloat(preVal)).Div(decimal.NewFromInt(int64(needNum + 1)))
+
+							for tmpNum := 0; tmpNum < needNum; tmpNum++ {
+								newYDataList[yIndex].XEdbInfoIdList = append(newYDataList[yIndex].XEdbInfoIdList, 0)
+
+								// 赋值平均值
+								tmpVal, _ := decimal.NewFromFloat(preVal).Add(hcValDeci.Mul(decimal.NewFromInt(int64(tmpNum + 1)))).RoundCeil(4).Float64()
+								newYDataList[yIndex].Value = append(newYDataList[yIndex].Value, tmpVal)
+							}
+						}
+
+						newYDataList[yIndex].XEdbInfoIdList = append(newYDataList[yIndex].XEdbInfoIdList, edbInfoId)
+						newYDataList[yIndex].Value = append(newYDataList[yIndex].Value, yData.Value[valIndex])
+						valIndex++
+						needNum = 0
+						if len(xEdbInfoIdList) > 0 {
+							xEdbInfoIdList = xEdbInfoIdList[1:]
+						}
+					} else {
+						needNum++
+					}
+				}
+			}
+		}
+
+		maxI := 0
+		for _, yData := range newYDataList {
+			lenEdb := len(yData.XEdbInfoIdList)
+			for i := 0; i < lenEdb; i++ {
+				if yData.XEdbInfoIdList[i] != 0 && !utils.InArrayByInt(yData.NoDataEdbList, yData.XEdbInfoIdList[i]) {
+					if maxI < i {
+						maxI = i
+					}
+				}
+			}
+		}
+
+		xDataList = xDataList[0:maxI]
+		for yIndex, yData := range newYDataList {
+			if len(yData.XEdbInfoIdList) > maxI+1 {
+				newYDataList[yIndex].XEdbInfoIdList = yData.XEdbInfoIdList[0 : maxI+1]
+			}
+			if len(yData.Value) > maxI+1 {
+				newYDataList[yIndex].Value = yData.Value[0 : maxI+1]
+			}
+		}
+		return
+	}
+
+	nMap := make(map[int]int)
+
+	for _, v := range yDataList {
+		findDateTime := v.ConfigDate
+		currMonth := findDateTime.Month() // 当前月份
+		currYear := findDateTime.Year()   // 当前年份
+		//v.XEdbInfoIdList
+		for edbInfoIndex, edbInfoId := range v.XEdbInfoIdList {
+			// 第一个不处理
+			if edbInfoIndex == 0 {
+				continue
+			}
+
+			futureGoodEdbInfo, ok := futureGoodEdbInfoMap[edbInfoId]
+			if !ok {
+				err = errors.New("找不到指标")
+				return
+			}
+			n := (futureGoodEdbInfo.Year-currYear)*12 + futureGoodEdbInfo.Month - int(currMonth)
+			nMap[n] = n
+		}
+
+	}
+
+	// 找出所有的N值，并进行正序排列
+	nList := make([]int, 0)
+	for _, n := range nMap {
+		nList = append(nList, n)
+	}
+	sort.Slice(nList, func(i, j int) bool {
+		return nList[i] < nList[j]
+	})
+
+	//prevMonth := 1
+
+	for _, n := range nList {
+		xDataList = append(xDataList, data_manage.XData{
+			Name:   fmt.Sprint("M+", n),
+			NameEn: fmt.Sprint("M+", n),
+		})
+	}
+
+	for yIndex, yData := range yDataList {
+		newYDataList[yIndex].XEdbInfoIdList = []int{}
+		newYDataList[yIndex].Value = []float64{}
+		tmpNList := nList
+
+		//当前的主力合约
+		newYDataList[yIndex].XEdbInfoIdList = append(newYDataList[yIndex].XEdbInfoIdList, yData.XEdbInfoIdList[0])
+		newYDataList[yIndex].Value = append(newYDataList[yIndex].Value, yData.Value[0])
+
+		xEdbInfoIdList := yData.XEdbInfoIdList[1:]
+		currDataTime := yData.ConfigDate
+		valIndex := 1
+		needNum := 0
+		for _, n := range tmpNList {
+			if len(xEdbInfoIdList) > 0 {
+				edbInfoId := xEdbInfoIdList[0]
+				futureGoodEdbInfo, ok := futureGoodEdbInfoMap[edbInfoId]
+				if !ok {
+					err = errors.New("找不到指标")
+					return
+				}
+				// 当前距离最早的日期相差的N数
+				divMonth := (futureGoodEdbInfo.Year-currDataTime.Year())*12 + (futureGoodEdbInfo.Month - int(currDataTime.Month()))
+				if divMonth == n {
+					if needNum > 0 {
+						currVal := yData.Value[valIndex]
+						preVal := yData.Value[valIndex-1]
+						hcValDeci := decimal.NewFromFloat(currVal).Sub(decimal.NewFromFloat(preVal)).Div(decimal.NewFromInt(int64(needNum + 1)))
+
+						for tmpNum := 0; tmpNum < needNum; tmpNum++ {
+							newYDataList[yIndex].XEdbInfoIdList = append(newYDataList[yIndex].XEdbInfoIdList, 0)
+
+							// 赋值平均值
+							tmpVal, _ := decimal.NewFromFloat(preVal).Add(hcValDeci.Mul(decimal.NewFromInt(int64(tmpNum + 1)))).RoundCeil(4).Float64()
+							newYDataList[yIndex].Value = append(newYDataList[yIndex].Value, tmpVal)
+						}
+					}
+
+					newYDataList[yIndex].XEdbInfoIdList = append(newYDataList[yIndex].XEdbInfoIdList, edbInfoId)
+					newYDataList[yIndex].Value = append(newYDataList[yIndex].Value, yData.Value[valIndex])
+					valIndex++
+					needNum = 0
+					if len(xEdbInfoIdList) > 0 {
+						xEdbInfoIdList = xEdbInfoIdList[1:]
+					}
+				} else {
+					needNum++
+				}
+			}
+		}
+	}
+
+	maxI := 0
+	for _, yData := range newYDataList {
+		lenEdb := len(yData.XEdbInfoIdList)
+		for i := 0; i < lenEdb; i++ {
+			if yData.XEdbInfoIdList[i] != 0 && !utils.InArrayByInt(yData.NoDataEdbList, yData.XEdbInfoIdList[i]) {
+				if maxI < i {
+					maxI = i
+				}
+			}
+		}
+	}
+
+	xDataList = xDataList[0:maxI]
+	for yIndex, yData := range newYDataList {
+		if len(yData.XEdbInfoIdList) > maxI+1 {
+			newYDataList[yIndex].XEdbInfoIdList = yData.XEdbInfoIdList[0 : maxI+1]
+		}
+		if len(yData.Value) > maxI+1 {
+			newYDataList[yIndex].Value = yData.Value[0 : maxI+1]
+		}
+	}
+	return
+}
+
+// getFutureGoodEdbInfoList 获取适用的指标列表
+func getFutureGoodEdbInfoList(latestDateTime time.Time, tmpFutureGoodEdbInfoList []*future_good2.FutureGoodEdbInfo, barChartInfoDateList []data_manage.BarChartInfoDateReq) (earliestDateTime time.Time, futureGoodEdbInfoList []*future_good2.FutureGoodEdbInfo, err error) {
+	maxM := 32 //最大32期合约
+	futureGoodEdbInfoList = make([]*future_good2.FutureGoodEdbInfo, 0)
+	earliestDateTime = latestDateTime // 数据的最早日期，目的是为了找出最早的合约
+	for _, barChartInfoDate := range barChartInfoDateList {
+		var findDateTime time.Time
+		switch barChartInfoDate.Type {
+		case 1: //最新值
+			findDateTime = latestDateTime
+		case 2: //近期几天
+			findDateTime = latestDateTime.AddDate(0, 0, -barChartInfoDate.Value)
+		case 3: // 固定日期
+			//寻找固定日期的数据
+			tmpFindDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, barChartInfoDate.Date, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			findDateTime = tmpFindDateTime
+		default:
+			err = errors.New(fmt.Sprint("日期类型异常,Type:", barChartInfoDate.Type))
+			return
+		}
+		if findDateTime.IsZero() {
+			err = errors.New("错误的日期")
+			return
+		}
+		if findDateTime.Before(earliestDateTime) {
+			earliestDateTime = findDateTime
+		}
+	}
+
+	for _, v := range tmpFutureGoodEdbInfoList {
+		if v.RegionType == `国内` {
+			futureGoodEdbInfoList = append(futureGoodEdbInfoList, v)
+			continue
+		}
+		//海外的连续日期,目前
+		if v.FutureGoodEdbType == 2 {
+			if v.Month <= maxM {
+				//addMonth := int(earliestDateTime.Month()) + v.Month
+				//v.Year = earliestDateTime.Year() + addMonth/12
+				//realMonth := addMonth % 12
+				//if realMonth == 0 {
+				//	realMonth = 12
+				//}
+				//v.Month = realMonth
+				futureGoodEdbInfoList = append(futureGoodEdbInfoList, v)
+			}
+			continue
+		}
+
+		if v.Year < earliestDateTime.Year() {
+			continue
+		}
+		// 小于等于当前年，那么就肯定是ok的
+		if v.Year <= earliestDateTime.Year() {
+			futureGoodEdbInfoList = append(futureGoodEdbInfoList, v)
+			continue
+		}
+		// 如果（当前年-最新日期的年份） * 12个月 + (当前月-最新日期的月份) 小于总月份
+		if (v.Year-earliestDateTime.Year())*12+(v.Month-int(earliestDateTime.Month())) <= maxM {
+			futureGoodEdbInfoList = append(futureGoodEdbInfoList, v)
+			continue
+		}
+
+	}
+
+	return
+}
+
 // GetNeedDateData 获取合约内需要的日期数据
 func GetNeedDateData(needDateTime time.Time, dataList []*data_manage.EdbDataList, edbDataMap map[string]float64) (findDateTime time.Time, findDataValue float64, isFind bool, err error) {
 	//dataList := edbDataListMap[edbInfoId] //指标的所有数据值
@@ -398,4 +876,3 @@ func GetNeedDateData(needDateTime time.Time, dataList []*data_manage.EdbDataList
 
 	return
 }
-