fix：手工数据刷新调整

services/data/edb_info_sync.go

@@ -3,6 +3,7 @@ package data
 import (
 	"eta/eta_task/models/data_manage"
 	"eta/eta_task/utils"
+	"strings"
 	"sync"
 )
 
@@ -47,15 +48,18 @@ func SyncGlDataBase() {
 
 var manualLock sync.Mutex
 
-// 同步手工数据
+// SyncManualDataBase 同步手工数据
 func SyncManualDataBase() {
 	var err error
+	errMsgList := make([]string, 0)
+
 	manualLock.Lock()
 	defer func() {
 		manualLock.Unlock()
-		if err != nil {
-			utils.FileLog.Info("SyncManualDataBase Err:" + err.Error())
-			go utils.SendEmailByHongze("同步手工数据失败", "同步手工数据失败 Err:"+err.Error(), utils.RefreshEdbInfoEmailSendToUsers, "", "")
+		if len(errMsgList) > 0 {
+			errMsg := strings.Join(errMsgList, "\n")
+			utils.FileLog.Info("SyncManualDataBase Err:" + errMsg)
+			go utils.SendEmailByHongze("同步手工数据失败", "同步手工数据失败 Err:"+errMsg, utils.RefreshEdbInfoEmailSendToUsers, "", "")
 		}
 	}()
 	var condition string
@@ -66,22 +70,21 @@ func SyncManualDataBase() {
 	pars = append(pars, utils.DATA_SOURCE_MANUAL)
 	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
 	if err != nil {
+		errMsgList = append(errMsgList, "获取指标失败 ；Err:"+err.Error())
 		return
 	}
 	for _, v := range items {
-		err = data_manage.RefreshManual(v)
-		if err != nil {
-			return
-		}
-		item, err := data_manage.GetEdbInfoMaxAndMinInfo(v.Source, v.EdbCode)
+		startDate := v.StartDate.Format(utils.FormatDate)
+		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
 		if err != nil {
-			return
+			//return errors.New("RefreshEdbData Err:" + err.Error())
+			errMsgList = append(errMsgList, "RefreshEdbData Err:"+err.Error())
+			continue
 		}
-		if item != nil {
-			err = data_manage.ModifyEdbInfoMaxAndMinInfo(v.EdbInfoId, item)
-			if err != nil {
-				return
-			}
+		if resp.Ret != 200 {
+			//return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
+			errMsgList = append(errMsgList, "RefreshEdbData Err:"+resp.Msg+";ErrMsg:"+resp.ErrMsg)
+			continue
 		}
 	}
 }