优化刷新计算指标顺序

services/data/edb_info.go

@@ -8,11 +8,12 @@ import (
 	"hongze/hongze_task/utils"
 	"rdluck_tools/http"
 	"strconv"
+	"sync"
 	"time"
 )
 
 //刷新同花顺数据
-func RefreshDataFromThs() (err error) {
+func RefreshDataFromThs(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshDataFromThs Err:" + err.Error())
@@ -74,11 +75,12 @@ func RefreshDataFromThs() (err error) {
 		//	return errors.New("ModifyEdbDataInfoDate:" + err.Error())
 		//}
 	}
+	wg.Done()
 	return err
 }
 
 //刷新万得数据
-func RefreshDataFromWind() (err error) {
+func RefreshDataFromWind(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshDataFromWind Err:" + err.Error())
@@ -131,11 +133,12 @@ func RefreshDataFromWind() (err error) {
 			}
 		}
 	}
+	wg.Done()
 	return err
 }
 
 //刷新彭博数据
-func RefreshDataFromPb() (err error) {
+func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshDataFromPb Err:" + err.Error())
@@ -198,6 +201,7 @@ func RefreshDataFromPb() (err error) {
 		//	return errors.New("ModifyEdbDataInfoDate:" + err.Error())
 		//}
 	}
+	wg.Done()
 	return err
 }
 

services/task.go

@@ -7,6 +7,7 @@ import (
 	"hongze/hongze_task/services/company_contract"
 	"hongze/hongze_task/services/data"
 	"hongze/hongze_task/utils"
+	"sync"
 )
 
 func Task() {
@@ -96,8 +97,8 @@ func releaseTask() {
 	task.AddTask("refreshData", refreshData)
 
 	//刷新计算指标数据
-	refreshCalculateData := task.NewTask("refreshCalculateData", "0 15 0,19 * * *", RefreshCalculateData)
-	task.AddTask("refreshCalculateData", refreshCalculateData)
+	//refreshCalculateData := task.NewTask("refreshCalculateData", "0 15 0,19 * * *", RefreshCalculateData)
+	//task.AddTask("refreshCalculateData", refreshCalculateData)
 
 	checkDataInterface := task.NewTask("checkDataInterface", "0 */2 * * * * ", data.CheckDataInterface)
 	task.AddTask("checkDataInterface", checkDataInterface)
@@ -136,23 +137,27 @@ func OneMinute(cont context.Context) (err error) {
 }
 
 func RefreshData(cont context.Context) (err error) {
+	wg:=sync.WaitGroup{}
+	wg.Add(3)
 	//wind
-	go data.RefreshDataFromWind()
+	go data.RefreshDataFromWind(&wg)
 	//同花顺
-	go data.RefreshDataFromThs()
+	go data.RefreshDataFromThs(&wg)
 	//彭博
-	go data.RefreshDataFromPb()
-	return
-}
-
-func RefreshCalculateData(cont context.Context) (err error) {
-	//计算指标
+	go data.RefreshDataFromPb(&wg)
+	wg.Wait()
 	go data.RefreshDataFromCalculateAll()
-	//刷新公历转农历数据
-	//go data.RefreshDataFromQuarterAll()
 	return
 }
 
+//func RefreshCalculateData(cont context.Context) (err error) {
+//	//计算指标
+//	go data.RefreshDataFromCalculateAll()
+//	//刷新公历转农历数据
+//	//go data.RefreshDataFromQuarterAll()
+//	return
+//}
+
 //func Task() {
 //	fmt.Println("start")
 //	data.RefreshDataFromCalculateAll()