|
@@ -69,7 +69,7 @@ func (this *WindController) Add() {
|
|
|
}
|
|
|
|
|
|
if windUrl == `` {
|
|
|
- windUrl, err = GetServerUrl(req.EdbCode)
|
|
|
+ windUrl, err = GetServerUrl()
|
|
|
if err != nil {
|
|
|
br.Msg = "获取可以使用的wind地址失败!"
|
|
|
br.ErrMsg = "获取可以使用的wind地址失败,err:" + err.Error()
|
|
@@ -83,6 +83,10 @@ func (this *WindController) Add() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ // 设置指标与终端关系的缓存
|
|
|
+ windUrlCacheKey := utils.CACHE_WIND_URL + ":" + req.EdbCode
|
|
|
+ _ = utils.Rc.SetNX(windUrlCacheKey, windUrl, utils.GetTodayLastSecond())
|
|
|
+
|
|
|
//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)
|
|
@@ -222,16 +226,7 @@ func (this *WindController) Refresh() {
|
|
|
}
|
|
|
|
|
|
// GetServerUrl 获取服务器地址
|
|
|
-func GetServerUrl(edbCode string) (windUrl string, err error) {
|
|
|
- defer func() {
|
|
|
- if err != nil && windUrl != `` {
|
|
|
- //windUrl = `http://datawind.hzinsights.com:8040/`
|
|
|
- // 设置缓存
|
|
|
- cacheKey := utils.CACHE_WIND_URL + ":" + edbCode
|
|
|
- _ = utils.Rc.SetNX(cacheKey, windUrl, utils.GetTodayLastSecond())
|
|
|
- }
|
|
|
- }()
|
|
|
-
|
|
|
+func GetServerUrl() (windUrl string, err error) {
|
|
|
// 先配置中获取,如果有指定配置的话,那么取配置中的数据
|
|
|
tmpConfig, err := models.GetConfigDetailByCode("wind_data_url")
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|