Browse Source

Merge branch 'fix/edb_refresh' into debug

hsun 1 year ago
parent
commit
40d89c4ab7
2 changed files with 6 additions and 0 deletions
  1. 2 0
      controllers/data_manage/edb_info.go
  2. 4 0
      services/data/edb_info.go

+ 2 - 0
controllers/data_manage/edb_info.go

@@ -233,6 +233,8 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				if respItem.Ret != 200 {
 					if respItem.Ret == 421 {
 						br.Msg = "该渠道已超过添加上限"
+					} else if respItem.Ret == 4052 {
+						br.Msg = "该指标已下架"
 					} else {
 						br.Msg = "未搜索到该指标"
 					}

+ 4 - 0
services/data/edb_info.go

@@ -1473,6 +1473,10 @@ func getRefreshEdbInfoListByIds(edbInfoIdList []int) (newBaseEdbInfoArr, newBase
 	predictCalculateInfoArr := make([]*data_manage.EdbInfo, 0) //预测运算指标
 
 	for _, baseEdbInfo := range edbInfoList {
+		// 指标若停更, 则忽略掉
+		if baseEdbInfo.NoUpdate == 1 {
+			continue
+		}
 		if baseEdbInfo.EdbInfoType == 0 { //普通指标
 			switch baseEdbInfo.EdbType {
 			case 1: //基础指标