diff --git a/.dockerignore b/.dockerignore index dee6183..c85d398 100644 --- a/.dockerignore +++ b/.dockerignore @@ -15,4 +15,6 @@ reports/ .vscode *.swp *.swo -*.log \ No newline at end of file +*.log +*.csv +*.xlsx diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..40c189a --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,11 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +*.csv +*.xlsx +*.log diff --git a/src/app.py b/src/app.py index e972060..bbfbf50 100644 --- a/src/app.py +++ b/src/app.py @@ -454,11 +454,13 @@ def run_chip_distribution_collection(): db_url = 'mysql+pymysql://fac_pattern:Chlry$%.8pattern@192.168.16.150:3306/factordb_mysql' # 采集每日筹码分布数据（按年分表） - collect_chip_distribution( - db_url=db_url, - tushare_token=TUSHARE_TOKEN, - mode='full' - ) + # collect_chip_distribution( + # db_url=db_url, + # tushare_token=TUSHARE_TOKEN, + # mode='full' + # ) + collect_chip_distribution(db_url=db_url, tushare_token=TUSHARE_TOKEN, mode='full', + start_date='2022-01-03', end_date='2022-12-31') # collect_chip_distribution( # db_url=db_url, # tushare_token=TUSHARE_TOKEN, diff --git a/src/quantitative_analysis/tech_fundamental_factor_strategy.py b/src/quantitative_analysis/tech_fundamental_factor_strategy.py index 2fa204f..617a218 100644 --- a/src/quantitative_analysis/tech_fundamental_factor_strategy.py +++ b/src/quantitative_analysis/tech_fundamental_factor_strategy.py @@ -24,7 +24,7 @@ sys.path.append(str(project_root)) from src.quantitative_analysis.company_lifecycle_factor import CompanyLifecycleFactor from src.quantitative_analysis.financial_indicator_analyzer import FinancialIndicatorAnalyzer from src.quantitative_analysis.average_distance_factor import AverageDistanceFactor -from src.valuation_analysis.config import MONGO_CONFIG2, DB_URL +from src.valuation_analysis.config import DB_URL # 设置日志 logging.basicConfig( diff --git a/src/tushare_scripts/chip_distribution_collector.py b/src/tushare_scripts/chip_distribution_collector.py index 21f4779..670cddf 100644 --- a/src/tushare_scripts/chip_distribution_collector.py +++ b/src/tushare_scripts/chip_distribution_collector.py @@ -155,7 +155,7 @@ class ChipDistributionCollector: 股票代码列表 """ try: - query = "SELECT gp_code FROM gp_code_all" + query = "SELECT gp_code FROM gp_code_all_copy" df = pd.read_sql(query, self.engine) codes = df['gp_code'].tolist() print(f"获取到A股股票代码: {len(codes)}个") @@ -448,7 +448,7 @@ def collect_chip_distribution(db_url, tushare_token, mode='daily', date=None, st if __name__ == "__main__": # 数据库配置 - db_url = 'mysql+pymysql://root:Chlry#$.8@192.168.18.199:3306/db_gp_cj' + db_url = 'mysql+pymysql://fac_pattern:Chlry$%.8pattern@192.168.16.150:3306/factordb_mysql' # Tushare Token（从config.py读取） tushare_token = TUSHARE_TOKEN @@ -461,14 +461,14 @@ if __name__ == "__main__": # 2. 全量覆盖采集（首次使用或需要重建数据时） # 采集近8年数据，自动按年创建分表（如gp_chip_distribution_2025, gp_chip_distribution_2024等） - collect_chip_distribution(db_url, tushare_token, mode='full') + # collect_chip_distribution(db_url, tushare_token, mode='full') # 3. 采集指定日期的数据 - # collect_chip_distribution(db_url, tushare_token, mode='daily', date='2025-10-29') + collect_chip_distribution(db_url, tushare_token, mode='daily', date='2025-11-24') # 4. 采集指定日期范围的数据 - # collect_chip_distribution(db_url, tushare_token, mode='full', - # start_date='2024-01-01', end_date='2024-12-31') + # collect_chip_distribution(db_url, tushare_token, mode='full', + # start_date='2021-11-01', end_date='2021-11-30') # 5. 调整批量入库大小（默认100只股票一批） # collect_chip_distribution(db_url, tushare_token, mode='daily', batch_size=200) diff --git a/src/tushare_scripts/concept_moneyflow_ths_collector.py b/src/tushare_scripts/concept_moneyflow_ths_collector.py index b2b6e67..debd02e 100644 --- a/src/tushare_scripts/concept_moneyflow_ths_collector.py +++ b/src/tushare_scripts/concept_moneyflow_ths_collector.py @@ -213,9 +213,8 @@ if __name__ == "__main__": TOKEN = TUSHARE_TOKEN # 示例： - collect_concept_moneyflow_ths(DB_URL, TOKEN, mode="daily", date="2025-11-17") + collect_concept_moneyflow_ths(DB_URL, TOKEN, mode="daily", date="2025-11-18") # collect_concept_moneyflow_ths(DB_URL, TOKEN, mode="range", start_date="2025-11-01", end_date="2025-11-07") # collect_concept_moneyflow_ths(DB_URL, TOKEN, mode="full", start_date="2018-01-01") # collect_concept_moneyflow_ths(DB_URL, TOKEN, mode="daily") - diff --git a/src/tushare_scripts/industry_moneyflow_ths_collector.py b/src/tushare_scripts/industry_moneyflow_ths_collector.py index 0c3c65a..d573d33 100644 --- a/src/tushare_scripts/industry_moneyflow_ths_collector.py +++ b/src/tushare_scripts/industry_moneyflow_ths_collector.py @@ -213,7 +213,7 @@ if __name__ == "__main__": TOKEN = TUSHARE_TOKEN # 示例： - collect_industry_moneyflow_ths(DB_URL, TOKEN, mode="daily", date="2025-11-17") + collect_industry_moneyflow_ths(DB_URL, TOKEN, mode="daily", date="2025-11-18") # collect_industry_moneyflow_ths(DB_URL, TOKEN, mode="range", start_date="2025-11-01", end_date="2025-11-07") # collect_industry_moneyflow_ths(DB_URL, TOKEN, mode="full", start_date="2018-01-01") diff --git a/src/tushare_scripts/moneyflow_ths_collector.py b/src/tushare_scripts/moneyflow_ths_collector.py index 40da830..e43fa31 100644 --- a/src/tushare_scripts/moneyflow_ths_collector.py +++ b/src/tushare_scripts/moneyflow_ths_collector.py @@ -331,7 +331,7 @@ if __name__ == "__main__": # collect_moneyflow_ths(DB_URL, TOKEN, mode="full") # 2. 采集指定日期全市场数据 - collect_moneyflow_ths(DB_URL, TOKEN, mode="daily", date="2025-11-17") + collect_moneyflow_ths(DB_URL, TOKEN, mode="daily", date="2025-11-18") # # 3. 采集日期区间全市场数据（逐日） # collect_moneyflow_ths(DB_URL, TOKEN, mode="range", start_date="2025-11-01", end_date="2025-11-07")