..

controllers/base_from_wind.go

@@ -92,7 +92,7 @@ func (this *WindController) Add() {
 
 		// 设置指标与终端关系的缓存
 		terminalCodeCacheKey := utils.CACHE_EDB_TERMINAL_CODE_URL + req.EdbCode
-		_ = utils.Rc.SetNX(terminalCodeCacheKey, terminalCode, utils.GetTodayLastSecond())
+		_ = utils.Rc.Put(terminalCodeCacheKey, terminalCode, utils.GetTodayLastSecond())
 
 		//windUrl = utils.Hz_Wind_Data_Url_LIST[1].Url
 		dataItem, errCode, err := services.GetEdbDataFromWindUrl(windUrl, req.EdbCode, utils.BASE_START_DATE, endDate)
@@ -231,7 +231,7 @@ func (this *WindController) Refresh() {
 }
 
 // GetServerUrl 获取服务器地址
-func GetServerUrl() (windUrl string, terminalCode string, err error) {
+func GetServerUrl() (windUrl string, err error) {
 	// 先配置中获取，如果有指定配置的话，那么取配置中的数据
 	tmpConfig, err := models.GetConfigDetailByCode("wind_data_url")
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -244,48 +244,27 @@ func GetServerUrl() (windUrl string, terminalCode string, err error) {
 		return
 	}
 
-	// 配置中没有的话，那么就从分组获取, todo 改成从edb_info指标库里根据终端码进行分组的指标数据统计
+	// 配置中没有的话，那么就从分组获取
 	list, err := models.GetServerUrlCountGroupByServerUrl()
 	if err != nil {
 		return
 	}
-	//windUrlNum := 0
+	windUrlNum := 0
 
-	//获取对应的配置url
-	terminalNumMap := make(map[string]int)
+	//现有系统的wind数据服务地址分配
+	windUrlMap := make(map[string]int)
 	for _, v := range list {
-		terminalNumMap[v.ServerUrl] = v.Total
+		windUrlMap[v.ServerUrl] = v.Total
 	}
 
-	/*for _, tmpWind := range utils.Hz_Wind_Data_Url_LIST {
+	for _, tmpWind := range utils.Hz_Wind_Data_Url_LIST {
 		tmpWindUrl := tmpWind.Url
 		tmpNum := windUrlMap[tmpWindUrl]
 		if windUrl == `` || (windUrl != `` && tmpNum < windUrlNum) {
 			windUrl = tmpWindUrl
 			windUrlNum = tmpNum
 		}
-	}*/
-
-	terminalList, err := models.GetEdbTerminalListBySource(utils.DATA_SOURCE_WIND)
-	if err != nil {
-		return
 	}
 
-	num := 0
-	edbTerminal := new(models.EdbTerminal)
-	for _, v := range terminalList {
-		tmpNum := terminalNumMap[v.TerminalCode]
-		if edbTerminal == nil {
-			edbTerminal = v
-			num = tmpNum
-		} else if tmpNum < num {
-			edbTerminal = v
-			num = tmpNum
-		}
-	}
-	if edbTerminal != nil {
-		windUrl = edbTerminal.ServerUrl
-		terminalCode = edbTerminal.TerminalCode
-	}
 	return
 }

services/base_from_wind.go

@@ -224,7 +224,7 @@ func AddEdbCodeInWindUrl(windUrl, terminalCode, edbCode string) (isInsert bool)
 
 	// 设置指标与终端关系的缓存
 	terminalCodeCacheKey := utils.CACHE_EDB_TERMINAL_CODE_URL + edbCode
-	_ = utils.Rc.SetNX(terminalCodeCacheKey, terminalCode, utils.GetTodayLastSecond())
+	_ = utils.Rc.Put(terminalCodeCacheKey, terminalCode, utils.GetTodayLastSecond())
 	return
 }
 

services/edb_terminal.go

@@ -54,7 +54,7 @@ func GetTerminal(source int, oldTerminalCode string) (edbTerminal *models.EdbTer
 	edbTerminal = new(models.EdbTerminal)
 	for _, v := range terminalList {
 		tmpNum := terminalNumMap[v.TerminalCode]
-		if edbTerminal == nil {
+		if edbTerminal.TerminalId == 0 {
 			edbTerminal = v
 			num = tmpNum
 		} else if tmpNum < num {