Răsfoiți Sursa

增加停更指标判断

xyxie 1 an în urmă
părinte
comite
61b5bb75b5
2 a modificat fișierele cu 19 adăugiri și 1 ștergeri
  1. 1 0
      services/base_from_mysteel_chemical.go
  2. 18 1
      services/edb_info_stat.go

+ 1 - 0
services/base_from_mysteel_chemical.go

@@ -23,6 +23,7 @@ func HandleMysteelIndex(req *models.HandleMysteelIndexResp) (err error) {
 
 	go func() {
 		// 钢联终端统计汇总
+		time.Sleep(1 * time.Second) //防止日志未入库,
 		_ = SetMysteelChemicalEdbInfoUpdateStat(false)
 		_ = SetEdbSourceStat(false)
 	}()

+ 18 - 1
services/edb_info_stat.go

@@ -25,7 +25,7 @@ func AddEdbInfoUpdateLog(edbInfoId int, updateResult int, updateFailedReason str
 		log.Source = edbInfo.Source
 		log.EdbCode = edbInfo.EdbCode
 		log.EdbName = edbInfo.EdbName
-		log.EdbNameSource = edbInfo.EdbNameSource
+		log.EdbNameSource = edbInfo.SourceIndexName
 		log.Frequency = edbInfo.Frequency
 		log.Unit = edbInfo.Unit
 		log.StartDate = edbInfo.StartDate
@@ -127,12 +127,29 @@ func SetMysteelChemicalEdbInfoUpdateStat(needStat bool) (err error) {
 			weekNeedRefreshMap[v.IndexCode] = struct{}{}
 		}
 	}
+	//查询所有停更指标
+	stopRefreshMap := make(map[string]struct{})
+	tmpCond := ` AND is_stop = 1`
+	var tmpPars []interface{}
+	//查询所有需要当日刷新的周度指标
+	indexStop, tErr := indexObj.GetIndexByCondition(tmpCond, tmpPars)
+	if tErr != nil {
+		err = fmt.Errorf("查询钢联化工原始指标报错,err: %s", tErr)
+		return
+	}
+	for _, v := range indexStop {
+		stopRefreshMap[v.IndexCode] = struct{}{}
+	}
+
 	logStat := new(data_stat.EdbInfoUpdateStat)
 	//组装新增数据
 	addList := make([]*data_stat.EdbInfoUpdateStat, 0)
 	modifyList := make([]*data_stat.EdbInfoUpdateStat, 0)
 	if len(edbList) > 0 {
 		for _, v := range edbList {
+			if _, ok := stopRefreshMap[v.EdbCode]; ok {
+				continue
+			}
 			tmp := &data_stat.EdbInfoUpdateStat{
 				EdbInfoId:        v.EdbInfoId,
 				SourceName:       v.SourceName,