fix StkFactorPro

markdown/builder.go

@@ -2,7 +2,6 @@ package markdown
 
 import (
 	"bytes"
-	"io"
 	"os"
 	"strings"
 )
@@ -78,6 +77,10 @@ func (m *Builder) SaveToFile(filePath string) error {
 	}
 	defer rf.Close()
 
-	_, err = io.Copy(rf, &m.buf)
-	return err
+	_, err = rf.WriteString(m.Build())
+	if err != nil {
+		return err
+	}
+
+	return nil
 }

schema/dataset_indicator_pro.go

@@ -35,10 +35,13 @@ type DatasetIndicatorPro struct {
 	MaQfq5        float64 `gorm:"type:decimal(20,6);comment:MA5前复权"`
 	MaQfq10       float64 `gorm:"type:decimal(20,6);comment:MA10前复权"`
 	MaQfq20       float64 `gorm:"type:decimal(20,6);comment:MA20前复权"`
+	MaQfq30       float64 `gorm:"type:decimal(20,6);comment:MA30前复权"`
 	MaQfq60       float64 `gorm:"type:decimal(20,6);comment:MA60前复权"`
 	EmaQfq5       float64 `gorm:"type:decimal(20,6);comment:EMA5前复权"`
 	EmaQfq10      float64 `gorm:"type:decimal(20,6);comment:EMA10前复权"`
 	EmaQfq20      float64 `gorm:"type:decimal(20,6);comment:EMA20前复权"`
+	EmaQfq30      float64 `gorm:"type:decimal(20,6);comment:EMA30前复权"`
+	EmaQfq60      float64 `gorm:"type:decimal(20,6);comment:EMA60前复权"`
 	MacdQfq       float64 `gorm:"type:decimal(20,6);comment:MACD前复权"`
 	MacdDifQfq    float64 `gorm:"type:decimal(20,6);comment:MACD DIF前复权"`
 	MacdDeaQfq    float64 `gorm:"type:decimal(20,6);comment:MACD DEA前复权"`

tushare/cal.go

@@ -0,0 +1,78 @@
+package tushare
+
+import (
+	"time"
+
+	"git.apinb.com/quant/qsdk/conv"
+)
+
+/*
+TradeCal 获取交易日历
+
+	exchange: 交易所代码，SSE 上交所，SZSE 深交所，BSE 北交所，空字符串代表所有
+	start_date: 开始日期，格式:YYYYMMDD
+	end_date: 结束日期，格式:YYYYMMDD
+	is_open: 是否开盘，'0'休市，'1'交易，空字符串代表所有
+*/
+func (cli *TushareClient) TradeCal(exchange, start_date, end_date, is_open string) (*TushareRespData, error) {
+	params := map[string]any{}
+
+	if exchange != "" {
+		params["exchange"] = exchange
+	}
+	if start_date != "" {
+		params["start_date"] = start_date
+	}
+	if end_date != "" {
+		params["end_date"] = end_date
+	}
+	if is_open != "" {
+		params["is_open"] = is_open
+	}
+
+	req := TushareReq{
+		APIName: "trade_cal",
+		Params:  params,
+	}
+
+	fields := []map[string]string{
+		{"exchange": "交易所代码"},
+		{"cal_date": "日历日期"},
+		{"is_open": "是否开盘"},
+		{"pretrade_date": "上一交易日"},
+	}
+
+	return cli.Do(req, fields)
+}
+
+func (cli *TushareClient) LastTradeDay() string {
+	result, err := cli.TradeCal("SSE", time.Now().AddDate(0, 0, -15).Format("20060102"), time.Now().Format("20060102"), "1")
+	if err != nil {
+		return ""
+	}
+	cal := result.Map()
+	if len(cal) == 0 {
+		return ""
+	}
+	return conv.AnyToString(cal[0]["cal_date"])
+}
+
+func (cli *TushareClient) LimitTradeDay(limit int) []string {
+	if limit <= 0 {
+		return []string{}
+	}
+	if limit > 100 {
+		limit = 100
+	}
+	result, err := cli.TradeCal("SSE", time.Now().AddDate(0, 0, -100).Format("20060102"), time.Now().Format("20060102"), "1")
+	if err != nil {
+		return []string{}
+	}
+	cal := result.Map()
+	days := []string{}
+	for i := 0; i < limit; i++ {
+		item := cal[i]
+		days = append(days, conv.AnyToString(item["cal_date"]))
+	}
+	return days
+}

tushare/indicator.go

@@ -58,10 +58,13 @@ func (cli *TushareClient) StkFactorPro(ts_code, trade_date, start_date, end_date
 		{"ma_qfq_5": "MA5前复权"},
 		{"ma_qfq_10": "MA10前复权"},
 		{"ma_qfq_20": "MA20前复权"},
+		{"ma_qfq_30": "MA30前复权"},
 		{"ma_qfq_60": "MA60前复权"},
 		{"ema_qfq_5": "EMA5前复权"},
 		{"ema_qfq_10": "EMA10前复权"},
 		{"ema_qfq_20": "EMA20前复权"},
+		{"ema_qfq_30": "EMA30前复权"},
+		{"ema_qfq_60": "EMA60前复权"},
 		{"macd_qfq": "MACD前复权"},
 		{"macd_dif_qfq": "MACD DIF前复权"},
 		{"macd_dea_qfq": "MACD DEA前复权"},

tushare/stock.go

@@ -1,61 +1,5 @@
 package tushare
 
-import (
-	"time"
-
-	"git.apinb.com/quant/qsdk/conv"
-)
-
-/*
-TradeCal 获取交易日历
-
-	exchange: 交易所代码，SSE 上交所，SZSE 深交所，BSE 北交所，空字符串代表所有
-	start_date: 开始日期，格式:YYYYMMDD
-	end_date: 结束日期，格式:YYYYMMDD
-	is_open: 是否开盘，'0'休市，'1'交易，空字符串代表所有
-*/
-func (cli *TushareClient) TradeCal(exchange, start_date, end_date, is_open string) (*TushareRespData, error) {
-	params := map[string]any{}
-
-	if exchange != "" {
-		params["exchange"] = exchange
-	}
-	if start_date != "" {
-		params["start_date"] = start_date
-	}
-	if end_date != "" {
-		params["end_date"] = end_date
-	}
-	if is_open != "" {
-		params["is_open"] = is_open
-	}
-
-	req := TushareReq{
-		APIName: "trade_cal",
-		Params:  params,
-	}
-
-	fields := []map[string]string{
-		{"exchange": "交易所代码"},
-		{"cal_date": "日历日期"},
-		{"is_open": "是否开盘"},
-		{"pretrade_date": "上一交易日"},
-	}
-
-	return cli.Do(req, fields)
-}
-
-func (cli *TushareClient) ReturnLastTradeDay() string {
-	result, err := cli.TradeCal("SSE", time.Now().AddDate(0, 0, -15).Format("20060102"), time.Now().Format("20060102"), "1")
-	if err != nil {
-		return ""
-	}
-	cal := result.Map()
-	if len(cal) == 0 {
-		return ""
-	}
-	return conv.AnyToString(cal[0]["cal_date"])
-}
 
 /*
 StockBasic 获取股票列表