Roc 2 years ago
parent
commit
4e56b03304
1 changed files with 21 additions and 21 deletions
  1. 21 21
      controllers/base_from_wind.go

+ 21 - 21
controllers/base_from_wind.go

@@ -158,28 +158,28 @@ func (this *WindController) Refresh() {
 
 // GetServerUrl 获取服务器地址
 func GetServerUrl(edbCode string) (windUrl string, err error) {
-	//list, err := models.GetServerUrlCountGroupByServerUrl()
-	//if err != nil {
-	//	return
-	//}
-	//windUrlNum := 0
-	//
-	////现有系统的wind数据服务地址分配
-	//windUrlMap := make(map[string]int)
-	//for _, v := range list {
-	//	windUrlMap[v.ServerUrl] = v.Total
-	//}
-	//
-	//for _, tmpWind := range utils.Hz_Wind_Data_Url_LIST {
-	//	tmpWindUrl := tmpWind.Url
-	//	tmpNum := windUrlMap[tmpWindUrl]
-	//	if windUrl == `` || (windUrl != `` && tmpNum < windUrlNum) {
-	//		windUrl = tmpWindUrl
-	//		windUrlNum = tmpNum
-	//	}
-	//}
+	list, err := models.GetServerUrlCountGroupByServerUrl()
+	if err != nil {
+		return
+	}
+	windUrlNum := 0
+
+	//现有系统的wind数据服务地址分配
+	windUrlMap := make(map[string]int)
+	for _, v := range list {
+		windUrlMap[v.ServerUrl] = v.Total
+	}
+
+	for _, tmpWind := range utils.Hz_Wind_Data_Url_LIST {
+		tmpWindUrl := tmpWind.Url
+		tmpNum := windUrlMap[tmpWindUrl]
+		if windUrl == `` || (windUrl != `` && tmpNum < windUrlNum) {
+			windUrl = tmpWindUrl
+			windUrlNum = tmpNum
+		}
+	}
 
-	windUrl = `http://datawind.hzinsights.com:8040/`
+	//windUrl = `http://datawind.hzinsights.com:8040/`
 	// 设置缓存
 	cacheKey := utils.CACHE_WIND_URL + ":" + edbCode
 	_ = utils.Rc.SetNX(cacheKey, windUrl, utils.GetTodayLastSecond())