Merge branch 'pool/079'

controllers/data_manage/edb_info.go

@@ -37,6 +37,7 @@ type EdbInfoController struct {
 // @Param   SubSource   query   int  true       "子数据来源:0:经济数据库,1:日期序列"
 // @Param   EdbCode   query   string  false       "指标编码/指标代码"
 // @Param   StockCode   query   string  false       "证券代码"
+// @Param   Frequency   query   string  false       "频度"
 // @Success 200 {object} data_manage.EdbInfoSearchResp
 // @router /edb_info/search [get]
 func (this *EdbInfoController) EdbInfoSearch() {
@@ -52,6 +53,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 	edbCode = strings.Replace(edbCode, "\t", "", -1)
 	subSource, _ := this.GetInt("SubSource")
 	stockCode := this.GetString("StockCode")
+	frequency := this.GetString("Frequency")
 
 	if source <= 0 {
 		br.Msg = "无效的数据来源"
@@ -193,7 +195,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 					//	br.ErrMsg = "获取失败,Err:" + err.Error()
 					//	return
 					//}
-					respItem, err := data.AddEdbData(source, edbCode)
+					respItem, err := data.AddEdbData(source, edbCode, frequency)
 					if err != nil {
 						br.Msg = "获取失败"
 						br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -266,7 +268,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 					//	br.ErrMsg = "wind 获取失败,Err:" + err.Error()
 					//	return
 					//}
-					respItem, err := data.AddEdbData(source, edbCode)
+					respItem, err := data.AddEdbData(source, edbCode, frequency)
 					if err != nil {
 						br.Msg = "获取失败"
 						br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -345,7 +347,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	br.ErrMsg = "彭博数据获取失败,Err:" + err.Error()
 				//	return
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -386,7 +388,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	br.ErrMsg = "获取失败,Err:" + err.Error()
 				//	return
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -441,7 +443,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	br.ErrMsg = "获取隆众数据失败,Err:" + err.Error()
 				//	return
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -514,7 +516,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	searchItem.StartDate = minDate
 				//	searchItem.EndDate = maxDate
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -568,7 +570,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	br.ErrMsg = "获取钢联数据失败,Err:" + err.Error()
 				//	return
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -635,7 +637,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	searchItem.StartDate = minDate
 				//	searchItem.EndDate = maxDate
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -714,7 +716,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	searchItem.StartDate = minDate
 				//	searchItem.EndDate = maxDate
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -793,7 +795,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	searchItem.StartDate = minDate
 				//	searchItem.EndDate = maxDate
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -872,7 +874,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	searchItem.StartDate = minDate
 				//	searchItem.EndDate = maxDate
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -951,7 +953,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	searchItem.StartDate = minDate
 				//	searchItem.EndDate = maxDate
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1046,7 +1048,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	searchItem.EndDate = maxDate
 				//}
 
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1149,7 +1151,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	br.ErrMsg = "lt 获取失败,Err:" + err.Error()
 				//	return
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1209,7 +1211,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	searchItem.StartDate = minDate
 				//	searchItem.EndDate = maxDate
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1261,7 +1263,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 					searchItem.EndDate = item.MaxDate
 				}
 			} else {
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1301,7 +1303,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	br.ErrMsg = "获取钢联数据失败,Err:" + err.Error()
 				//	return
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1346,7 +1348,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				searchItem.StartDate = item.MinDate
 				searchItem.EndDate = item.MaxDate
 			} else {
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1391,7 +1393,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				searchItem.StartDate = item.MinDate
 				searchItem.EndDate = item.MaxDate
 			} else {
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1458,7 +1460,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	searchItem.StartDate = minDate
 				//	searchItem.EndDate = maxDate
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1518,7 +1520,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				//	searchItem.StartDate = minDate
 				//	searchItem.EndDate = maxDate
 				//}
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1565,7 +1567,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				searchItem.StartDate = item.MinDate
 				searchItem.EndDate = item.MaxDate
 			} else {
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1612,7 +1614,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				searchItem.StartDate = minDate
 				searchItem.EndDate = maxDate
 			} else {
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败," + respItem.Msg
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1645,7 +1647,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				searchItem.StartDate = minDate
 				searchItem.EndDate = maxDate
 			} else {
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1692,7 +1694,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				searchItem.StartDate = minDate
 				searchItem.EndDate = maxDate
 			} else {
-				respItem, err := data.AddEdbData(source, edbCode)
+				respItem, err := data.AddEdbData(source, edbCode, frequency)
 				if err != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + err.Error()
@@ -1750,7 +1752,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				}
 			} else {
 				// 新增指标数据
-				addRes, e := data.AddEdbData(source, edbCode)
+				addRes, e := data.AddEdbData(source, edbCode, frequency)
 				if e != nil {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取失败,Err:" + e.Error()
@@ -5810,7 +5812,7 @@ func (this *EdbInfoController) EdbInfoSmmSearch() {
 	}
 	if len(needAddCodeArr) > 0 {
 		edbCode = strings.Join(needAddCodeArr, ",")
-		respItem, err := data.AddEdbData(utils.DATA_SOURCE_YS, edbCode)
+		respItem, err := data.AddEdbData(utils.DATA_SOURCE_YS, edbCode, "")
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败,Err:" + err.Error()

services/data/base_edb_lib.go

@@ -13,10 +13,11 @@ import (
 )
 
 // AddEdbData 新增指标数据
-func AddEdbData(source int, edbCode string) (resp *models.BaseResponse, err error) {
+func AddEdbData(source int, edbCode, frequency string) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
 	param["EdbCode"] = edbCode
 	param["Source"] = source
+	param["Frequency"] = frequency
 	urlStr := ``
 	switch source {
 	case utils.DATA_SOURCE_THS: