Merge branch 'fix/2022-11-16' into debug

controllers/base_from_calculate.go

@@ -1268,6 +1268,7 @@ func (this *CalculateController) Refresh() {
 			break
 		}
 	case utils.DATA_SOURCE_CALCULATE_NSZYDPJJS: //N数值移动平均计算
+		startDate = `` //只要填写日期，就会出现问题，还是把日期给去掉吧
 		calculateNszydpjjs, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
 		if err != nil {
 			errMsg = "GetEdbInfoCalculateNszydpjjsDetail Err:" + err.Error()

controllers/base_from_manual.go

@@ -63,9 +63,7 @@ func (this *ManualController) Add() {
 // @router /refresh [post]
 func (this *ManualController) Refresh() {
 	br := new(models.BaseResponse).Init()
-	var cacheKey string
 	defer func() {
-		utils.Rc.Delete(cacheKey)
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
@@ -88,37 +86,41 @@ func (this *ManualController) Refresh() {
 		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 = "刷新指标信息失败！"
-			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromManual，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 = "获取成功"
-	} else {
+	cacheKey := utils.CACHE_EDB_DATA_REFRESH + strconv.Itoa(source) + "_" + req.EdbCode
+	if utils.Rc.IsExist(cacheKey) {
 		br.Ret = 501
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
+
+	// 设置缓存
+	utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
+	defer func() {
+		utils.Rc.Delete(cacheKey)
+	}()
+	// 获取指标详情
+	edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
+	if err != nil {
+		br.Msg = "指标不存在！"
+		br.ErrMsg = "指标不存在"
+		return
+	}
+
+	req.StartDate = `` // 开始日期也给过滤吧，万一研究员补充了之前的数据呢，还是过滤掉吧
+	err = models.RefreshEdbDataFromManual(req.EdbInfoId, req.EdbCode, req.StartDate)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "刷新指标信息失败！"
+		br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromManual，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 = "获取成功"
 }