Browse Source

fix:同花顺刷新问题

Roc 1 year ago
parent
commit
63173857f4
1 changed files with 51 additions and 11 deletions
  1. 51 11
      services/data/edb_info.go

+ 51 - 11
services/data/edb_info.go

@@ -15,11 +15,17 @@ import (
 
 // RefreshDataFromThs 刷新同花顺数据
 func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
+	errMsgList := make([]string, 0)
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshDataFromThs Err:" + err.Error())
 			go alarm_msg.SendAlarmMsg("RefreshDataFromThs ErrMsg:"+err.Error(), 3)
 		}
+		if len(errMsgList) > 0 {
+			errMsg := "RefreshDataFromThs Err:" + strings.Join(errMsgList, "\n")
+			fmt.Println(errMsg)
+			go alarm_msg.SendAlarmMsg(errMsg, 3)
+		}
 		wg.Done()
 	}()
 	var condition string
@@ -50,10 +56,12 @@ func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
 		}
 		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, 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 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
+			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
+			continue
 		}
 	}
 	return err
@@ -114,11 +122,17 @@ func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
 
 // RefreshDataFromPb 刷新彭博数据
 func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
+	errMsgList := make([]string, 0)
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshDataFromPb Err:" + err.Error())
 			go alarm_msg.SendAlarmMsg("RefreshDataFromPb ErrMsg:"+err.Error(), 3)
 		}
+		if len(errMsgList) > 0 {
+			errMsg := "RefreshDataFromPb Err:" + strings.Join(errMsgList, "\n")
+			fmt.Println(errMsg)
+			go alarm_msg.SendAlarmMsg(errMsg, 3)
+		}
 		wg.Done()
 	}()
 	var condition string
@@ -148,10 +162,12 @@ func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
 		}
 		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, 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 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
+			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
+			continue
 		}
 	}
 	return err
@@ -159,12 +175,18 @@ func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
 
 // RefreshDataFromPbFinance 刷新彭博财务指标数据
 func RefreshDataFromPbFinance(wg *sync.WaitGroup) (err error) {
+	errMsgList := make([]string, 0)
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshDataFromPb Err:" + err.Error())
 			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromPb ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 			go alarm_msg.SendAlarmMsg("RefreshDataFromPb ErrMsg:"+err.Error(), 3)
 		}
+		if len(errMsgList) > 0 {
+			errMsg := "RefreshDataFromPbFinance Err:" + strings.Join(errMsgList, "\n")
+			fmt.Println(errMsg)
+			go alarm_msg.SendAlarmMsg(errMsg, 3)
+		}
 		wg.Done()
 	}()
 	var condition string
@@ -195,10 +217,12 @@ func RefreshDataFromPbFinance(wg *sync.WaitGroup) (err error) {
 
 		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, 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 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
+			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
+			continue
 		}
 
 	}
@@ -294,11 +318,17 @@ func RefreshPredictDataFromCalculateAll() (err error) {
 
 // RefreshDataFromManual 刷新手工指标数据
 func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
+	errMsgList := make([]string, 0)
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshDataFromManual Err:" + err.Error())
 			go alarm_msg.SendAlarmMsg("RefreshDataFromManual ErrMsg:"+err.Error(), 3)
 		}
+		if len(errMsgList) > 0 {
+			errMsg := "RefreshDataFromManual Err:" + strings.Join(errMsgList, "\n")
+			fmt.Println(errMsg)
+			go alarm_msg.SendAlarmMsg(errMsg, 3)
+		}
 		wg.Done()
 	}()
 	var condition string
@@ -315,10 +345,12 @@ func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
 		startDate := v.StartDate.Format(utils.FormatDate)
 		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, 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 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
+			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
+			continue
 		}
 	}
 	return err
@@ -639,14 +671,20 @@ func RefreshDataFromDl(wg *sync.WaitGroup) (err error) {
 	return err
 }
 
-// 刷新有色数据
+// RefreshDataFromYs 刷新有色数据
 func RefreshDataFromYs(wg *sync.WaitGroup) (err error) {
+	errMsgList := make([]string, 0)
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshDataFromYs Err:" + err.Error())
 			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromYs ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 			go alarm_msg.SendAlarmMsg("RefreshDataFromYs ErrMsg:"+err.Error(), 3)
 		}
+		if len(errMsgList) > 0 {
+			errMsg := "RefreshDataFromYs Err:" + strings.Join(errMsgList, "\n")
+			fmt.Println(errMsg)
+			go alarm_msg.SendAlarmMsg(errMsg, 3)
+		}
 		wg.Done()
 	}()
 	var condition string
@@ -675,10 +713,12 @@ func RefreshDataFromYs(wg *sync.WaitGroup) (err error) {
 		}
 		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, 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 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
+			errMsgList = append(errMsgList, v.EdbCode+";RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
+			continue
 		}
 	}
 	return err