修改参数

controllers/data_manage/edb_info.go

@@ -257,45 +257,24 @@ func (this *EdbInfoController) EdbInfoSearch() {
 					br.Msg = "请输入指标代码"
 					return
 				}
-
-				dataItems, err := data_manage.GetEdbDataAllByEdbCode(edbCode, utils.DATA_SOURCE_WIND, utils.EDB_DATA_LIMIT)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				respItem, err := data.AddEdbDataWindWsd(source, securitiesCode, edbCode)
+				if err != nil {
 					br.Msg = "获取失败"
-					br.ErrMsg = "获取Wind已存在信息失败,Err:" + err.Error()
+					br.ErrMsg = "获取失败,Err:" + err.Error()
 					return
 				}
-				fmt.Println("wind dataItems:", len(dataItems))
-				if len(dataItems) > 0 {
-					searchItem.EdbCode = edbCode
-					minDate, maxDate, err := data_manage.GetEdbDataWindMaxOrMinDate(edbCode)
-					if err != nil {
-						br.Msg = "获取失败"
-						br.ErrMsg = "获取wind日期信息失败,Err:" + err.Error()
-						return
-					}
-					searchItem.DataList = dataItems
-					searchItem.StartDate = minDate
-					searchItem.EndDate = maxDate
-				} else {
-					respItem, err := data.AddEdbData(source, 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
+				if respItem.Ret != 200 {
+					if respItem.Ret == 421 {
+						br.Msg = "该渠道已超过添加上限"
+					} else if respItem.Ret == 4052 {
+						br.Msg = "该指标已下架"
+					} else {
+						br.Msg = "未搜索到该指标"
 					}
-					isAdd = true
+					br.ErrMsg = respItem.ErrMsg + ";EdbCode:" + edbCode
+					return
 				}
+				isAdd = true
 			} else {
 
 			}
@@ -4912,7 +4891,7 @@ func (this *EdbInfoController) ChartImageSet() {
 // @Param   Source   query   int  true       "来源:1:同花顺,2:wind"
 // @Param   SubSource   query   int  true       "子数据来源:0:经济数据库,1:日期序列"
 // @Param   EdbCode   query   string  false       "指标编码/指标代码"
-// @Param   SecuritiesCode   query   string  false       "证券代码"
+// @Param   StockCode   query   string  false       "证券代码"
 // @Success 200 {object} data_manage.EdbInfoExistCheckResp
 // @router /edb_info/exist/check [get]
 func (this *EdbInfoController) EdbInfoExistCheck() {
@@ -4927,7 +4906,7 @@ func (this *EdbInfoController) EdbInfoExistCheck() {
 	edbCode = strings.Trim(edbCode, " ")
 	edbCode = strings.Replace(edbCode, "\t", "", -1)
 	subSource, _ := this.GetInt("SubSource")
-	securitiesCode := this.GetString("SecuritiesCode")
+	stockCode := this.GetString("StockCode")
 
 	if source <= 0 {
 		br.Msg = "无效的数据来源"
@@ -4950,9 +4929,9 @@ func (this *EdbInfoController) EdbInfoExistCheck() {
 
 	var indexCodeArr []string
 	edbCodeArr := strings.Split(edbCode, ",")
-	securitiesCodeArr := strings.Split(securitiesCode, ",")
+	stockCodeArr := strings.Split(stockCode, ",")
 
-	for _, sv := range securitiesCodeArr {
+	for _, sv := range stockCodeArr {
 		for _, ev := range edbCodeArr {
 			indexCode := utils.WindDbWsd + sv + ev
 			indexCodeArr = append(indexCodeArr, indexCode)
@@ -4964,13 +4943,13 @@ func (this *EdbInfoController) EdbInfoExistCheck() {
 		br.ErrMsg = "校验指标是否存在失败,Err:" + err.Error()
 		return
 	}
-	var existSecuritiesCodeArr []string
+	var existStockCodeArr []string
 	var existEdbCodeArr []string
 	for _, indexItem := range indexList {
-		for _, sv := range securitiesCodeArr {
+		for _, sv := range stockCodeArr {
 			for _, ev := range edbCodeArr {
 				if strings.Contains(indexItem.EdbCode, sv) {
-					existSecuritiesCodeArr = append(existSecuritiesCodeArr, sv)
+					existStockCodeArr = append(existStockCodeArr, sv)
 				}
 				if strings.Contains(indexItem.EdbCode, ev) {
 					existEdbCodeArr = append(existEdbCodeArr, ev)
@@ -4984,7 +4963,7 @@ func (this *EdbInfoController) EdbInfoExistCheck() {
 		resp.IndexExist = true
 	}
 	resp.ExistEdbCodeArr = existEdbCodeArr
-	resp.ExistSecuritiesCodeArr = existSecuritiesCodeArr
+	resp.ExistStockCodeArr = existStockCodeArr
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/data_manage/edb_info.go

@@ -1795,7 +1795,7 @@ func GetEdbInfoAdminList(edbType int) (list []int, err error) {
 }
 
 type EdbInfoExistCheckResp struct {
-	IndexExist             bool     `description:"指标是否存在:true,存在,false:不存在"`
-	ExistSecuritiesCodeArr []string `description:"存在的证券代码"`
-	ExistEdbCodeArr        []string `description:"存在的指标代码"`
+	IndexExist        bool     `description:"指标是否存在:true,存在,false:不存在"`
+	ExistStockCodeArr []string `description:"存在的证券代码"`
+	ExistEdbCodeArr   []string `description:"存在的指标代码"`
 }

services/data/base_edb_lib.go

@@ -80,6 +80,21 @@ func AddEdbData(source int, edbCode string) (resp *models.BaseResponse, err erro
 	return
 }
 
+// AddEdbData 新增指标数据
+func AddEdbDataWindWsd(source int, securitiesCode, edbCode string) (resp *models.BaseResponse, err error) {
+	param := make(map[string]interface{})
+	param["EdbCode"] = edbCode
+	param["SecuritiesCode"] = securitiesCode
+	param["Source"] = source
+	urlStr := `wind/wsd/add`
+	if urlStr == "" {
+		err = fmt.Errorf("未实现该指标的刷新接口，请联系管理员")
+		return
+	}
+	resp, err = postRefreshEdbData(param, urlStr)
+	return
+}
+
 type AddPredictEdbDataResponse struct {
 	Ret         int
 	Msg         string