交易所品种接口修改

controllers/commodity_trade_base_index.go

@@ -66,15 +66,17 @@ func (this *TradeCommonController) ExchangeClassify() {
 		this.ServeJSON()
 	}()
 	exchange := this.GetString("Exchange")
+	date := this.GetString("DataTime")
 
-	var respItem [][]*string
+	var respItem [][]string
 
 	latestData, err := data_manage.GetLatestDate(exchange)
 	if err != nil {
 		br.Msg = "获取失败"
 		return
 	}
-	if len(latestData) <= 0 {
+
+	if latestData == "" {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"
@@ -82,18 +84,18 @@ func (this *TradeCommonController) ExchangeClassify() {
 		return
 	}
 
-	var dataTime []*string
-	if latestData != nil {
-		dataTime = append(dataTime, &latestData[0].DataTime)
+	if date == "" {
+		date = latestData
 	}
-	classifyName, err := data_manage.GetExchangeClassify(exchange, *dataTime[0])
+
+	classifyName, err := data_manage.GetExchangeClassify(exchange, date)
 	if err != nil {
 		br.Msg = "获取种类失败"
 		br.ErrMsg = "获取种类失败,Err:" + err.Error()
 		return
 	}
 	respItem = append(respItem, classifyName)
-	respItem = append(respItem, dataTime)
+	respItem = append(respItem, []string{latestData})
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/data_manage/base_from_trade_index.go

@@ -131,17 +131,17 @@ func GetBaseFromTradeIndexByParam(exchange, date, classifyName, classifyType str
 	}
 }
 
-func GetExchangeClassify(exchange, dataTime string) (classifyName []*string, err error) {
+func GetExchangeClassify(exchange, dataTime string) (classifyName []string, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := "SELECT DISTINCT classify_name FROM base_from_trade_" + exchange + "_index where data_time=? ORDER BY CONVERT(classify_name using gbk) DESC"
 	_, err = o.Raw(sql, dataTime).QueryRows(&classifyName)
 	return
 }
 
-func GetLatestDate(exchange string) (date []*BaseFromTradeIneIndex, err error) {
+func GetLatestDate(exchange string) (dataTime string, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := "SELECT * FROM base_from_trade_" + exchange + "_index ORDER BY data_time desc limit 1"
-	_, err = o.Raw(sql).QueryRows(&date)
+	sql := "SELECT data_time FROM base_from_trade_" + exchange + "_index ORDER BY data_time desc limit 1"
+	err = o.Raw(sql).QueryRow(&dataTime)
 	return
 }