|
@@ -51,14 +51,30 @@ func (this *WindController) Add() {
|
|
|
endDate = time.Now().Format(utils.FormatDate)
|
|
|
}
|
|
|
|
|
|
- windUrl, err := GetServerUrl(req.EdbCode)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取使用的wind地址失败!"
|
|
|
- br.ErrMsg = "获取使用的wind地址失败,err:" + err.Error()
|
|
|
+ windUrl := ``
|
|
|
+ // 先配置中获取,如果有指定配置的话,那么取配置中的数据
|
|
|
+ tmpConfig, err := models.GetConfigDetailByCode("wind_data_url")
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取配置的wind地址失败!"
|
|
|
+ br.ErrMsg = "获取配置的wind地址失败,err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if tmpConfig != nil {
|
|
|
+ windUrl = tmpConfig.ConfigValue
|
|
|
+ } else {
|
|
|
+ windUrl, err = GetServerUrl(req.EdbCode)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取使用的wind地址失败!"
|
|
|
+ br.ErrMsg = "获取使用的wind地址失败,err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if windUrl == `` {
|
|
|
+ br.Msg = "没有配置wind地址!"
|
|
|
+ br.ErrMsg = "没有配置wind地址"
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- windUrl = utils.Hz_Wind_Data_Url_LIST[0].Url
|
|
|
//windUrl = utils.Hz_Wind_Data_Url_LIST[1].Url
|
|
|
dataItem, errCode, err := services.GetEdbDataFromWindUrl(windUrl, req.EdbCode, utils.BASE_START_DATE, endDate)
|
|
|
//dataItem, errCode, err := services.GetEdbDataFromWind(req.EdbCode, utils.BASE_START_DATE, endDate)
|