Przeglądaj źródła

fix:wind指标超限返回状态码调整

Roc 2 lat temu
rodzic
commit
63652cff72
2 zmienionych plików z 10 dodań i 3 usunięć
  1. 8 2
      controllers/base_from_wind.go
  2. 2 1
      services/base_from_wind.go

+ 8 - 2
controllers/base_from_wind.go

@@ -50,7 +50,10 @@ func (this *WindController) Add() {
 			endDate = time.Now().Format(utils.FormatDate)
 		}
 
-		dataItem, err := services.GetEdbDataFromWind(req.EdbCode, utils.BASE_START_DATE, endDate)
+		dataItem, errCode, err := services.GetEdbDataFromWind(req.EdbCode, utils.BASE_START_DATE, endDate)
+		if errCode == 421 { //指标超限
+			br.Ret = 421
+		}
 		if err != nil {
 			br.Msg = "获取指标信息失败!"
 			br.ErrMsg = "获取指标信息失败 GetEdbDataFromWind,Err:" + err.Error()
@@ -124,7 +127,10 @@ func (this *WindController) Refresh() {
 			endDate = time.Now().Format(utils.FormatDate)
 		}
 
-		dataItem, err := services.GetEdbDataFromWind(req.EdbCode, req.StartDate, endDate)
+		dataItem, errCode, err := services.GetEdbDataFromWind(req.EdbCode, req.StartDate, endDate)
+		if errCode == 421 { //指标超限
+			br.Ret = 421
+		}
 		if err != nil {
 			br.Msg = "获取指标信息失败!"
 			br.ErrMsg = "获取指标信息失败 GetEdbDataFromWind,Err:" + err.Error()

+ 2 - 1
services/base_from_wind.go

@@ -18,9 +18,10 @@ type EdbDataFromWind struct {
 }
 
 // GetEdbDataFromWind 获取wind数据
-func GetEdbDataFromWind(edbCode, startDate, endDate string) (item *EdbDataFromWind, err error) {
+func GetEdbDataFromWind(edbCode, startDate, endDate string) (item *EdbDataFromWind, errorCode int, err error) {
 	windUrl, err := GetWindUrl(edbCode)
 	if err != nil {
+		errorCode = 421
 		go alarm_msg.SendAlarmMsg(fmt.Sprintf("获取wind服务器地址失败,err:%s", err.Error()), 3)
 		return
 	}