fix

controllers/data_manage/edb_info.go

@@ -5610,45 +5610,65 @@ func (this *EdbInfoController) EdbInfoSmmSearch() {
 
 	searchItem := new(data_manage.EdbInfoSearch)
 	//todo
-	smmInfo, err := data_manage.GetBaseFromSmmIndexByIndexCodes(edbCodeArr)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取有色指标详情失败,Err:" + err.Error()
-		return
-	}
-	if smmInfo != nil {
-		searchItem.Frequency = smmInfo.Frequency
-		searchItem.Unit = smmInfo.Unit
-		searchItem.EdbName = smmInfo.IndexName
-	}
-	{
-		dataList, err := data_manage.GetEdbDataAllByEdbCodes(edbCodeArr, utils.EDB_DATA_LIMIT)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取数据失败,GetEdbDataAllByEdbCode Err:" + err.Error()
-			return
-		}
-		searchItem.DataList = dataList
+	//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
+	//	}
+	//}
 
-		edbInfoMaxAndMinInfo, err := data_manage.GetSmmEdbInfoMaxAndMinInfo(edbCodeArr)
+	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 = "获取数据失败,GetEdbInfoMaxAndMinInfo Err:" + err.Error()
+			br.ErrMsg = "获取数据失败,GetEdbDataAllByEdbCode Err:" + err.Error()
 			return
 		}
-		searchItem.EdbCode = edbCode
-		searchItem.DataList = dataList
-		if edbInfoMaxAndMinInfo != nil {
-			searchItem.StartDate = edbInfoMaxAndMinInfo.MinDate
-			searchItem.EndDate = edbInfoMaxAndMinInfo.MaxDate
-		}
 
-		//edb指标信息
-		edbInfoItem, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_YS, edbCode)
-		if edbInfoItem != nil {
-			searchItem.EdbName = edbInfoItem.EdbName
-		}
+		stockInfo := new(data_manage.StockInfo)
+		stockInfo.EdbCode = v
+		stockInfo.DataList = dataList
+		stockList = append(stockList, stockInfo)
 	}
+	searchItem.StockList = stockList
+
 	resp.Status = 2
 	resp.SearchItem = searchItem
 

models/data_manage/base_from_smm.go

@@ -419,7 +419,7 @@ func GetSmmIndexDataListNoPage(condition string, pars []interface{}) (items []*B
 	return
 }
 
-func GetBaseFromSmmIndexByIndexCodes(indexCodes []string) (list *BaseFromSmmIndex, err error) {
+func GetBaseFromSmmIndexByIndexCodes(indexCodes []string) (list []*BaseFromSmmIndex, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_smm_index WHERE index_code IN (` + utils.GetOrmInReplace(len(indexCodes)) + `)`
 	err = o.Raw(sql, indexCodes).QueryRow(&list)