fix：添加查询空数据的判断

controllers/base_from_calculate.go

@@ -602,7 +602,7 @@ func (this *CalculateController) Refresh() {
 				edbInfoList = append(edbInfoList, edbInfo)
 			}
 			err = models.RefreshAllCalculate(edbInfoList, edbInfo.EdbInfoId, source, edbInfo.EdbCode, edbInfo.CalculateFormula, startDate, endDate, edbInfoIdBytes)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshCalculate Err:" + err.Error()
 				break
 			}
@@ -620,7 +620,7 @@ func (this *CalculateController) Refresh() {
 			startDate = edbInfo.StartDate
 			endDate = time.Now().Format(utils.FormatDate)
 			err = models.RefreshAllCalculateLjzzy(edbInfoId, source, fromEdbInfo, calculateLjzzy.EdbCode, startDate, endDate)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateLjzzy Err:" + err.Error()
 				break
 			}
@@ -638,7 +638,7 @@ func (this *CalculateController) Refresh() {
 			startDate = edbInfo.StartDate
 			endDate = time.Now().Format(utils.FormatDate)
 			err = models.RefreshAllCalculateTbz(edbInfoId, source, fromEdbInfo, calculateTbz.EdbCode, startDate, endDate)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateTbz Err:" + err.Error()
 				break
 			}
@@ -656,7 +656,7 @@ func (this *CalculateController) Refresh() {
 			startDate = edbInfo.StartDate
 			endDate = time.Now().Format(utils.FormatDate)
 			err = models.RefreshAllCalculateTcz(edbInfoId, source, fromEdbInfo, calculateTcz.EdbCode, startDate, endDate)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshCalculateTcz Err:" + err.Error()
 				break
 			}
@@ -674,7 +674,7 @@ func (this *CalculateController) Refresh() {
 			formulaInt, _ := strconv.Atoi(edbInfo.CalculateFormula)
 			startDate = edbInfo.StartDate
 			err = models.RefreshAllCalculateNszydpjjs(edbInfoId, edbInfo.Source, formulaInt, fromEdbInfo, calculateNszydpjjs.EdbCode, startDate)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshCalculateNszydpjjs Err:" + err.Error()
 				break
 			}
@@ -693,7 +693,7 @@ func (this *CalculateController) Refresh() {
 			endDate = time.Now().Format(utils.FormatDate)
 			formulaInt, _ := strconv.Atoi(edbInfo.CalculateFormula)
 			err = models.RefreshAllCalculateHbz(edbInfoId, source, fromEdbInfo, calculateTbz.EdbCode, startDate, endDate, formulaInt)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateHbz Err:" + err.Error()
 				break
 			}
@@ -712,7 +712,7 @@ func (this *CalculateController) Refresh() {
 			endDate = time.Now().Format(utils.FormatDate)
 			formulaInt, _ := strconv.Atoi(edbInfo.CalculateFormula)
 			err = models.RefreshAllCalculateHcz(edbInfoId, source, fromEdbInfo, calculateTbz.EdbCode, startDate, endDate, formulaInt)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateHcz Err:" + err.Error()
 				break
 			}
@@ -730,7 +730,7 @@ func (this *CalculateController) Refresh() {
 			startDate = edbInfo.StartDate
 			endDate = time.Now().Format(utils.FormatDate)
 			err = models.RefreshAllCalculateBp(edbInfoId, source, fromEdbInfo, calculateTbz.EdbCode, startDate, endDate)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateBp Err:" + err.Error()
 				break
 			}
@@ -749,18 +749,18 @@ func (this *CalculateController) Refresh() {
 			endDate = time.Now().Format(utils.FormatDate)
 			formulaInt, _ := strconv.Atoi(calculate.CalculateFormula)
 			err = models.RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, calculate.MoveType, fromEdbInfo, calculate.EdbCode, startDate, endDate, calculate.MoveFrequency)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateTimeShift Err:" + err.Error()
 			}
 		case utils.DATA_SOURCE_CALCULATE_ZJPJ: //刷新直接拼接
 			err = models.RefreshAllCalculateZjpj(edbInfo)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateZjpj Err:" + err.Error()
 				break
 			}
 		case utils.DATA_SOURCE_CALCULATE_LJZTBPJ: //刷新累计值同比拼接
 			err = models.RefreshAllCalculateLjztbpj(edbInfo)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateLjztbpj Err:" + err.Error()
 				break
 			}

controllers/base_from_cffex.go

@@ -13,7 +13,6 @@ type CffexController struct {
 	BaseAuthController
 }
 
-
 // @Title 新增中金所指标接口
 // @Description 新增中金所指标接口
 // @Success 200 {object} models.AddEdbInfoReq
@@ -92,7 +91,7 @@ func (this *CffexController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromCffex(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromCffex，Err:" + err.Error()
 			return
@@ -105,4 +104,4 @@ func (this *CffexController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_dl.go

@@ -13,7 +13,6 @@ type DlController struct {
 	BaseAuthController
 }
 
-
 // @Title 新增大商所指标接口
 // @Description 新增大商所指标接口
 // @Success 200 {object} models.AddEdbInfoReq
@@ -92,7 +91,7 @@ func (this *DlController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromDl(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromDl，Err:" + err.Error()
 			return
@@ -105,4 +104,4 @@ func (this *DlController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_gie.go

@@ -91,7 +91,7 @@ func (this *GieController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromGie(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromGie，Err:" + err.Error()
 			return
@@ -104,4 +104,4 @@ func (this *GieController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_lt.go

@@ -39,7 +39,7 @@ func (this *LtController) Add() {
 		br.ErrMsg = "请输入指标编码，指标编码为空"
 		return
 	}
-	cacheKey = utils.CACHE_EDB_DATA_ADD+ strconv.Itoa(source) + "_" + req.EdbCode
+	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		dataItem, err := services.GetEdbDataFromLt(req.EdbCode, utils.BASE_START_DATE, utils.BASE_END_DATE)
@@ -103,8 +103,8 @@ func (this *LtController) Refresh() {
 			br.ErrMsg = "获取指标信息失败 GetEdbDataFromLt，Err:" + err.Error()
 			return
 		}
-		err = models.RefreshEdbDataFromLt(req.EdbInfoId, req.EdbCode, req.StartDate,dataItem)
-		if err != nil {
+		err = models.RefreshEdbDataFromLt(req.EdbInfoId, req.EdbCode, req.StartDate, dataItem)
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromLt，Err:" + err.Error()
 			return
@@ -117,4 +117,4 @@ func (this *LtController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_lz.go

@@ -38,7 +38,7 @@ func (this *LzController) Add() {
 		br.ErrMsg = "请输入指标编码，指标编码为空"
 		return
 	}
-	cacheKey = utils.CACHE_EDB_DATA_ADD+ strconv.Itoa(source) + "_" + req.EdbCode
+	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.AddEdbDataFromLz(req.EdbCode)
@@ -57,7 +57,6 @@ func (this *LzController) Add() {
 	}
 }
 
-
 // @Title 刷新隆众指标接口
 // @Description 刷新隆众指标接口
 // @Success 200 {object} models.RefreshEdbInfoReq
@@ -92,7 +91,7 @@ func (this *LzController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromLz(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromLz，Err:" + err.Error()
 			return
@@ -105,4 +104,4 @@ func (this *LzController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_manual.go

@@ -91,7 +91,7 @@ func (this *ManualController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromManual(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromManual，Err:" + err.Error()
 			return
@@ -104,4 +104,4 @@ func (this *ManualController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_mysteel.go

@@ -91,7 +91,7 @@ func (this *MySteelController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromMysteel(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromMysteel，Err:" + err.Error()
 			return
@@ -104,4 +104,4 @@ func (this *MySteelController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_pb.go

@@ -104,7 +104,7 @@ func (this *PbController) Refresh() {
 			return
 		}
 		err = models.RefreshEdbDataFromPb(req.EdbInfoId, req.EdbCode, req.StartDate, dataItem)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromPb，Err:" + err.Error()
 			return
@@ -117,4 +117,4 @@ func (this *PbController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_sh.go

@@ -13,7 +13,6 @@ type ShController struct {
 	BaseAuthController
 }
 
-
 // @Title 新增上期所指标接口
 // @Description 新增上期所指标接口
 // @Success 200 {object} models.AddEdbInfoReq
@@ -92,7 +91,7 @@ func (this *ShController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromSh(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromSh，Err:" + err.Error()
 			return
@@ -105,4 +104,4 @@ func (this *ShController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_shfe.go

@@ -13,7 +13,6 @@ type ShfeController struct {
 	BaseAuthController
 }
 
-
 // @Title 新增上期能源指标接口
 // @Description 新增上期能源指标接口
 // @Success 200 {object} models.AddEdbInfoReq
@@ -92,7 +91,7 @@ func (this *ShfeController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromShfe(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromShfe，Err:" + err.Error()
 			return
@@ -105,4 +104,4 @@ func (this *ShfeController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_smm.go

@@ -38,7 +38,7 @@ func (this *SmmController) Add() {
 		br.ErrMsg = "请输入指标编码，指标编码为空"
 		return
 	}
-	cacheKey = utils.CACHE_EDB_DATA_ADD+ strconv.Itoa(source) + "_" + req.EdbCode
+	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.AddEdbDataFromSmm(req.EdbCode)
@@ -91,7 +91,7 @@ func (this *SmmController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromSmm(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromSmm，Err:" + err.Error()
 			return
@@ -104,4 +104,4 @@ func (this *SmmController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_ths.go

@@ -104,7 +104,7 @@ func (this *ThsController) Refresh() {
 			return
 		}
 		err = models.RefreshEdbDataFromThs(req.EdbInfoId, req.EdbCode, req.StartDate, dataItem)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromThs，Err:" + err.Error()
 			return

controllers/base_from_wind.go

@@ -104,7 +104,7 @@ func (this *WindController) Refresh() {
 			return
 		}
 		err = models.RefreshEdbDataFromWind(req.EdbInfoId, req.EdbCode, req.StartDate, dataItem)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromWind，Err:" + err.Error()
 			return

controllers/base_from_zz.go

@@ -91,7 +91,7 @@ func (this *ZzController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromZz(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromZz，Err:" + err.Error()
 			return
@@ -104,4 +104,4 @@ func (this *ZzController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}