fix：添加指标

controllers/base_from_cffex.go

@@ -88,16 +88,18 @@ func (this *CffexController) Refresh() {
 		return
 	}
 
-	// 获取指标详情
-	edbInfo, err := models.GetEdbInfoById(req.EdbInfoId)
-	if err != nil {
-		br.Msg = "指标不存在！"
-		br.ErrMsg = "指标不存在"
-		return
-	}
 	cacheKey = utils.CACHE_EDB_DATA_REFRESH + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
+
+		// 获取指标详情
+		edbInfo, err := models.GetEdbInfoById(req.EdbInfoId)
+		if err != nil {
+			br.Msg = "指标不存在！"
+			br.ErrMsg = "指标不存在"
+			return
+		}
+
 		err = models.RefreshEdbDataFromCffex(req.EdbInfoId, req.EdbCode, req.StartDate)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"

controllers/base_from_coal.go

@@ -88,16 +88,17 @@ func (this *CoalController) Refresh() {
 		return
 	}
 
-	// 获取指标详情
-	edbInfo, err := models.GetEdbInfoById(req.EdbInfoId)
-	if err != nil {
-		br.Msg = "指标不存在！"
-		br.ErrMsg = "指标不存在"
-		return
-	}
 	cacheKey = utils.CACHE_EDB_DATA_REFRESH + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
+		// 获取指标详情
+		edbInfo, err := models.GetEdbInfoById(req.EdbInfoId)
+		if err != nil {
+			br.Msg = "指标不存在！"
+			br.ErrMsg = "指标不存在"
+			return
+		}
+
 		err = models.RefreshEdbDataFromCoal(req.EdbInfoId, req.EdbCode, req.StartDate)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"

controllers/base_from_dl.go

@@ -39,13 +39,6 @@ func (this *DlController) Add() {
 		return
 	}
 
-	// 获取指标详情
-	edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
-	if err != nil {
-		br.Msg = "指标不存在！"
-		br.ErrMsg = "指标不存在"
-		return
-	}
 	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
@@ -55,13 +48,6 @@ func (this *DlController) Add() {
 			br.ErrMsg = "获取指标信息失败 AddEdbDataFromDl，Err:" + err.Error()
 			return
 		}
-		// 更新指标最大最小值
-		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
-		if err != nil {
-			br.Msg = errMsg
-			br.ErrMsg = err.Error()
-			return
-		}
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"
@@ -111,6 +97,22 @@ func (this *DlController) Refresh() {
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromDl，Err:" + err.Error()
 			return
 		}
+
+		// 获取指标详情
+		edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
+		if err != nil {
+			br.Msg = "指标不存在！"
+			br.ErrMsg = "指标不存在"
+			return
+		}
+		// 更新指标最大最小值
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
+		if err != nil {
+			br.Msg = errMsg
+			br.ErrMsg = err.Error()
+			return
+		}
+
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"

controllers/base_from_gie.go

@@ -39,13 +39,6 @@ func (this *GieController) Add() {
 		return
 	}
 
-	// 获取指标详情
-	edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
-	if err != nil {
-		br.Msg = "指标不存在！"
-		br.ErrMsg = "指标不存在"
-		return
-	}
 	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
@@ -55,13 +48,6 @@ func (this *GieController) Add() {
 			br.ErrMsg = "获取指标信息失败 AddEdbDataFromGie，Err:" + err.Error()
 			return
 		}
-		// 更新指标最大最小值
-		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
-		if err != nil {
-			br.Msg = errMsg
-			br.ErrMsg = err.Error()
-			return
-		}
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"
@@ -111,6 +97,22 @@ func (this *GieController) Refresh() {
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromGie，Err:" + err.Error()
 			return
 		}
+
+		// 获取指标详情
+		edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
+		if err != nil {
+			br.Msg = "指标不存在！"
+			br.ErrMsg = "指标不存在"
+			return
+		}
+		// 更新指标最大最小值
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
+		if err != nil {
+			br.Msg = errMsg
+			br.ErrMsg = err.Error()
+			return
+		}
+
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"

controllers/base_from_google_travel.go

@@ -88,16 +88,18 @@ func (this *GoogleTravelController) Refresh() {
 		return
 	}
 
-	// 获取指标详情
-	edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
-	if err != nil {
-		br.Msg = "指标不存在！"
-		br.ErrMsg = "指标不存在"
-		return
-	}
 	cacheKey = utils.CACHE_EDB_DATA_REFRESH + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
+
+		// 获取指标详情
+		edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
+		if err != nil {
+			br.Msg = "指标不存在！"
+			br.ErrMsg = "指标不存在"
+			return
+		}
+
 		err = models.RefreshEdbDataGoogleTravel(req.EdbInfoId, req.EdbCode, req.StartDate)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"

controllers/base_from_lt.go

@@ -94,17 +94,18 @@ func (this *LtController) Refresh() {
 		br.ErrMsg = "请输入指标ID"
 		return
 	}
-
-	// 获取指标详情
-	edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
-	if err != nil {
-		br.Msg = "指标不存在！"
-		br.ErrMsg = "指标不存在"
-		return
-	}
 	cacheKey = utils.CACHE_EDB_DATA_REFRESH + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
+
+		// 获取指标详情
+		edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
+		if err != nil {
+			br.Msg = "指标不存在！"
+			br.ErrMsg = "指标不存在"
+			return
+		}
+
 		dataItem, err := services.GetEdbDataFromLt(req.EdbCode, req.StartDate, utils.BASE_END_DATE)
 		if err != nil {
 			br.Msg = "获取指标信息失败！"

controllers/base_from_lz.go

@@ -87,17 +87,18 @@ func (this *LzController) Refresh() {
 		br.ErrMsg = "请输入指标ID"
 		return
 	}
-
-	// 获取指标详情
-	edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
-	if err != nil {
-		br.Msg = "指标不存在！"
-		br.ErrMsg = "指标不存在"
-		return
-	}
 	cacheKey = utils.CACHE_EDB_DATA_REFRESH + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
+
+		// 获取指标详情
+		edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
+		if err != nil {
+			br.Msg = "指标不存在！"
+			br.ErrMsg = "指标不存在"
+			return
+		}
+
 		err = models.RefreshEdbDataFromLz(req.EdbInfoId, req.EdbCode, req.StartDate)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"

controllers/base_from_manual.go

@@ -88,16 +88,18 @@ func (this *ManualController) Refresh() {
 		return
 	}
 
-	// 获取指标详情
-	edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
-	if err != nil {
-		br.Msg = "指标不存在！"
-		br.ErrMsg = "指标不存在"
-		return
-	}
 	cacheKey = utils.CACHE_EDB_DATA_REFRESH + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
+
+		// 获取指标详情
+		edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
+		if err != nil {
+			br.Msg = "指标不存在！"
+			br.ErrMsg = "指标不存在"
+			return
+		}
+
 		err = models.RefreshEdbDataFromManual(req.EdbInfoId, req.EdbCode, req.StartDate)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"