Merge branch 'bzq1/stl' of eta_server/eta_api into debug

services/data/stl/stl.go

@@ -203,14 +203,42 @@ func GenerateStlEdbData(req *request.StlConfigReq, adminId int) (resp *response.
 		msg = "获取配置信息失败"
 		return
 	}
+	var relationEdbInfoId []int
 	for _, mapping := range confMapping {
 		switch mapping.StlEdbType {
 		case 1:
 			resp.TrendChartInfo.EdbInfoId = mapping.EdbInfoId
+			relationEdbInfoId = append(relationEdbInfoId, mapping.EdbInfoId)
 		case 2:
 			resp.SeasonalChartInfo.EdbInfoId = mapping.EdbInfoId
+			relationEdbInfoId = append(relationEdbInfoId, mapping.EdbInfoId)
 		case 3:
 			resp.ResidualChartInfo.EdbInfoId = mapping.EdbInfoId
+			relationEdbInfoId = append(relationEdbInfoId, mapping.EdbInfoId)
+		}
+	}
+	relationEdbInfo, err := data_manage.GetEdbInfoByIdList(relationEdbInfoId)
+	if err != nil {
+		msg = "获取关联指标信息失败"
+		return
+	}
+	for _, info := range relationEdbInfo {
+		switch info.EdbInfoId {
+		case resp.TrendChartInfo.EdbInfoId:
+			resp.TrendChartInfo.Title = info.EdbName
+			resp.TrendChartInfo.ClassifyId = info.ClassifyId
+			resp.TrendChartInfo.Frequency = info.Frequency
+			resp.TrendChartInfo.Unit = info.Unit
+		case resp.SeasonalChartInfo.EdbInfoId:
+			resp.SeasonalChartInfo.Title = info.EdbName
+			resp.SeasonalChartInfo.ClassifyId = info.ClassifyId
+			resp.SeasonalChartInfo.Frequency = info.Frequency
+			resp.SeasonalChartInfo.Unit = info.Unit
+		case resp.ResidualChartInfo.EdbInfoId:
+			resp.ResidualChartInfo.Title = info.EdbName
+			resp.ResidualChartInfo.ClassifyId = info.ClassifyId
+			resp.ResidualChartInfo.Frequency = info.Frequency
+			resp.ResidualChartInfo.Unit = info.Unit
 		}
 	}