From b9ada4404625b3c214d76d9179a5d4b8567b7e3a Mon Sep 17 00:00:00 2001 From: laixingyu Date: Mon, 14 Aug 2023 21:58:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=EF=BC=8C811=E5=B7=B2=E5=90=8C=E6=AD=A5=E5=88=B0newrecord(?= =?UTF-8?q?=E4=B8=8D=E5=90=AB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- transAllData.py | 2 +- transferData_python.py | 9 ++++--- transferIndustryData_python.py | 9 ++++--- transferIndustrySatistics_python.py | 9 ++++--- transferNewrecordData_python.py | 9 ++++--- transferOhterRyData_python.py | 40 ++++++++++++++--------------- 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/transAllData.py b/transAllData.py index 126dd52..a2d71b1 100644 --- a/transAllData.py +++ b/transAllData.py @@ -32,7 +32,7 @@ def main() : db_b_conn = pymysql.connect(**db_b_config) db_b_cursor = db_b_conn.cursor() - trade_date = '2023-08-09' + trade_date = '2023-08-11' #传输ry库其他数据 trd.toTransRyOhterData(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_date) diff --git a/transferData_python.py b/transferData_python.py index e969cf7..b17bcc1 100644 --- a/transferData_python.py +++ b/transferData_python.py @@ -59,7 +59,8 @@ def toTransData(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): stock_basic_map = {} #查询交易日数据 8月9日，更新数据到8月9日 - sql_trade_qurey = 'select date,week,trade from trade_dates where trade = %s and date > %s' + # sql_trade_qurey = 'select date,week,trade from trade_dates where trade = %s and date > %s' + sql_trade_qurey = 'select date,week,trade from trade_dates where trade = %s and date = %s' sql_trade = "trading" db_a_cursor.execute(sql_trade_qurey,(sql_trade,trans_date)) trading_dates = db_a_cursor.fetchall() @@ -88,9 +89,9 @@ def toTransData(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): for row in trading_dates: trading_date,week,trade = row print('start transfer data ',trading_date , ' data.') - if trading_date == '2023-08-11': - print('break then finish transfer data ',trading_date , ' data.') - break + # if trading_date == '2023-08-11': + # print('break then finish transfer data ',trading_date , ' data.') + # break #查询日交易数据 sql_stock_query = 'select code,trade_day, open,close,high,low,islimit,isdrop,differrange,trade_days,volumn,amount,differrange10,differrange20,differrange60,avg_volume20,freefloat_market_value,total_market_value,agencies_hold from stocks where trade_day = %s' db_a_cursor.execute(sql_stock_query,trading_date) diff --git a/transferIndustryData_python.py b/transferIndustryData_python.py index e03df78..7323512 100644 --- a/transferIndustryData_python.py +++ b/transferIndustryData_python.py @@ -52,7 +52,8 @@ def toTransIndustryData(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): stock_basic_map = {} #查询交易日数据 更新到8月9日 - sql_trade_qurey = 'select date,week,trade from trade_dates where trade = %s and date > %s' + # sql_trade_qurey = 'select date,week,trade from trade_dates where trade = %s and date > %s' + sql_trade_qurey = 'select date,week,trade from trade_dates where trade = %s and date = %s' sql_trade = "trading" db_a_cursor.execute(sql_trade_qurey,(sql_trade,trans_date)) trading_dates = db_a_cursor.fetchall() @@ -60,9 +61,9 @@ def toTransIndustryData(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): for row in trading_dates: trading_date,week,trade = row print('start transfer IndustryData ',trading_date , ' data.') - if trading_date == '2023-08-11': - print('break then finished transfer IndustryData',trading_date , ' data.') - break + # if trading_date == '2023-08-11': + # print('break then finished transfer IndustryData',trading_date , ' data.') + # break #查询日交易数据 sql_stock_query = 'select code,name,trade_day, open,close,high,low,differrange,volume,amount,limitupnum,limitdownnum,suspendnum,risenum,fallnum,flatnum,componentnum,mv,pettm,pettm_mid,liqmv,rcnthigh,rcntlow from stock_index where trade_day = %s' db_a_cursor.execute(sql_stock_query,trading_date) diff --git a/transferIndustrySatistics_python.py b/transferIndustrySatistics_python.py index 5fcd6e3..a242216 100644 --- a/transferIndustrySatistics_python.py +++ b/transferIndustrySatistics_python.py @@ -305,7 +305,8 @@ def toTransIndustrySatisticsData(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade trans_date = trade_date #查询交易日数据 - sql_trade_qurey = 'select date,week,trade from trade_dates where trade = %s and date > %s' + # sql_trade_qurey = 'select date,week,trade from trade_dates where trade = %s and date > %s' + sql_trade_qurey = 'select date,week,trade from trade_dates where trade = %s and date = %s' sql_trade = "trading" db_a_cursor.execute(sql_trade_qurey,(sql_trade,trans_date)) trading_dates = db_a_cursor.fetchall() @@ -319,9 +320,9 @@ def toTransIndustrySatisticsData(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade # period_trading_dateMap = getTradingDates(db_a_conn,db_a_cursor,sql_trade,trans_date) period_trading_dateMap2 = {} # 用于计算区间涨跌数量等，区间涨跌等需要查询个股;区间涨跌是以前一日的收盘价与当前收盘价计算的 trading_date,week,trade = row - if trading_date == '2023-08-11': - print('break then finish transfer data ',trading_date , ' data.') - break + # if trading_date == '2023-08-11': + # print('break then finish transfer data ',trading_date , ' data.') + # break # 获取周期,不包含当前交易日 sql_trade_period_qurey = 'select date,week,trade from trade_dates where trade = %s and date < %s order by date desc limit 30' sql_trade_period = "trading" diff --git a/transferNewrecordData_python.py b/transferNewrecordData_python.py index 5b96ef5..ebccaaa 100644 --- a/transferNewrecordData_python.py +++ b/transferNewrecordData_python.py @@ -59,7 +59,8 @@ def toTransNewRecordData(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): stock_basic_map = {} #查询交易日数据 更新数据到 8月9日 - sql_trade_qurey = 'select date,week,trade from trade_dates where trade = %s and date > %s' + # sql_trade_qurey = 'select date,week,trade from trade_dates where trade = %s and date > %s' + sql_trade_qurey = 'select date,week,trade from trade_dates where trade = %s and date = %s' sql_trade = "trading" db_a_cursor.execute(sql_trade_qurey,(sql_trade,trade_date)) trading_dates = db_a_cursor.fetchall() @@ -88,9 +89,9 @@ def toTransNewRecordData(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): for row in trading_dates: trading_date,week,trade = row print('start transfer newrecord data ',trading_date , ' data.') - if trading_date == '2023-08-11': - print('break then finished transfer newrecord ',trading_date , ' data.') - break + # if trading_date == '2023-08-11': + # print('break then finished transfer newrecord ',trading_date , ' data.') + # break sql_stock_query = 'select code,trade_day, open,close,high,low,islimit,isdrop,differrange,trade_days,volumn,amount,differrange10,differrange20,differrange60,avg_volume20,freefloat_market_value,total_market_value,agencies_hold from stocks where trade_day = %s' db_a_cursor.execute(sql_stock_query,trading_date) datas = db_a_cursor.fetchall() diff --git a/transferOhterRyData_python.py b/transferOhterRyData_python.py index 1e0c0ec..f2989ee 100644 --- a/transferOhterRyData_python.py +++ b/transferOhterRyData_python.py @@ -41,7 +41,7 @@ def toTransStockBasis(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): db_mojin_cursor.execute(sql_insert, (code,name,blemind2,blemind3)) hasInsertData = True if hasInsertData: - db_mojin_cursor.commit() + db_b_conn.commit() print('successed transfer stockBasis ',trans_date , ' data.' ) print('\r\n') @@ -87,7 +87,7 @@ def toTransStockFinancial(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): db_mojin_cursor.execute(sql_insert, (code,period,jlrtbzzl,jzcsylroe,epsbasic,jlr,jbmgsy,mgjzc)) hasInsertData = True if hasInsertData: - db_mojin_cursor.commit() + db_b_conn.commit() print('successed transfer stockFinancial ',trans_date , ' data.' ) print('\r\n') @@ -128,7 +128,7 @@ def toTransStockIndex(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): db_mojin_cursor.execute(sql_insert, (code,name,trade_day,open,close,high,low,differRange,volume,amount,limitupnum,suspendnum,risenum,fallnum,flatnum,componentnum,mv,pettm,pettm_mid,liqmv,rcnthigh,rcntlow)) hasInsertData = True if hasInsertData: - db_mojin_cursor.commit() + db_b_conn.commit() print('successed transfer stockIndex ',trans_date , ' data.' ) print('\r\n') @@ -169,7 +169,7 @@ def toTransStocks(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): db_mojin_cursor.execute(sql_insert, (code,trade_day,open,close,high,low,islimit,isdrop,differrange,volumn,amount,differrange10,differrange20,differrange60,avg_volume20,freefloat_market_value,total_market_value,agencies_hold)) hasInsertData = True if hasInsertData: - db_mojin_cursor.commit() + db_b_conn.commit() print('successed transfer stocks ',trans_date , ' data.' ) print('\r\n') @@ -210,7 +210,7 @@ def toTransStocksInTrend(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): db_mojin_cursor.execute(sql_insert, (code,trade_day,sort,type)) hasInsertData = True if hasInsertData: - db_mojin_cursor.commit() + db_b_conn.commit() print('successed transfer stocksInTrend ',trans_date , ' data.' ) print('\r\n') @@ -251,7 +251,7 @@ def toTransStocksLimit(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): db_mojin_cursor.execute(sql_insert, (code,trade_day,islimit,isdrop)) hasInsertData = True if hasInsertData: - db_mojin_cursor.commit() + db_b_conn.commit() print('successed transfer stocksLimit ',trans_date , ' data.' ) print('\r\n') @@ -292,7 +292,7 @@ def toTransStocksLimitUp(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): db_mojin_cursor.execute(sql_insert, (code,trade_day)) hasInsertData = True if hasInsertData: - db_mojin_cursor.commit() + db_b_conn.commit() print('successed transfer stocksLimitUp ',trans_date , ' data.' ) print('\r\n') @@ -324,16 +324,16 @@ def toTransStocksNewRecord(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date) basisDatas = db_ry_cursor.fetchall() hasInsertData = False for row in basisDatas: - ode,trade_day,isHigh,isLow = row + code,trade_day,isHigh,isLow = row # 数据存在时，不进行更新 if code in mojin_stocksNeRecord_map: continue else: sql_insert = f"INSERT INTO stocks_new_record (ode,trade_day,isHigh,isLow) VALUES ( %s, %s, %s, %s)" - db_mojin_cursor.execute(sql_insert, (ode,trade_day,isHigh,isLow)) + db_mojin_cursor.execute(sql_insert, (code,trade_day,isHigh,isLow)) hasInsertData = True if hasInsertData: - db_mojin_cursor.commit() + db_b_conn.commit() print('successed transfer stocksNewRecord ',trans_date , ' data.' ) print('\r\n') @@ -374,7 +374,7 @@ def toTransStocksTmp(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): db_mojin_cursor.execute(sql_insert, (code,trade_day,differrange3,differrange5,differrange15,differrange30)) hasInsertData = True if hasInsertData: - db_mojin_cursor.commit() + db_b_conn.commit() print('successed transfer stocksTmp ',trans_date , ' data.' ) print('\r\n') @@ -415,7 +415,7 @@ def toTransTrends(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date): db_mojin_cursor.execute(sql_insert, (trade_day,blemind2,stocks_count,trend_value,trend_value_change,sort,sort_change,type)) hasInsertData = True if hasInsertData: - db_mojin_cursor.commit() + db_b_conn.commit() print('successed transfer Trends ',trans_date , ' data.' ) print('\r\n') @@ -463,14 +463,14 @@ if __name__ == "__main__": trade_day = '2023-08-10' #测试 - toTransStocksInTrend(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) - toTransStockBasis(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) - # toTransStockFinancial(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date) - toTransStockIndex(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) - toTransStocks(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) - toTransStocksInTrend(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) - toTransStocksLimit(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) - toTransStocksLimitUp(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) + # toTransStocksInTrend(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) + # toTransStockBasis(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) + # # toTransStockFinancial(db_conn_a,dbcursor_a,db_conn_b,dbcursor_b,trade_date) + # toTransStockIndex(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) + # toTransStocks(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) + # toTransStocksInTrend(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) + # toTransStocksLimit(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) + # toTransStocksLimitUp(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) toTransStocksNewRecord(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) toTransStocksTmp(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day) toTransTrends(db_a_conn,db_a_cursor,db_b_conn,db_b_cursor,trade_day)