调整嘉悦数据刷新时间

services/data/edb_info.go

@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"time"
 )
 
 // RefreshDataFromThs 刷新同花顺数据
@@ -1030,14 +1031,16 @@ func RefreshDataFromEic(wg *sync.WaitGroup) (err error) {
 	return err
 }
 
-// RefreshDataFromBridge 刷新来自桥接服务的来源
-func RefreshDataFromBridge(wg *sync.WaitGroup) (err error) {
+// RefreshJiaYueDataFromBridge 嘉悦物产-刷新数据宝指标
+func RefreshJiaYueDataFromBridge(cont context.Context) (err error) {
+	utils.FileLog.Info(fmt.Sprintf("嘉悦-开始刷新数据宝指标: %s", time.Now().Format(utils.FormatDateTime)))
 	defer func() {
 		if err != nil {
-			utils.FileLog.Info("RefreshDataFromBridge ErrMsg: %s", err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromBridge ErrMsg: "+err.Error(), 3)
+			tips := fmt.Sprintf("RefreshJiaYueDataFromBridge ErrMsg: %s", err.Error())
+			utils.FileLog.Info(tips)
+			go alarm_msg.SendAlarmMsg(tips, 3)
 		}
-		wg.Done()
+		utils.FileLog.Info(fmt.Sprintf("嘉悦-结束刷新数据宝指标: %s", time.Now().Format(utils.FormatDateTime)))
 	}()
 
 	// 获取来自桥接服务的指标来源
@@ -1056,7 +1059,7 @@ func RefreshDataFromBridge(wg *sync.WaitGroup) (err error) {
 		sourceArr = append(sourceArr, strconv.Itoa(v.EdbSourceId))
 	}
 	if len(sourceArr) == 0 {
-		utils.FileLog.Info("RefreshDataFromBridge无来源")
+		utils.FileLog.Info("RefreshJiaYueDataFromBridge 无数据来源")
 		return
 	}
 
@@ -1087,12 +1090,14 @@ func RefreshDataFromBridge(wg *sync.WaitGroup) (err error) {
 		}
 		resp, e := RefreshEdbData(v.EdbInfoId, v.Source, v.SubSource, v.EdbCode, startDate)
 		if e != nil {
-			err = fmt.Errorf("RefreshEdbData err: %s", e.Error())
-			return
+			utils.FileLog.Info(fmt.Sprintf("RefreshEdbData err: %s", e.Error()))
+			//err = fmt.Errorf("RefreshEdbData err: %s", e.Error())
+			continue
 		}
 		if resp.Ret != 200 {
-			err = fmt.Errorf("RefreshEdbData Err: %s; ErrMsg: %s", resp.Msg, resp.ErrMsg)
-			return
+			utils.FileLog.Info(fmt.Sprintf("RefreshEdbData indexCode: %s, err: %s, errMsg: %s", v.EdbCode, resp.Msg, resp.ErrMsg))
+			//err = fmt.Errorf("RefreshEdbData Err: %s; ErrMsg: %s", resp.Msg, resp.ErrMsg)
+			continue
 		}
 	}
 	return

services/task.go

@@ -92,10 +92,15 @@ func releaseTask() {
 	clearAdminOperateLog := task.NewTask("clearAdminOperateLog", "0 20 23 * * *", ClearAdminOperateLog)
 	task.AddTask("定时清理用户操作日志", clearAdminOperateLog)
 
-	// 嘉悦物产-每分钟定时同步增量指标
+	// 嘉悦物产
 	if utils.BusinessCode == utils.BusinessCodeJiaYue {
+		// 每分钟定时同步增量指标
 		syncJiaYueNewIndex := task.NewTask("syncJiaYueNewIndex", "0 */1 * * * *", data.SyncJiaYueNewIndex)
 		task.AddTask("定时同步嘉悦物产增量指标", syncJiaYueNewIndex)
+
+		// 每30分钟同步一次数据宝指标数据
+		syncJiaYueDataBaby := task.NewTask("syncJiaYueDataBaby", "0 */30 * * * * ", data.RefreshJiaYueDataFromBridge)
+		task.AddTask("syncJiaYueDataBaby", syncJiaYueDataBaby)
 	}
 }
 
@@ -137,10 +142,6 @@ func RefreshData(cont context.Context) (err error) {
 	//国家统计局指标
 	go data.RefreshDataFromNationalStatistics(&wg)
 
-	// 来自桥接服务的指标
-	wg.Add(1)
-	go data.RefreshDataFromBridge(&wg)
-
 	wg.Wait()
 	////计算指标
 	data.RefreshDataFromCalculateAll()