quant/qsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

fix bug

Browse Source
This commit is contained in:
yanweidong
2026-05-02 12:58:16 +08:00
parent 7f3117fd88
commit a2b101621b
3 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
schema/dataset_indicator_pro.go
View File

@@ -32,25 +32,25 @@ type DatasetIndicatorPro struct {
TotalMv float64 `gorm:"type:decimal(20,4);comment:总市值(万元)"` TotalMv float64 `gorm:"type:decimal(20,4);comment:总市值(万元)"`
CircMv float64 `gorm:"type:decimal(20,4);comment:流通市值(万元)"` CircMv float64 `gorm:"type:decimal(20,4);comment:流通市值(万元)"`
AdjFactor float64 `gorm:"type:decimal(20,6);comment:复权因子"` AdjFactor float64 `gorm:"type:decimal(20,6);comment:复权因子"`
MaBfq5 float64 `gorm:"type:decimal(20,6);comment:MA5不复权"` MaQfq5 float64 `gorm:"type:decimal(20,6);comment:MA5前复权"`
MaBfq10 float64 `gorm:"type:decimal(20,6);comment:MA10不复权"` MaQfq10 float64 `gorm:"type:decimal(20,6);comment:MA10前复权"`
MaBfq20 float64 `gorm:"type:decimal(20,6);comment:MA20不复权"` MaQfq20 float64 `gorm:"type:decimal(20,6);comment:MA20前复权"`
MaBfq60 float64 `gorm:"type:decimal(20,6);comment:MA60不复权"` MaQfq60 float64 `gorm:"type:decimal(20,6);comment:MA60前复权"`
EmaBfq5 float64 `gorm:"type:decimal(20,6);comment:EMA5不复权"` EmaQfq5 float64 `gorm:"type:decimal(20,6);comment:EMA5前复权"`
EmaBfq10 float64 `gorm:"type:decimal(20,6);comment:EMA10不复权"` EmaQfq10 float64 `gorm:"type:decimal(20,6);comment:EMA10前复权"`
EmaBfq20 float64 `gorm:"type:decimal(20,6);comment:EMA20不复权"` EmaQfq20 float64 `gorm:"type:decimal(20,6);comment:EMA20前复权"`
MacdBfq float64 `gorm:"type:decimal(20,6);comment:MACD不复权"` MacdQfq float64 `gorm:"type:decimal(20,6);comment:MACD前复权"`
MacdDifBfq float64 `gorm:"type:decimal(20,6);comment:MACD DIF不复权"` MacdDifQfq float64 `gorm:"type:decimal(20,6);comment:MACD DIF前复权"`
MacdDeaBfq float64 `gorm:"type:decimal(20,6);comment:MACD DEA不复权"` MacdDeaQfq float64 `gorm:"type:decimal(20,6);comment:MACD DEA前复权"`
RsiBfq6 float64 `gorm:"type:decimal(20,6);comment:RSI6不复权"` RsiQfq6 float64 `gorm:"type:decimal(20,6);comment:RSI6前复权"`
RsiBfq12 float64 `gorm:"type:decimal(20,6);comment:RSI12不复权"` RsiQfq12 float64 `gorm:"type:decimal(20,6);comment:RSI12前复权"`
RsiBfq24 float64 `gorm:"type:decimal(20,6);comment:RSI24不复权"` RsiQfq24 float64 `gorm:"type:decimal(20,6);comment:RSI24前复权"`
KdjKBfq float64 `gorm:"type:decimal(20,6);comment:KDJ-K不复权"` KdjKQfq float64 `gorm:"type:decimal(20,6);comment:KDJ-K前复权"`
KdjDBfq float64 `gorm:"type:decimal(20,6);comment:KDJ-D不复权"` KdjDQfq float64 `gorm:"type:decimal(20,6);comment:KDJ-D前复权"`
KdjBfq float64 `gorm:"type:decimal(20,6);comment:KDJ-J不复权"` KdjQfq float64 `gorm:"type:decimal(20,6);comment:KDJ-J前复权"`
BollUpperBfq float64 `gorm:"type:decimal(20,6);comment:BOLL上轨不复权"` BollUpperQfq float64 `gorm:"type:decimal(20,6);comment:BOLL上轨前复权"`
BollMidBfq float64 `gorm:"type:decimal(20,6);comment:BOLL中轨不复权"` BollMidQfq float64 `gorm:"type:decimal(20,6);comment:BOLL中轨前复权"`
BollLowerBfq float64 `gorm:"type:decimal(20,6);comment:BOLL下轨不复权"` BollLowerQfq float64 `gorm:"type:decimal(20,6);comment:BOLL下轨前复权"`
} }
func (DatasetIndicatorPro) TableName() string { func (DatasetIndicatorPro) TableName() string {

16
schema/dataset_summary.go
View File

@@ -44,10 +44,10 @@ type DatasetSummary struct {
TotalMv float64 `gorm:"type:decimal(20,4);comment:总市值(万元)" json:"total_mv"` TotalMv float64 `gorm:"type:decimal(20,4);comment:总市值(万元)" json:"total_mv"`
CircMv float64 `gorm:"type:decimal(20,4);comment:流通市值(万元)" json:"circ_mv"` CircMv float64 `gorm:"type:decimal(20,4);comment:流通市值(万元)" json:"circ_mv"`
AdjFactor float64 `gorm:"type:decimal(20,6);comment:复权因子(来自因子表)" json:"adj_factor"` AdjFactor float64 `gorm:"type:decimal(20,6);comment:复权因子(来自因子表)" json:"adj_factor"`
MaBfq5 float64 `gorm:"type:decimal(20,6);comment:MA5不复权" json:"ma_bfq5"` MaBfq5 float64 `gorm:"type:decimal(20,6);comment:MA5前复权" json:"ma_bfq5"`
MaBfq20 float64 `gorm:"type:decimal(20,6);comment:MA20不复权" json:"ma_bfq20"` MaBfq20 float64 `gorm:"type:decimal(20,6);comment:MA20前复权" json:"ma_bfq20"`
MacdDifBfq float64 `gorm:"type:decimal(20,6);comment:MACD DIF不复权" json:"macd_dif_bfq"` MacdDifBfq float64 `gorm:"type:decimal(20,6);comment:MACD DIF前复权" json:"macd_dif_bfq"`
RsiBfq12 float64 `gorm:"type:decimal(20,6);comment:RSI12不复权" json:"rsi_bfq12"` RsiBfq12 float64 `gorm:"type:decimal(20,6);comment:RSI12前复权" json:"rsi_bfq12"`
// --- DatasetFinaIndicator：最近一期财务核心 --- // --- DatasetFinaIndicator：最近一期财务核心 ---
FinaPeriod int `gorm:"index;comment:财务报告期数(与 fina 表 period 一致)" json:"fina_period"` FinaPeriod int `gorm:"index;comment:财务报告期数(与 fina 表 period 一致)" json:"fina_period"`
@@ -230,10 +230,10 @@ func buildDatasetSummary(db *gorm.DB, tsCode string) (*DatasetSummary, error) {
s.TotalMv = dip.TotalMv s.TotalMv = dip.TotalMv
s.CircMv = dip.CircMv s.CircMv = dip.CircMv
s.AdjFactor = dip.AdjFactor s.AdjFactor = dip.AdjFactor
s.MaBfq5 = dip.MaBfq5 s.MaBfq5 = dip.MaQfq5
s.MaBfq20 = dip.MaBfq20 s.MaBfq20 = dip.MaQfq20
s.MacdDifBfq = dip.MacdDifBfq s.MacdDifBfq = dip.MacdDifQfq
s.RsiBfq12 = dip.RsiBfq12 s.RsiBfq12 = dip.RsiQfq12
case hasDay: case hasDay:
s.Close = day.Close s.Close = day.Close
s.PctChg = day.PctChg s.PctChg = day.PctChg

38
tushare/indicator.go
View File

@@ -55,25 +55,25 @@ func (cli *TushareClient) StkFactorPro(ts_code, trade_date, start_date, end_date
{"total_mv": "总市值(万元)"}, {"total_mv": "总市值(万元)"},
{"circ_mv": "流通市值(万元)"}, {"circ_mv": "流通市值(万元)"},
{"adj_factor": "复权因子"}, {"adj_factor": "复权因子"},
{"ma_bfq_5": "MA5不复权"}, {"ma_qfq_5": "MA5前复权"},
{"ma_bfq_10": "MA10不复权"}, {"ma_qfq_10": "MA10前复权"},
{"ma_bfq_20": "MA20不复权"}, {"ma_qfq_20": "MA20前复权"},
{"ma_bfq_60": "MA60不复权"}, {"ma_qfq_60": "MA60前复权"},
{"ema_bfq_5": "EMA5不复权"}, {"ema_qfq_5": "EMA5前复权"},
{"ema_bfq_10": "EMA10不复权"}, {"ema_qfq_10": "EMA10前复权"},
{"ema_bfq_20": "EMA20不复权"}, {"ema_qfq_20": "EMA20前复权"},
{"macd_bfq": "MACD不复权"}, {"macd_qfq": "MACD前复权"},
{"macd_dif_bfq": "MACD DIF不复权"}, {"macd_dif_qfq": "MACD DIF前复权"},
{"macd_dea_bfq": "MACD DEA不复权"}, {"macd_dea_qfq": "MACD DEA前复权"},
{"rsi_bfq_6": "RSI6不复权"}, {"rsi_qfq_6": "RSI6前复权"},
{"rsi_bfq_12": "RSI12不复权"}, {"rsi_qfq_12": "RSI12前复权"},
{"rsi_bfq_24": "RSI24不复权"}, {"rsi_qfq_24": "RSI24前复权"},
{"kdj_k_bfq": "KDJ-K不复权"}, {"kdj_k_qfq": "KDJ-K前复权"},
{"kdj_d_bfq": "KDJ-D不复权"}, {"kdj_d_qfq": "KDJ-D前复权"},
{"kdj_bfq": "KDJ-J不复权"}, {"kdj_qfq": "KDJ-J前复权"},
{"boll_upper_bfq": "BOLL上轨不复权"}, {"boll_upper_qfq": "BOLL上轨前复权"},
{"boll_mid_bfq": "BOLL中轨不复权"}, {"boll_mid_qfq": "BOLL中轨前复权"},
{"boll_lower_bfq": "BOLL下轨不复权"}, {"boll_lower_qfq": "BOLL下轨前复权"},
} }
return cli.Do(req, fields) return cli.Do(req, fields)