Merge branch 'feature/eta2.5.9_api_stat' into debug

services/base_from_mysteel_chemical.go

@@ -72,6 +72,24 @@ func HandleApiIndex(indexCodes []string) (errMsg string, err error) {
 	if len(indexCodes) == 0 {
 		return
 	}
+	var apiErrMsg string
+	var hasLog bool
+	defer func() {
+		if err != nil && !hasLog {
+			// 查询指标编码
+			edbList, err := models.GetEdbInfoByEdbCodeList(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, indexCodes)
+			if err != nil {
+				return
+			}
+			for _, v := range edbList {
+				realErrMsg := "服务异常"
+				if apiErrMsg != "" {
+					realErrMsg = apiErrMsg
+				}
+				EdbDataUpdateRecord(v.EdbInfoId, false, false, err.Error()+realErrMsg, realErrMsg)
+			}
+		}
+	}()
 	resp, err := GetEdbDataFromMySteelChemical(indexCodes, utils.GetEdbRefreshStartDate(""), utils.BASE_END_DATE, "desc")
 	if err != nil {
 		return
@@ -79,6 +97,7 @@ func HandleApiIndex(indexCodes []string) (errMsg string, err error) {
 	if !resp.Success {
 		errMsg = "获取数据失败"
 		err = errors.New(resp.Message)
+		apiErrMsg = fmt.Sprintf("钢联化工API请求失败, ErrCode: %s, ErrMsg: %s", resp.Code, resp.Message)
 		return
 	}
 	indexInfoMap, err := GetMySteelChemicalIndexNameMap()
@@ -199,6 +218,7 @@ func HandleApiIndex(indexCodes []string) (errMsg string, err error) {
 		}
 
 		if edbInfo != nil && edbInfo.EdbInfoId > 0 {
+			hasLog = true
 			dataUpdateResult := 2
 			dataUpdateFailedReason := "服务异常"
 			_, logErrMsg, logErr := logic.RefreshBaseEdbInfo(edbInfo, ``)

services/base_from_wind_wsd.go

@@ -87,7 +87,7 @@ func GetEdbDataFromWindUrlWsd(windUrl, stockCode, edbCode, startDate, endDate st
 	utils.FileLog.Info(fmt.Sprint("wind result:", string(body)))
 	err = json.Unmarshal(body, &item)
 	if err != nil {
-		apiErrMsg = fmt.Sprintf("wind数据服务异常")
+		apiErrMsg = fmt.Sprintf("服务异常")
 		return
 	}	
 	return