Merge branch 'feature/eta_forum3_chart_classify' into debug

services/eta_forum/eta_forum_hub.go

@@ -315,11 +315,13 @@ func GetEdbListByEdbInfoId(edbInfoIds []int) (edbInfoList []*data_manage.EdbInfo
 	//查询所有指标数据
 	//查询这个指标相关的mapping信息放到数组里，
 	//将得到的指标ID信息放到数组里
+	chartEdbInfoIdMap := make(map[int]struct{}) //只查询图表上直接相关的指标数据
 	hasFindMap := make(map[int]struct{})
 	edbInfoIdMap := make(map[int]struct{})
 	edbMappingList = make([]*data_manage.EdbInfoCalculateMapping, 0)
 	edbMappingMap := make(map[int]struct{})
 	for _, edbInfoId := range edbInfoIds {
+		chartEdbInfoIdMap[edbInfoId] = struct{}{}
 		edbMappingList, err = traceEdbInfoByEdbInfoId(edbInfoId, hasFindMap, edbInfoIdMap, edbMappingList, edbMappingMap)
 		if err != nil {
 			err = fmt.Errorf(" traceEdbInfoByEdbInfoId err: %s", err.Error())
@@ -339,6 +341,9 @@ func GetEdbListByEdbInfoId(edbInfoIds []int) (edbInfoList []*data_manage.EdbInfo
 	}
 
 	for _, v := range edbInfoList {
+		if _, ok := chartEdbInfoIdMap[v.EdbInfoId]; !ok {
+			continue
+		}
 		var dataList []*data_manage.EdbDataBase
 		if v.Source == utils.DATA_SOURCE_BUSINESS && utils.UseMongo {
 			dataList, err = data_manage.GetEdbDataBaseMongoByEdbInfoId(v.EdbInfoId, v.Source, v.SubSource)