钢联化工指标数据刷新埋点

controllers/base_from_mysteel_chemical.go

@@ -107,7 +107,7 @@ func (this *MySteelChemicalController) Refresh() {
 		br.Msg = "系统处理中，请稍后重试"
 		return
 	}
-
+	dataUpdateTime := time.Now().Format(utils.FormatDateTime)
 	utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 	err = models.RefreshEdbDataFromMysteelChemical(req.EdbInfoId, req.EdbCode, req.StartDate)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -116,7 +116,7 @@ func (this *MySteelChemicalController) Refresh() {
 		return
 	}
 	// 更新指标最大最小值
-	err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
+	err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfoDataUpdate(edbInfo, dataUpdateTime)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = err.Error()
@@ -126,6 +126,9 @@ func (this *MySteelChemicalController) Refresh() {
 	// 更新ES
 	go logic.UpdateEs(edbInfo.EdbInfoId)
 
+	// 添加指标刷新成功日志
+	_ = services.AddEdbInfoUpdateLog(edbInfo.EdbInfoId, 1, "")
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

logic/base_edb_info.go

@@ -3,6 +3,7 @@ package logic
 import (
 	"errors"
 	"eta/eta_index_lib/models"
+	"eta/eta_index_lib/services"
 	"eta/eta_index_lib/utils"
 	"strconv"
 	"time"
@@ -35,14 +36,28 @@ func RefreshBaseEdbInfo(edbInfo *models.EdbInfo, startDate string) (isHandling b
 		err = errors.New("刷新指标信息失败 RefreshEdbDataFromSci，Err:" + err.Error())
 		return
 	}
+	
 	// 更新指标最大最小值
-	err, errMsg = models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
-	if err != nil {
-		return
+	if edbInfo.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
+		dataUpdateTime := time.Now().Format(utils.FormatDateTime)
+		err, errMsg = models.UnifiedModifyEdbInfoMaxAndMinInfoDataUpdate(edbInfo, dataUpdateTime)
+		if err != nil {
+			return
+		}
+	} else {
+		err, errMsg = models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
+		if err != nil {
+			return
+		}
 	}
 
 	// 更新ES
 	go UpdateEs(edbInfo.EdbInfoId)
 
+	// 添加钢联化工指标的刷新日志
+	if edbInfo.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
+		// 添加指标刷新成功日志
+		_ = services.AddEdbInfoUpdateLog(edbInfo.EdbInfoId, 1, "")
+	}
 	return
 }

models/edb_info.go

@@ -443,40 +443,12 @@ func UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo *EdbInfo) (err error, errMsg stri
 	return
 }
 
-// UnifiedModifyEdbInfoMaxAndMinInfo 统一修改指标的最大最小值
-func UnifiedModifyEdbInfoMaxAndMinInfoTmp(edbInfo *EdbInfo, dataUpdateTime string) (err error, errMsg string) {
-	// 修改最大最小值
-	maxAndMinItem, err := GetEdbInfoMaxAndMinInfo(edbInfo.Source, edbInfo.EdbCode)
+// UnifiedModifyEdbInfoMaxAndMinInfoDataUpdate 统一修改指标的最大最小值以及数据更新时间点
+func UnifiedModifyEdbInfoMaxAndMinInfoDataUpdate(edbInfo *EdbInfo, dataUpdateTime string) (err error, errMsg string) {
+	err, errMsg = UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			err = nil
-			return
-		}
-
-		errMsg = "刷新指标失败！"
-		err = errors.New("获取指标最大最小值失败，err:" + err.Error())
 		return
 	}
-
-	if maxAndMinItem != nil {
-		// ETA1.0.3改-如果指标有手动保存过, 那么就不更新指标的最大最小值
-		if edbInfo.ManualSave == 1 {
-			err = ModifyEdbTimeAndLastInfo(edbInfo.EdbInfoId, maxAndMinItem)
-			if err != nil {
-				errMsg = "刷新指标失败！"
-				err = errors.New("修改指标最新日期和数据失败，err:" + err.Error())
-				return
-			}
-		} else {
-			err = ModifyEdbInfoMaxAndMinInfo(edbInfo.EdbInfoId, maxAndMinItem)
-			if err != nil {
-				errMsg = "刷新指标失败！"
-				err = errors.New("修改指标最大最小值失败，err:" + err.Error())
-				return
-			}
-		}
-	}
-
 	// 获取本次刷新，指标数据更新的最早日期
 	erDataUpdateTime, tErr := GetEdbDataUpdateTimeByModify(edbInfo.Source, edbInfo.EdbCode, dataUpdateTime)
 	if tErr != nil {
@@ -493,8 +465,6 @@ func UnifiedModifyEdbInfoMaxAndMinInfoTmp(edbInfo *EdbInfo, dataUpdateTime strin
 			return
 		}
 	}
-	// 修改关联的预测指标
-	go ModifyPredictEdbInfoMaxAndMinInfoBySourceEdbInfoId(edbInfo.EdbInfoId, maxAndMinItem)
 	return
 }
 

services/base_from_mysteel_chemical.go

@@ -173,7 +173,7 @@ func handleIndex(indexItem *models.HandleMysteelIndex) (err error) {
 			fmt.Println("ModifyMysteelIndexMaxAndMinInfo Err:" + e.Error())
 		}
 	}
-	
+
 	// 同步刷新图库钢联的指标
 	go func() {
 		var indexErr error
@@ -192,6 +192,7 @@ func handleIndex(indexItem *models.HandleMysteelIndex) (err error) {
 		if edbInfo != nil {
 			logic.RefreshBaseEdbInfo(edbInfo, ``)
 		}
+		// todo 添加钢联终端刷新到数据源的刷新日志
 	}()
 
 	return