fix

controllers/data_manage/edb_info.go

@@ -5610,74 +5610,51 @@ func (this *EdbInfoController) EdbInfoSmmSearch() {
 
 	searchItem := new(data_manage.EdbInfoSearch)
 	//todo
-	//respItem, err := data.AddEdbData(utils.DATA_SOURCE_YS, edbCode)
-	//if err != nil {
-	//	br.Msg = "获取失败"
-	//	br.ErrMsg = "获取失败,Err:" + err.Error()
-	//	return
-	//}
-	//if respItem.Ret != 200 {
-	//	if respItem.Ret == 421 {
-	//		br.Msg = "该渠道已超过添加上限"
-	//	} else if respItem.Ret == 4052 {
-	//		br.Msg = "该指标已下架"
-	//	} else {
-	//		br.Msg = "未搜索到该指标"
-	//	}
-	//	br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
-	//	return
-	//}
-	//
-	//smmInfoList, err := data_manage.GetBaseFromSmmIndexByIndexCodes(edbCodeArr)
-	//if err != nil && err.Error() != utils.ErrNoRow() {
-	//	br.Msg = "获取失败"
-	//	br.ErrMsg = "获取有色指标详情失败,Err:" + err.Error()
-	//	return
-	//}
-	//for _, smmInfo := range smmInfoList {
-	//	if smmInfo != nil {
-	//		searchItem.Frequency = smmInfo.Frequency
-	//		searchItem.Unit = smmInfo.Unit
-	//		searchItem.EdbName = smmInfo.IndexName
-	//	}
-	//	respItem, err := data.AddEdbData(utils.DATA_SOURCE_YS, smmInfo.IndexCode)
-	//	if err != nil {
-	//		br.Msg = "获取失败"
-	//		br.ErrMsg = "获取失败,Err:" + err.Error()
-	//		return
-	//	}
-	//	if respItem.Ret != 200 {
-	//		br.Msg = "未搜索到该指标"
-	//		br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
-	//		return
-	//	}
-	//}
-
-	stockList := make([]*data_manage.StockInfo, 0)
-	for _, v := range edbCodeArr {
-		dataList, err := data_manage.GetEdbDataAllByEdbCode(v, utils.DATA_SOURCE_YS, utils.DATA_SUB_SOURCE_EDB, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取数据失败,GetEdbDataAllByEdbCode Err:" + err.Error()
-			return
+	respItem, err := data.AddEdbData(utils.DATA_SOURCE_YS, edbCode)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,Err:" + err.Error()
+		return
+	}
+	if respItem.Ret != 200 {
+		if respItem.Ret == 421 {
+			br.Msg = "该渠道已超过添加上限"
+		} else if respItem.Ret == 4052 {
+			br.Msg = "该指标已下架"
+		} else {
+			br.Msg = "未搜索到该指标"
 		}
+		br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
+		return
+	}
+
+	smmInfoList, err := data_manage.GetBaseFromSmmIndexByIndexCodes(edbCodeArr)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取有色指标详情失败,Err:" + err.Error()
+		return
+	}
+	searchItemList := make([]*data_manage.EdbInfoSearch, 0)
+	for _, smmInfo := range smmInfoList {
+		if smmInfo != nil {
+			searchItem.Frequency = smmInfo.Frequency
+			searchItem.Unit = smmInfo.Unit
+			searchItem.EdbName = smmInfo.IndexName
+			dataList, err := data_manage.GetEdbDataAllByEdbCode(smmInfo.IndexCode, utils.DATA_SOURCE_YS, utils.DATA_SUB_SOURCE_EDB, utils.EDB_DATA_LIMIT)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取数据失败,GetEdbDataAllByEdbCode Err:" + err.Error()
+				return
+			}
+			searchItem.DataList = dataList
 
-		stockInfo := new(data_manage.StockInfo)
-		stockInfo.EdbCode = v
-		stockInfo.DataList = dataList
-		stockList = append(stockList, stockInfo)
+			searchItemList = append(searchItemList, searchItem)
+		}
 	}
-	searchItem.StockList = stockList
 
 	resp.Status = 2
-	resp.SearchItem = searchItem
-
+	resp.StockSearchList = searchItemList
 
-	if resp.SearchItem.DataList == nil || len(resp.SearchItem.DataList) <= 0 {
-		br.Msg = "目标指标无有效值，请重新搜索"
-		br.Data = resp
-		return
-	}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/data_manage/edb_info.go

@@ -1721,4 +1721,4 @@ func GetSmmEdbInfoMaxAndMinInfo(edbCodes []string) (item *EdbInfoMaxAndMinInfo,
 type EdbInfoSmmExistCheckResp struct {
 	EdbInfoExistCheckResp
 	ExistAll bool `description:"是否全部重复"`
-}
+}