优化PullTrade

This commit is contained in:
钱纯净
2025-06-09 22:26:00 +08:00
parent 2adcc9a322
commit 1187e1dcdf
3 changed files with 7 additions and 5 deletions

View File

@@ -13,7 +13,7 @@ func main() {
m, err := tdx.NewManage(nil) m, err := tdx.NewManage(nil)
logs.PanicErr(err) logs.PanicErr(err)
err = pt.Pull(m, 2024, "sz000001") err = pt.Pull(m, 2025, "sz000001")
logs.Err(err) logs.Err(err)
} }

View File

@@ -106,7 +106,7 @@ func (this *PullTrade) Pull(m *tdx.Manage, year int, code string) (err error) {
} }
func KlinesToCsv(filename string, code, name string, ks protocol.Klines) error { func KlinesToCsv(filename string, code, name string, ks protocol.Klines) error {
data := [][]any{{"日期", "时间", "代码", "名称", "开盘", "最高", "最低", "收盘", "总手", "金额", "涨幅", "涨幅比"}} data := [][]any{{"日期", "时间", "代码", "名称", "开盘", "最高", "最低", "收盘", "总手", "金额"}}
for _, v := range ks { for _, v := range ks {
data = append(data, []any{ data = append(data, []any{
v.Time.Format("20060102"), v.Time.Format("20060102"),
@@ -119,8 +119,6 @@ func KlinesToCsv(filename string, code, name string, ks protocol.Klines) error {
v.Close.Float64(), v.Close.Float64(),
v.Volume, v.Volume,
v.Amount.Float64(), v.Amount.Float64(),
v.RisePrice().Float64(),
v.RiseRate(),
}) })
} }
@@ -133,7 +131,7 @@ func KlinesToCsv(filename string, code, name string, ks protocol.Klines) error {
} }
func TradeToCsv(filename string, ts protocol.Trades) error { func TradeToCsv(filename string, ts protocol.Trades) error {
data := [][]any{{"日期", "时间", "价格", "成交量(手)", "成交额", "买卖方向"}} data := [][]any{{"日期", "时间", "价格", "成交量(手)", "成交额", "方向(0买,1卖)"}}
for _, v := range ts { for _, v := range ts {
data = append(data, []any{ data = append(data, []any{
v.Time.Format(time.DateOnly), v.Time.Format(time.DateOnly),

View File

@@ -150,6 +150,10 @@ func (this Trades) Klines1() (Klines, error) {
if v.Time.Hour() == 9 && v.Time.Minute() < 30 { if v.Time.Hour() == 9 && v.Time.Minute() < 30 {
v.Time = time.Date(v.Time.Year(), v.Time.Month(), v.Time.Day(), 9, 30, 0, 0, v.Time.Location()) v.Time = time.Date(v.Time.Year(), v.Time.Month(), v.Time.Day(), 9, 30, 0, 0, v.Time.Location())
} }
//15:00之前和11:30之前+1
if (v.Time.Hour() >= 13 && v.Time.Hour() < 15) || (v.Time.Hour() == 11 && v.Time.Minute() < 30) || v.Time.Hour() < 11 {
v.Time = v.Time.Add(time.Minute)
}
m[v.Time.Unix()] = append(m[v.Time.Unix()], v) m[v.Time.Unix()] = append(m[v.Time.Unix()], v)
} }