新增区间计算预测指标

controllers/data_manage/range_analysis/chart_info.go

@@ -1420,17 +1420,16 @@ func (this *RangeChartChartInfoController) MultipleGraphConfigSaveEdb() {
 		}
 		reqEdbList = append(reqEdbList, v)
 	}
-
-	if req.EdbInfoType == 0 { //普通指标
-		if len(reqEdbList) <= 0 {
-			br.Msg = "新增失败！"
-			if len(resp.Fail) > 0 {
-				br.ErrMsg = resp.Fail[0].Msg
-			} else {
-				br.Msg = "请选择指标"
-			}
-			return
+	if len(reqEdbList) <= 0 {
+		br.Msg = "新增失败！"
+		if len(resp.Fail) > 0 {
+			br.ErrMsg = resp.Fail[0].Msg
+		} else {
+			br.Msg = "请选择指标"
 		}
+		return
+	}
+	if req.EdbInfoType == 0 { //普通指标
 		saveReq.Source = utils.DATA_SOURCE_CALCULATE_RANGEANLYSIS
 		saveReq.CalculateFormula = extraConfig
 		saveReq.AdminId = sysUser.AdminId
@@ -1454,6 +1453,7 @@ func (this *RangeChartChartInfoController) MultipleGraphConfigSaveEdb() {
 			br.ErrMsg = respItem.ErrMsg
 			return
 		}
+		resp = respItem.Data
 		calculateEdbList = respItem.Data.Success
 	} else if req.EdbInfoType == 1 {
 		// 预测指标
@@ -1468,7 +1468,37 @@ func (this *RangeChartChartInfoController) MultipleGraphConfigSaveEdb() {
 			predictReq.FromEdbInfoId = v.FromEdbInfoId
 			predictReq.AdminId = sysUser.AdminId
 			predictReq.AdminName = sysUser.RealName
-			//todo 新增预测指标的区间计算指标
+			predictReq.Source = utils.DATA_SOURCE_PREDICT_CALCULATE_RANGEANLYSIS
+			reqJson, err := json.Marshal(predictReq)
+			if err != nil {
+				br.Msg = "参数解析异常！"
+				br.ErrMsg = "参数解析失败，Err:" + err.Error()
+				return
+			}
+			respItem, err := data.BatchSavePredictEdbData(string(reqJson), this.Lang)
+			if err != nil {
+				resp.Fail = append(resp.Fail, data_manage.BatchEdbInfoCalculateBatchSaveFailResp{
+					CalculateId: v.CalculateId,
+					Msg:         "新增失败！",
+					ErrMsg:      "新增失败，Err:" + err.Error(),
+				})
+				continue
+			}
+			if respItem.Ret != 200 {
+				resp.Fail = append(resp.Fail, data_manage.BatchEdbInfoCalculateBatchSaveFailResp{
+					CalculateId: v.CalculateId,
+					Msg:         respItem.Msg,
+					ErrMsg:      respItem.ErrMsg,
+				})
+				continue
+			}
+
+			calculateEdbList = append(calculateEdbList, data_manage.BatchEdbInfoCalculateBatchSaveSuccessResp{
+				CalculateId: v.CalculateId,
+				EdbInfoId:   respItem.Data.EdbInfoId,
+				UniqueCode:  respItem.Data.UniqueCode,
+				ClassifyId:  predictReq.ClassifyId,
+			})
 		}
 	}
 
@@ -1517,7 +1547,7 @@ func (this *RangeChartChartInfoController) MultipleGraphConfigSaveEdb() {
 			}
 		}
 	}
-
+	resp.Success = calculateEdbList
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "保存成功"

utils/constants.go

@@ -174,6 +174,8 @@ const (
 	DATA_SOURCE_BUSINESS                             = 84       // 来源于自有数据
 	DATA_SOURCE_SCI99                                = 85       // 卓创资讯 -> 85
 	DATA_SOURCE_CALCULATE_RANGEANLYSIS               = 87       //区间计算->87
+	DATA_SOURCE_PREDICT_CALCULATE_RANGEANLYSIS       = 90       // 预测指标区间计算->90
+
 )
 
 // 数据刷新频率