fix:预测基础指标

services/data/edb_info.go

@@ -286,6 +286,47 @@ func RefreshDataFromCalculateAll() (err error) {
 	return err
 }
 
+// RefreshBasePredictDataAll 刷新所有的基础预测指标
+func RefreshBasePredictDataAll() (err error) {
+	errMsgList := make([]string, 0)
+	defer func() {
+		if len(errMsgList) > 0 {
+			utils.FileLog.Info("RefreshBasePredictDataAll ErrMsg:" + strings.Join(errMsgList, "\n"))
+			go alarm_msg.SendAlarmMsg("RefreshBasePredictDataAll ErrMsg:"+strings.Join(errMsgList, "\n"), 3)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+	// 查询 普通指标的计算指标
+	condition += " AND edb_type=?  AND edb_info_type=? "
+	pars = append(pars, 1, 1)
+
+	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
+	if err != nil {
+		errMsgList = append(errMsgList, fmt.Sprintf("获取基础预测指标列表失败；err：%s", err.Error()))
+		return err
+	}
+	for _, v := range items {
+		source := v.Source
+		startDate := v.StartDate.Format(utils.FormatDate)
+		if startDate == "0001-01-01" {
+			continue
+		}
+
+		fmt.Println(v.EdbInfoId, v.EdbCode, v.EdbName, v.SourceName, source, "======RefreshBasePredictDataAll：", startDate)
+		result, tmpErr := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
+		if tmpErr != nil {
+			errMsgList = append(errMsgList, fmt.Sprintf("刷新基础预测指标失败1，指标ID：%d；指标编码：%s；err：%s", v.EdbInfoId, v.EdbCode, tmpErr.Error()))
+			continue
+		}
+		if result.Ret != 200 {
+			errMsgList = append(errMsgList, fmt.Sprintf("刷新基础预测指标失败2，指标ID：%d；指标编码：%s；报错提示信息msg：%s；报错信息err：%s", v.EdbInfoId, v.EdbCode, result.ErrMsg, result.Msg))
+			continue
+		}
+	}
+	return err
+}
+
 // RefreshPredictDataFromCalculateAll 刷新所有预测计算指标
 func RefreshPredictDataFromCalculateAll() (err error) {
 	defer func() {

services/task.go

@@ -159,8 +159,12 @@ func RefreshData(cont context.Context) (err error) {
 	////计算指标
 	data.RefreshDataFromCalculateAll()
 
+	// 刷新所有的基础预测指标
+	data.RefreshBasePredictDataAll()
+
 	// 预测计算指标
 	data.RefreshPredictDataFromCalculateAll()
+
 	time.Sleep(5 * time.Second)
 	data.RefreshNotice()
 
@@ -221,6 +225,10 @@ func RefreshTradeData(cont context.Context) (err error) {
 	wg.Wait()
 	//计算指标
 	data.RefreshDataFromCalculateAll()
+
+	// 刷新所有的基础预测指标
+	data.RefreshBasePredictDataAll()
+
 	// 计算预测指标
 	data.RefreshPredictDataFromCalculateAll()
 
@@ -237,6 +245,10 @@ func RefreshEicData(cont context.Context) (err error) {
 	wg.Wait()
 	//计算指标
 	data.RefreshDataFromCalculateAll()
+
+	// 刷新所有的基础预测指标
+	data.RefreshBasePredictDataAll()
+
 	// 计算预测指标
 	data.RefreshPredictDataFromCalculateAll()