fix

controllers/base_from_calculate.go

@@ -224,7 +224,7 @@ func (this *CalculateController) Add() {
 	}
 
 	// 更新指标最大最小值
-	err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+	err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = err.Error()
@@ -519,7 +519,7 @@ func (this *CalculateController) CalculateBatchSave() {
 	}
 
 	// 更新指标最大最小值
-	err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+	err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = err.Error()
@@ -803,7 +803,7 @@ func (this *CalculateController) Refresh() {
 		}
 
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_cffex.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
@@ -107,7 +106,7 @@ func (this *CffexController) Refresh() {
 		}
 
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_coal.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
@@ -106,7 +105,7 @@ func (this *CoalController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_dl.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
@@ -57,7 +56,7 @@ func (this *DlController) Add() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_gie.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
@@ -57,7 +56,7 @@ func (this *GieController) Add() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_google_travel.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
@@ -88,7 +87,6 @@ func (this *GoogleTravelController) Refresh() {
 		br.ErrMsg = "请输入指标ID"
 		return
 	}
-	cacheKey = utils.CACHE_EDB_DATA_REFRESH + strconv.Itoa(source) + "_" + req.EdbCode
 
 	// 获取指标详情
 	edbInfo, err := models.GetEdbInfoByEdbCode(source, req.EdbCode)
@@ -97,6 +95,7 @@ func (this *GoogleTravelController) Refresh() {
 		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)
 		err = models.RefreshEdbDataGoogleTravel(req.EdbInfoId, req.EdbCode, req.StartDate)
@@ -106,7 +105,7 @@ func (this *GoogleTravelController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_lt.go

@@ -118,7 +118,7 @@ func (this *LtController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_lz.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
@@ -106,7 +105,7 @@ func (this *LzController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_manual.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
@@ -106,7 +105,7 @@ func (this *ManualController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_mysteel.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
@@ -106,7 +105,7 @@ func (this *MySteelController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_pb.go

@@ -121,7 +121,7 @@ func (this *PbController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_pb_finance.go

@@ -142,7 +142,7 @@ func (this *PbFinanceController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_python.go

@@ -231,7 +231,7 @@ func (this *PythonController) Add() {
 	}
 
 	// 更新指标最大最小值
-	err, errMsg = services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+	err, errMsg = models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = err.Error()
@@ -397,7 +397,7 @@ func (this *PythonController) Edit() {
 	}
 
 	// 更新指标最大最小值
-	err, errMsg = services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+	err, errMsg = models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = err.Error()

controllers/base_from_sh.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
@@ -106,7 +105,7 @@ func (this *ShController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_shfe.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
@@ -106,7 +105,7 @@ func (this *ShfeController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_smm.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
@@ -106,7 +105,7 @@ func (this *SmmController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_ths.go

@@ -118,7 +118,7 @@ func (this *ThsController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_wind.go

@@ -148,7 +148,7 @@ func (this *WindController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

controllers/base_from_zz.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
 	"time"
@@ -106,7 +105,7 @@ func (this *ZzController) Refresh() {
 			return
 		}
 		// 更新指标最大最小值
-		err, errMsg := services.ModifyEdbInfoMaxAndMinInfo(edbInfo)
+		err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 		if err != nil {
 			br.Msg = errMsg
 			br.ErrMsg = err.Error()

models/edb_info.go

@@ -1,8 +1,10 @@
 package models
 
 import (
+	"errors"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
+	"hongze/hongze_edb_lib/utils"
 	"time"
 )
 
@@ -267,3 +269,29 @@ func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (ite
 	_, err = o.Raw(sql, pars).QueryRows(&item)
 	return
 }
+
+// UnifiedModifyEdbInfoMaxAndMinInfo 修改指标的最大最小值
+func UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo *EdbInfo) (err error, errMsg string) {
+	// 修改最大最小值
+	maxAndMinItem, err := GetEdbInfoMaxAndMinInfo(edbInfo.Source, edbInfo.EdbCode)
+	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			err = nil
+			return
+		}
+
+		errMsg = "刷新指标失败！"
+		err = errors.New("获取指标最大最小值失败，err:" + err.Error())
+		return
+	}
+
+	if maxAndMinItem != nil {
+		err = ModifyEdbInfoMaxAndMinInfo(edbInfo.EdbInfoId, maxAndMinItem)
+		if err != nil {
+			errMsg = "刷新指标失败！"
+			err = errors.New("修改指标最大最小值失败，err:" + err.Error())
+			return
+		}
+	}
+	return
+}

services/edbinfo.go

@@ -1,33 +0,0 @@
-package services
-
-import (
-	"errors"
-	"hongze/hongze_edb_lib/models"
-	"hongze/hongze_edb_lib/utils"
-)
-
-// ModifyEdbInfoMaxAndMinInfo 修改指标的最大最小值
-func ModifyEdbInfoMaxAndMinInfo(edbInfo *models.EdbInfo) (err error, errMsg string) {
-	// 修改最大最小值
-	maxAndMinItem, err := models.GetEdbInfoMaxAndMinInfo(edbInfo.Source, edbInfo.EdbCode)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			err = nil
-			return
-		}
-
-		errMsg = "刷新指标失败！"
-		err = errors.New("获取指标最大最小值失败，err:" + err.Error())
-		return
-	}
-
-	if maxAndMinItem != nil {
-		err = models.ModifyEdbInfoMaxAndMinInfo(edbInfo.EdbInfoId, maxAndMinItem)
-		if err != nil {
-			errMsg = "刷新指标失败！"
-			err = errors.New("修改指标最大最小值失败，err:" + err.Error())
-			return
-		}
-	}
-	return
-}