fix

services/data/edb_info.go

@@ -7,10 +7,11 @@ import (
 	"hongze/hongze_task_trial/models/data_manage"
 	"hongze/hongze_task_trial/services/alarm_msg"
 	"hongze/hongze_task_trial/utils"
+	"strings"
 	"sync"
 )
 
-// 刷新同花顺数据
+// RefreshDataFromThs 刷新同花顺数据
 func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
@@ -56,19 +57,24 @@ func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
 	return err
 }
 
-// 刷新万得数据
+// RefreshDataFromWind 刷新万得数据
 func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
+	errMsgList := make([]string, 0)
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshDataFromWind Err:" + err.Error())
-			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromWind ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 			go alarm_msg.SendAlarmMsg("RefreshDataFromWind ErrMsg:"+err.Error(), 3)
 		}
+		if len(errMsgList) > 0 {
+			errMsg := "RefreshDataFromWind Err:" + strings.Join(errMsgList, "\n")
+			fmt.Println(errMsg)
+			go alarm_msg.SendAlarmMsg(errMsg, 3)
+		}
 		wg.Done()
 	}()
 	var condition string
 	var pars []interface{}
-	condition += ` AND source=? AND no_update = 0 AND is_update = 1`
+	condition += ` AND source=? AND no_update = 0 `
 	pars = append(pars, utils.DATA_SOURCE_WIND)
 
 	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
@@ -76,7 +82,6 @@ func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
 		return err
 	}
 	for _, v := range items {
-		fmt.Println(v.EdbCode, "start refresh")
 		startDate := ""
 		if v.Frequency == "日度" {
 			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
@@ -93,18 +98,19 @@ func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
 		}
 		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
 		if err != nil {
-			return errors.New("RefreshEdbData Err:" + err.Error())
+			errMsgList = append(errMsgList, v.EdbCode+"RefreshEdbData Err:"+err.Error())
+			continue
 		}
 		if resp.Ret != 200 {
-			fmt.Println("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
-			//return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
+			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
+			continue
 		}
 	}
 	fmt.Println("wind刷新结束")
 	return err
 }
 
-// 刷新彭博数据
+// RefreshDataFromPb 刷新彭博数据
 func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
@@ -284,7 +290,7 @@ func RefreshPredictDataFromCalculateAll() (err error) {
 	return err
 }
 
-// 刷新手工指标数据
+// RefreshDataFromManual 刷新手工指标数据
 func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
@@ -321,7 +327,7 @@ func ResetEdbInfoIsUpdate(cont context.Context) (err error) {
 	return nil
 }
 
-// RefreshDataFromEic 刷新谷歌出行数据
+// RefreshDataFromGoogleTravel RefreshDataFromEic 刷新谷歌出行数据
 func RefreshDataFromGoogleTravel(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {

services/task.go

@@ -22,9 +22,6 @@ func Task() {
 
 // 生产环境需要走的任务
 func releaseTask() {
-	wg := sync.WaitGroup{}
-	wg.Add(1)
-	data.RefreshDataFromWind(&wg)
 
 	//同步指标
 	syncHzDataIndex := task.NewTask("syncHzDataIndex", "0 30 0,18,21 * * *", SyncHzDataIndex)
@@ -75,7 +72,7 @@ func RefreshData(cont context.Context) (err error) {
 	return
 }
 
-// 刷新基础数据
+// SyncBaseDataExt 刷新基础数据
 func SyncBaseDataExt(cont context.Context) (err error) {
 	now := time.Now()
 	if now.Hour() == 0 || now.Hour() == 19 {