根据ID查询指标

models/jiayue/dict.go

@@ -6,17 +6,9 @@ import (
 	"fmt"
 )
 
-/*func main() {
-	//sqlStatement := "SELECT * FROM DICT_CATEGORY where CODE = :1"
-	//_, _ = GetDictData("T_UDATA", 149072)
-	//_, _ = GetDictIndex("S0272713", "wind")
-}*/
-
-func GetDictIndex(sourceCode, sourceType string) (dictIndexList []DictIndex, err error) {
+func GetDictIndex(condition string, pars []interface{}) (dictIndexList []DictIndex, err error) {
 	selectVals := "ID, CODE, NAME, UNIT, FREQUENCY, DESCRIPTION, TABLE_NAME, SOURCE_TYPE, SOURCE_CODE, SOURCE_DESCRIPTION, INDUSTRY, TYPE, COMMODITY, SJB_ID, USER_ID, ROWS_COUNT, DATE_FIRST, DATE_LAST, TIME_LAST_UPDATE, TIME_LAST_REQUEST, PRIORITY, STATUS, SHORT_NAME, UPDATE_DESCRIPTION, FORECAST_FLAG, MANUAL_FLAG, VARIABLE_FLAG, MARKETDATA_FLAG, CREATE_USER, CREATE_TIME, UPDATE_USER, UPDATE_TIME"
-	sqlStatement := fmt.Sprintf("SELECT %s FROM DICT_INDEX WHERE SOURCE_CODE = :1 AND SOURCE_TYPE = :1 ", selectVals)
-	var pars []interface{}
-	pars = append(pars, sourceCode, sourceType)
+	sqlStatement := fmt.Sprintf("SELECT %s FROM DICT_INDEX WHERE %s", selectVals, condition)
 	dictIndexList, err = getDictIndex(sqlStatement, pars)
 	if err != nil {
 		fmt.Printf("查询指标信息失败 %s", err)
@@ -39,38 +31,38 @@ func GetDictData(tableName string, condition string, pars []interface{}) (dictIn
 }
 
 type DictIndex struct {
-	Id                int    `description:"主键" json:"ID"`
-	Code              string `description:"指标编码" json:"CODE"`
-	Name              string `description:"指标名称" json:"NAME"`
-	Unit              string `description:"单位" json:"UNIT"`
-	Frequency         string `description:"更新频率" json:"FREQUENCY"`
-	Description       string `description:"描述" json:"DESCRIPTION"`
-	TableName         string `description:"指标数据存储库表" json:"TABLE_NAME"`
-	SourceType        string `description:"指标来源，如：wind：万德;manual：手工导入;formula：公式;webisite：网页爬取" json:"SOURCE_TYPE"`
-	SourceCode        string `description:"来源编码" json:"SOURCE_CODE"`
-	SourceDescription string `description:"来源说明" json:"SOURCE_DESCRIPTION"`
-	Industry          string `description:"品种板块" json:"INDUSTRY"`
-	Type              string `description:"指标类型" json:"TYPE"`
-	Commodity         string `description:"商品名称" json:"COMMODITY"`
-	SjbId             int    `json:"SJB_ID"`
-	UserId            int    `description:"所属用户" json:"USER_ID"`
-	RowsCount         int    `description:"指标数据数量" json:"ROWS_COUNT"`
-	DateFirst         string `description:"指标开始时间" json:"DATE_FIRST"`
-	DateLast          string `description:"指标最新时间" json:"DATE_LAST"`
-	TimeLastUpdate    string `description:"最新更新时间" json:"TIME_LAST_UPDATE"`
-	TimeLastRequest   string `description:"下次更新时间" json:"TIME_LAST_REQUEST"`
-	Priority          int    `description:"更新优先级" json:"PRIORITY"`
-	Status            int    `description:"指标状态" json:"STATUS"`
-	ShortName         string `description:"指标简称" json:"SHORT_NAME"`
-	UpdateDescription string `description:"更新说明" json:"UPDATE_DESCRIPTION"`
-	ForecastFlag      int    `description:"预测标识" json:"FORECAST_FLAG"`
-	ManualFlag        int    `description:"手动标识" json:"MANUAL_FLAG"`
-	VariableFlag      int    `description:"有效标识" json:"VARIABLE_FLAG"`
-	MarketDataFlag    int    `description:"市场价标识" json:"MARKETDATA_FLAG"`
-	CreateUser        int    `description:"创建用户" json:"CREATE_USER"`
-	CreateTime        string `description:"创建时间" json:"CREATE_TIME"`
-	UpdateUser        int    `description:"更新用户" json:"UPDATE_USER"`
-	UpdateTime        string `description:"更新时" json:"UPDATE_TIME"`
+	Id                int    `description:"主键"`
+	Code              string `description:"指标编码"`
+	Name              string `description:"指标名称"`
+	Unit              string `description:"单位"`
+	Frequency         string `description:"更新频率"`
+	Description       string `description:"描述"`
+	TableName         string `description:"指标数据存储库表"`
+	SourceType        string `description:"指标来源，如：wind：万德;manual：手工导入;formula：公式;webisite：网页爬取"`
+	SourceCode        string `description:"来源编码"`
+	SourceDescription string `description:"来源说明"`
+	Industry          string `description:"品种板块"`
+	Type              string `description:"指标类型"`
+	Commodity         string `description:"商品名称"`
+	SjbId             int    `description:"SJB_ID"`
+	UserId            int    `description:"所属用户"`
+	RowsCount         int    `description:"指标数据数量"`
+	DateFirst         string `description:"指标开始时间"`
+	DateLast          string `description:"指标最新时间"`
+	TimeLastUpdate    string `description:"最新更新时间"`
+	TimeLastRequest   string `description:"下次更新时间"`
+	Priority          int    `description:"更新优先级"`
+	Status            int    `description:"指标状态"`
+	ShortName         string `description:"指标简称"`
+	UpdateDescription string `description:"更新说明"`
+	ForecastFlag      int    `description:"预测标识"`
+	ManualFlag        int    `description:"手动标识"`
+	VariableFlag      int    `description:"有效标识"`
+	MarketDataFlag    int    `description:"市场价标识"`
+	CreateUser        int    `description:"创建用户"`
+	CreateTime        string `description:"创建时间"`
+	UpdateUser        int    `description:"更新用户"`
+	UpdateTime        string `description:"更新时"`
 }
 
 type DictIndexSql struct {

services/index_data/jiayue_platform.go

@@ -14,9 +14,22 @@ func GetIndexFromJiaYue(indexCode, source, startDate, endDate string) (data *res
 	defer func() {
 		if err != nil {
 			global.LOG.Info("GetIndexFromJiaYue: " + errMsg)
+			return
 		}
 	}()
-	indexList, err := jiayue.GetDictIndex(indexCode, source)
+	var indexPars []interface{}
+	indexCond := " SOURCE_TYPE = :1"
+	indexPars = append(indexPars, source)
+
+	if source == "wind" {
+		indexCond += " AND SOURCE_CODE = :1 "
+		indexPars = append(indexPars, indexCode)
+	} else {
+		indexCond += " AND ID = :1 "
+		indexPars = append(indexPars, indexCode)
+	}
+
+	indexList, err := jiayue.GetDictIndex(indexCond, indexPars)
 	if err != nil {
 		errMsg = fmt.Sprintf("嘉悦物产指标信息查询失败，Err: %s", err)
 		return