数据源统计刷新

models/data_stat/edb_source_stat.go

@@ -7,20 +7,19 @@ import (
 
 // EdbSourceStat 数据源统计表
 type EdbSourceStat struct {
-	Id                   int       `orm:"column(id);pk"`
-	SourceName           string    `description:"来源名称"`
-	Source               int       `description:"来源id"`
-	TerminalCode         string    `description:"终端编码，用于配置在机器上"`
-	EdbNum               int       `description:"指标总数"`
-	EdbNewNum            int       `description:"今日新增指标数"`
-	EdbDelNum            int       `description:"今日删除指标数"`
-	NeedRefreshNum       int       `description:"今日需刷新指标"`
-	HasRefreshNum        int       `description:"今日发起刷新任务指标数"`
-	UpdateSuccessNum     int       `description:"今日已刷新成功指标数"`
-	UpdateFailedNum      int       `description:"今日已刷新失败指标数"`
-	DataUpdateSuccessNum int       `description:"今日已更新指标"`
-	CreateTime           time.Time `description:"创建时间"`
-	ModifyTime           time.Time `description:"修改时间"`
+	Id               int       `orm:"column(id);pk"`
+	SourceName       string    `description:"来源名称"`
+	Source           int       `description:"来源id"`
+	TerminalCode     string    `description:"终端编码，用于配置在机器上"`
+	EdbNum           int       `description:"指标总数"`
+	EdbNewNum        int       `description:"今日新增指标数"`
+	EdbDelNum        int       `description:"今日删除指标数"`
+	NeedRefreshNum   int       `description:"今日需刷新指标"`
+	HasRefreshNum    int       `description:"今日发起刷新任务指标数"`
+	UpdateSuccessNum int       `description:"今日已刷新成功指标数"`
+	UpdateFailedNum  int       `description:"今日已刷新失败指标数"`
+	CreateTime       time.Time `description:"创建时间"`
+	ModifyTime       time.Time `description:"修改时间"`
 }
 
 func GetEdbSourceStatByCondition(condition string, pars []interface{}) (item []*EdbSourceStat, err error) {
@@ -51,8 +50,7 @@ edb_del_num=?,
 need_refresh_num=?,                      
 has_refresh_num=?,                       
 update_success_num=?,                   
-update_failed_num=?,                    
-data_update_success_num=?,                                         
+update_failed_num=?,                                                         
 modify_time=?                           
 WHERE
 	id = ?`
@@ -64,7 +62,7 @@ WHERE
 		_ = p.Close() // 别忘记关闭 statement
 	}()
 	for _, v := range list {
-		_, err = p.Exec(v.EdbNum, v.EdbNewNum, v.EdbDelNum, v.NeedRefreshNum, v.HasRefreshNum, v.UpdateFailedNum, v.DataUpdateSuccessNum, v.ModifyTime, v.Id)
+		_, err = p.Exec(v.EdbNum, v.EdbNewNum, v.EdbDelNum, v.NeedRefreshNum, v.HasRefreshNum, v.UpdateFailedNum, v.ModifyTime, v.Id)
 		if err != nil {
 			return
 		}

services/base_from_mysteel_chemical.go

@@ -20,6 +20,25 @@ func HandleMysteelIndex(req *models.HandleMysteelIndexResp) (err error) {
 			return
 		}
 	}
+	go func() {
+		var lErr error
+		defer func() {
+			if lErr != nil {
+				tips := fmt.Sprintf("钢联数据刷新-ETA指标刷新统计异常 Err: %s", lErr.Error())
+				alarm_msg.SendAlarmMsg(tips, 3)
+			}
+		}()
+
+		lErr = SetMysteelChemicalEdbInfoUpdateStat()
+		if lErr != nil {
+			return
+		}
+		lErr = SetEdbSourceStat()
+
+		if lErr != nil {
+			return
+		}
+	}()
 	return
 }
 
@@ -193,11 +212,17 @@ func handleIndex(indexItem *models.HandleMysteelIndex) (err error) {
 	// 同步刷新图库钢联的指标
 	go func() {
 		var indexErr error
+		var lErr error
 		defer func() {
 			if indexErr != nil {
 				tips := fmt.Sprintf("钢联数据刷新-ETA指标刷新异常, 指标编码: %s, err: %s", indexObj.IndexCode, indexErr.Error())
 				alarm_msg.SendAlarmMsg(tips, 3)
 			}
+
+			if lErr != nil {
+				tips := fmt.Sprintf("钢联数据刷新-ETA指标刷新统计异常, 指标编码: %s, err: %s", indexObj.IndexCode, lErr.Error())
+				alarm_msg.SendAlarmMsg(tips, 3)
+			}
 		}()
 
 		edbInfo, e := models.GetEdbInfoByEdbCode(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, indexObj.IndexCode)
@@ -216,12 +241,13 @@ func handleIndex(indexItem *models.HandleMysteelIndex) (err error) {
 				sourceUpdateFailedReason = "未刷新到数据"
 			}
 			sourceUpdateTime := time.Now().Format(utils.FormatDateTime)
+
 			if logErr != nil {
 				// 添加刷新失败日志
-				_ = AddEdbInfoUpdateLog(edbInfo.EdbInfoId, 2, logErrMsg+err.Error(), sourceUpdateResult, sourceUpdateFailedReason, sourceUpdateTime)
+				lErr = AddEdbInfoUpdateLog(edbInfo.EdbInfoId, 2, logErrMsg+err.Error(), sourceUpdateResult, sourceUpdateFailedReason, sourceUpdateTime)
 			} else {
 				// 添加刷新成功日志
-				_ = AddEdbInfoUpdateLog(edbInfo.EdbInfoId, 1, "", sourceUpdateResult, sourceUpdateFailedReason, sourceUpdateTime)
+				lErr = AddEdbInfoUpdateLog(edbInfo.EdbInfoId, 1, "", sourceUpdateResult, sourceUpdateFailedReason, sourceUpdateTime)
 			}
 		}
 	}()

services/edb_info_stat.go

@@ -134,7 +134,6 @@ func SetMysteelChemicalEdbInfoUpdateStat() (err error) {
 				//NeedRefresh:              v.NeedRefresh,
 				//HasRefresh:               v.HasRefresh,
 			}
-			// todo 判断是否需要当日更新
 			needRefresh, _ := checkMySteelEdbInfoNeedRefresh(v.Frequency)
 			tmp.NeedRefresh = needRefresh
 
@@ -288,9 +287,6 @@ func SetEdbSourceStat() (err error) {
 			} else {
 				tmp.UpdateFailedNum = tmp.UpdateFailedNum + 1
 			}
-
-			// todo 数据更新成功和更新失败，与刷新成功和刷新失败的含义一致
-			tmp.DataUpdateSuccessNum = tmp.UpdateSuccessNum
 		}
 		// 处理今天删除的指标数量
 		if dn, ok := delMap[terminalCode]; ok {