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

models/data_manage/stl/response/stl.go

@@ -37,11 +37,6 @@ type SaveStlConfigResp struct {
 	CalculateStlConfigId int64 `description:"配置文件id"`
 }
 
-type StlEdbInfo struct {
-	StlEdbType int `description:"stl指标类型: 1-Trend, 2-Seasonal, 3-Residual"`
-	EdbInfoId  int `description:"指标ID"`
-}
-
 type StlConfigResp struct {
 	EdbInfoId            int     `description:"指标ID"`
 	EdbInfoName          string  `description:"指标名称"`
@@ -58,7 +53,6 @@ type StlConfigResp struct {
 	TrendDeg             int     `description:"分解中趋势多项式次数，默认为1，不超过5的正整数"`
 	SeasonalDeg          int     `description:"分解中季节性多项次数，默认为1，不超过5的正整数"`
 	LowPassDeg           int     `description:"分解中低通滤波器次数，默认为1，不超过5的正整数"`
-	StlEdbInfo           []*StlEdbInfo
 }
 
 type SaveStlEdbInfoResp struct {

services/data/stl/stl.go

@@ -1264,17 +1264,18 @@ func GetStlConfig(edbInfoId int) (resp *response.StlConfigResp, msg string, err
 		return
 	}
 
-	conf, err := stl.GetCalculateStlConfigById(configId)
+	queryEdbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
 	if err != nil {
 		if err.Error() == utils.ErrNoRow() {
-			msg = "未找到配置，请刷新后重试"
+			msg = "未找到指标，请刷新后重试"
 			return
 		}
 		msg = "获取失败"
 		return
 	}
+
 	var req request.StlConfigReq
-	if err = json.Unmarshal([]byte(conf.Config), &req); err != nil {
+	if err = json.Unmarshal([]byte(queryEdbInfo.CalculateFormula), &req); err != nil {
 		msg = "获取失败"
 		return
 	}
@@ -1287,20 +1288,8 @@ func GetStlConfig(edbInfoId int) (resp *response.StlConfigResp, msg string, err
 		msg = "获取失败"
 		return
 	}
-	mappingList, err := stl.GetCalculateStlConfigMappingByConfigId(configId)
-	if err != nil {
-		msg = "获取失败"
-		return
-	}
-	stlEdbInfo := make([]*response.StlEdbInfo, 0)
-	for _, v := range mappingList {
-		stlEdbInfo = append(stlEdbInfo, &response.StlEdbInfo{
-			StlEdbType: v.StlEdbType,
-			EdbInfoId:  v.EdbInfoId,
-		})
-	}
 	resp = &response.StlConfigResp{
-		CalculateStlConfigId: conf.CalculateStlConfigId,
+		CalculateStlConfigId: configId,
 		EdbInfoId:            req.EdbInfoId,
 		EdbInfoName:          edbInfo.EdbName,
 		DataRangeType:        req.DataRangeType,
@@ -1315,7 +1304,6 @@ func GetStlConfig(edbInfoId int) (resp *response.StlConfigResp, msg string, err
 		TrendDeg:             req.TrendDeg,
 		SeasonalDeg:          req.SeasonalDeg,
 		LowPassDeg:           req.LowPassDeg,
-		StlEdbInfo:           stlEdbInfo,
 	}
 	return
 }