hikyuu 2.1.3__cp311-none-win_amd64.whl → 2.1.5__cp311-none-win_amd64.whl

hikyuu/data/em_block_to_mysql.py

@@ -4,6 +4,7 @@
 # Create on: 20240102
 #    Author: fasiondog
 
+from concurrent.futures import ThreadPoolExecutor
 from hikyuu.data.common import MARKET, get_stk_code_name_list
 from hikyuu.util import *
 from hikyuu.fetcher.stock.zh_block_em import *
@@ -12,37 +13,50 @@ from hikyuu.fetcher.stock.zh_block_em import *
 def em_import_block_to_mysql(connect, code_market_dict, categorys=('行业板块', '概念板块', '地域板块', '指数板块')):
     all_block_info = {}
 
-    success_fetch_hy = False
-    if '行业板块' in categorys:
-        hku_info("获取行业板块信息")
-        x = get_all_hybk_info(code_market_dict)
-        if x:
-            all_block_info["行业板块"] = x
-            success_fetch_hy = True
-
-    success_fetch_gn = False
-    if '概念板块' in categorys:
-        hku_info("获取概念板块信息")
-        x = get_all_gnbk_info(code_market_dict)
-        if x:
-            all_block_info["概念板块"] = x
-            success_fetch_gn = True
-
-    success_fetch_dy = False
-    if '地域板块' in categorys:
-        hku_info("获取地域板块信息")
-        x = get_all_dybk_info(code_market_dict)
-        if x:
-            all_block_info["地域板块"] = x
-            success_fetch_dy = True
-
-    success_fetch_zs = False
-    if '指数板块' in categorys:
-        hku_info("获取指数板块信息")
-        x = get_all_zsbk_info(code_market_dict)
-        if x:
-            all_block_info["指数板块"] = x
-            success_fetch_zs = True
+    with ThreadPoolExecutor(4) as executor:
+        if '行业板块' in categorys:
+            t1 = executor.submit(get_all_hybk_info, code_market_dict)
+
+        if '概念板块' in categorys:
+            t2 = executor.submit(get_all_gnbk_info, code_market_dict)
+
+        if '地域板块' in categorys:
+            t3 = executor.submit(get_all_dybk_info, code_market_dict)
+
+        if '指数板块' in categorys:
+            t4 = executor.submit(get_all_zsbk_info, code_market_dict)
+
+        success_fetch_hy = False
+        if '行业板块' in categorys:
+            x = t1.result()
+            hku_info("获取行业板块信息完毕")
+            if x:
+                all_block_info["行业板块"] = x
+                success_fetch_hy = True
+
+        success_fetch_gn = False
+        if '概念板块' in categorys:
+            x = t2.result()
+            hku_info("获取概念板块信息完毕")
+            if x:
+                all_block_info["概念板块"] = x
+                success_fetch_gn = True
+
+        success_fetch_dy = False
+        if '地域板块' in categorys:
+            x = t3.result()
+            hku_info("获取地域板块信息完毕")
+            if x:
+                all_block_info["地域板块"] = x
+                success_fetch_dy = True
+
+        success_fetch_zs = False
+        if '指数板块' in categorys:
+            x = t4.result()
+            hku_info("获取指数板块信息完毕")
+            if x:
+                all_block_info["指数板块"] = x
+                success_fetch_zs = True
 
     blks = []
     if success_fetch_hy:

hikyuu/data/em_block_to_sqlite.py

@@ -4,45 +4,60 @@
 # Create on: 20240102
 #    Author: fasiondog
 
+from concurrent.futures import ThreadPoolExecutor
 from hikyuu.data.common import MARKET, get_stk_code_name_list
 from hikyuu.util import *
 from hikyuu.fetcher.stock.zh_block_em import *
 
 
+@spend_time
 def em_import_block_to_sqlite(connect, code_market_dict, categorys=('行业板块', '概念板块', '地域板块', '指数板块')):
     all_block_info = {}
 
-    success_fetch_hy = False
-    if '行业板块' in categorys:
-        hku_info("获取行业板块信息")
-        x = get_all_hybk_info(code_market_dict)
-        if x:
-            all_block_info["行业板块"] = x
-            success_fetch_hy = True
-
-    success_fetch_gn = False
-    if '概念板块' in categorys:
-        hku_info("获取概念板块信息")
-        x = get_all_gnbk_info(code_market_dict)
-        if x:
-            all_block_info["概念板块"] = x
-            success_fetch_gn = True
-
-    success_fetch_dy = False
-    if '地域板块' in categorys:
-        hku_info("获取地域板块信息")
-        x = get_all_dybk_info(code_market_dict)
-        if x:
-            all_block_info["地域板块"] = x
-            success_fetch_dy = True
-
-    success_fetch_zs = False
-    if '指数板块' in categorys:
-        hku_info("获取指数板块信息")
-        x = get_all_zsbk_info(code_market_dict)
-        if x:
-            all_block_info["指数板块"] = x
-            success_fetch_zs = True
+    with ThreadPoolExecutor(4) as executor:
+        if '行业板块' in categorys:
+            t1 = executor.submit(get_all_hybk_info, code_market_dict)
+
+        if '概念板块' in categorys:
+            t2 = executor.submit(get_all_gnbk_info, code_market_dict)
+
+        if '地域板块' in categorys:
+            t3 = executor.submit(get_all_dybk_info, code_market_dict)
+
+        if '指数板块' in categorys:
+            t4 = executor.submit(get_all_zsbk_info, code_market_dict)
+
+        success_fetch_hy = False
+        if '行业板块' in categorys:
+            x = t1.result()
+            hku_info("获取行业板块信息完毕")
+            if x:
+                all_block_info["行业板块"] = x
+                success_fetch_hy = True
+
+        success_fetch_gn = False
+        if '概念板块' in categorys:
+            x = t2.result()
+            hku_info("获取概念板块信息完毕")
+            if x:
+                all_block_info["概念板块"] = x
+                success_fetch_gn = True
+
+        success_fetch_dy = False
+        if '地域板块' in categorys:
+            x = t3.result()
+            hku_info("获取地域板块信息完毕")
+            if x:
+                all_block_info["地域板块"] = x
+                success_fetch_dy = True
+
+        success_fetch_zs = False
+        if '指数板块' in categorys:
+            x = t4.result()
+            hku_info("获取指数板块信息完毕")
+            if x:
+                all_block_info["指数板块"] = x
+                success_fetch_zs = True
 
     blks = []
     if success_fetch_hy:
@@ -85,8 +100,8 @@ if __name__ == "__main__":
     import sqlite3
     from hikyuu.data.common_sqlite3 import create_database
 
-    dest_dir = "/home/fasiondog/stock"
-    # dest_dir = "d:\\stock"
+    # dest_dir = "/home/fasiondog/stock"
+    dest_dir = "d:\\stock"
 
     connect = sqlite3.connect(dest_dir + "/stock.db")
     create_database(connect)

hikyuu/data/mysql_upgrade/0020.sql

@@ -0,0 +1,4 @@
+UPDATE `hku_base`.`market` SET `closeTime1`=1135, `closeTime2`=1505 WHERE `marketid`=1;
+UPDATE `hku_base`.`market` SET `closeTime1`=1135, `closeTime2`=1505 WHERE `marketid`=2;
+UPDATE `hku_base`.`market` SET `closeTime1`=1135, `closeTime2`=1505 WHERE `marketid`=3;
+UPDATE `hku_base`.`version` set `version` = 20;

hikyuu/data/mysql_upgrade/0021.sql

@@ -0,0 +1,4 @@
+UPDATE `hku_base`.`market` SET `closeTime1`=1130, `closeTime2`=1500 WHERE `marketid`=1;
+UPDATE `hku_base`.`market` SET `closeTime1`=1130, `closeTime2`=1500 WHERE `marketid`=2;
+UPDATE `hku_base`.`market` SET `closeTime1`=1130, `closeTime2`=1500 WHERE `marketid`=3;
+UPDATE `hku_base`.`version` set `version` = 21;

hikyuu/data/mysql_upgrade/0022.sql

@@ -0,0 +1,5 @@
+DELETE FROM `hku_base`.`stkweight`;
+UPDATE `hku_base`.`coderuletype` SET `codepre`=51 WHERE `codepre`=510 AND `marketid`=1;
+UPDATE `hku_base`.`coderuletype` SET `codepre`=50 WHERE `codepre`=500 AND `marketid`=1;
+UPDATE `hku_base`.`coderuletype` SET `codepre`=20 WHERE `codepre`=200 AND `marketid`=2;
+UPDATE `hku_base`.`version` set `version` = 22;

hikyuu/data/pytdx_to_h5.py

@@ -101,27 +101,33 @@ def import_stock_name(connect, api, market, quotations=None):
     """
     cur = connect.cursor()
 
-    newStockDict = {}
-    stk_list = get_stk_code_name_list(market)
-    if not stk_list:
-        hku_error("获取 {} 股票代码表失败", market)
-        return 0
-
-    if not quotations or 'fund' in [v.lower() for v in quotations]:
-        stk_list.extend(get_fund_code_name_list(market))
-    for stock in stk_list:
-        newStockDict[str(stock['code'])] = stock['name']
+    deSet = set()  # 记录退市证券
     if market == MARKET.SH:
         df = ak.stock_info_sh_delist()
         l = df[['公司代码', '公司简称']].to_dict(orient='records') if not df .empty else []
         for stock in l:
-            newStockDict[str(stock['公司代码'])] = stock['公司简称']
+            code = str(stock['公司代码'])
+            deSet.add(code)
     elif market == MARKET.SZ:
         for t in ['暂停上市公司', '终止上市公司']:
             df = ak.stock_info_sz_delist(t)
             l = df[['证券代码', '证券简称']].to_dict(orient='records') if not df.empty else []
             for stock in l:
-                newStockDict[str(stock['证券代码'])] = stock['证券简称']
+                code = str(stock['证券代码'])
+                deSet.add(code)
+
+    newStockDict = {}
+    stk_list = get_stk_code_name_list(market)
+    if not stk_list:
+        hku_error("获取 {} 股票代码表失败", market)
+        return 0
+
+    if not quotations or 'fund' in [v.lower() for v in quotations]:
+        stk_list.extend(get_fund_code_name_list(market))
+    for stock in stk_list:
+        code = str(stock['code'])
+        if code not in deSet:
+            newStockDict[code] = stock['name']
 
     marketid = get_marketid(connect, market)
 
@@ -138,8 +144,8 @@ def import_stock_name(connect, api, market, quotations=None):
         oldstockid, oldcode, oldname, oldvalid = oldstock[0], oldstock[1], oldstock[2], int(oldstock[3])
         oldStockDict[oldcode] = oldstockid
 
-        # 新的代码表中无此股票，则置为无效
-        if (oldvalid == 1) and (oldcode not in newStockDict):
+        # 新的代码表中无此股票或者已退市，则置为无效
+        if (oldvalid == 1) and ((oldcode not in newStockDict) or (oldcode in deSet)):
             cur.execute("update stock set valid=0 where stockid=%i" % oldstockid)
 
         # 股票名称发生变化，更新股票名称;如果原无效，则置为有效
@@ -287,7 +293,7 @@ def import_one_stock_data(connect, api, h5file, market, ktype, stock_record, sta
             if today_datetime >= bar_datetime > last_datetime \
                     and bar['high'] >= bar['open'] >= bar['low'] > 0 \
                     and bar['high'] >= bar['close'] >= bar['low'] > 0 \
-                    and int(bar['vol']) != 0 and int(bar['amount']*0.001) != 0:
+                    and int(bar['vol']) >= 0 and int(bar['amount']*0.001) >= 0:
                 try:
                     row['datetime'] = bar_datetime
                     row['openPrice'] = bar['open'] * 1000

hikyuu/data/pytdx_to_mysql.py

@@ -122,6 +122,21 @@ def import_stock_name(connect, api, market, quotations=None):
     """
     cur = connect.cursor()
 
+    deSet = set()  # 记录退市证券
+    if market == MARKET.SH:
+        df = ak.stock_info_sh_delist()
+        l = df[['公司代码', '公司简称']].to_dict(orient='records') if not df .empty else []
+        for stock in l:
+            code = str(stock['公司代码'])
+            deSet.add(code)
+    elif market == MARKET.SZ:
+        for t in ['暂停上市公司', '终止上市公司']:
+            df = ak.stock_info_sz_delist(t)
+            l = df[['证券代码', '证券简称']].to_dict(orient='records') if not df.empty else []
+            for stock in l:
+                code = str(stock['证券代码'])
+                deSet.add(code)
+
     newStockDict = {}
     stk_list = get_stk_code_name_list(market)
     if not stk_list:
@@ -131,7 +146,9 @@ def import_stock_name(connect, api, market, quotations=None):
     if not quotations or "fund" in [v.lower() for v in quotations]:
         stk_list.extend(get_fund_code_name_list(market))
     for stock in stk_list:
-        newStockDict[str(stock["code"])] = stock["name"]
+        code = str(stock["code"])
+        if code not in deSet:
+            newStockDict[code] = stock["name"]
 
     marketid = get_marketid(connect, market)
 
@@ -156,7 +173,8 @@ def import_stock_name(connect, api, market, quotations=None):
         oldStockDict[oldcode] = oldstockid
 
         # 新的代码表中无此股票，则置为无效
-        if (oldvalid == 1) and (oldcode not in newStockDict):
+        # if (oldvalid == 1) and (oldcode not in newStockDict):
+        if (oldvalid == 1) and ((oldcode not in newStockDict) or oldcode in deSet):
             cur.execute(
                 "update `hku_base`.`stock` set valid=0 where stockid=%i" % oldstockid
             )

hikyuu/data/pytdx_weight_to_mysql.py

@@ -38,7 +38,7 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
     pytdx_market = to_pytdx_market(market)
 
     total_count = 0
-    cur.execute("select stockid, code from `hku_base`.`stock` where marketid=%s" % (marketid))
+    cur.execute("select stockid, code from `hku_base`.`stock` where marketid=%s and valid=1" % (marketid))
     stockid_list = [x for x in cur.fetchall()]
     cur.close()
 

hikyuu/data/pytdx_weight_to_sqlite.py

@@ -35,7 +35,7 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
     pytdx_market = to_pytdx_market(market)
 
     total_count = 0
-    stockid_list = cur.execute("select stockid, code from Stock where marketid=%s" % (marketid))
+    stockid_list = cur.execute("select stockid, code from Stock where marketid=%s and valid=1" % (marketid))
     stockid_list = [x for x in stockid_list]
     cur.close()
 

hikyuu/data/sqlite_upgrade/0021.sql

@@ -0,0 +1,6 @@
+BEGIN TRANSACTION;
+UPDATE `market` SET `closeTime1`=1135, `closeTime2`=1505 WHERE `marketid`=1;
+UPDATE `market` SET `closeTime1`=1135, `closeTime2`=1505 WHERE `marketid`=2;
+UPDATE `market` SET `closeTime1`=1135, `closeTime2`=1505 WHERE `marketid`=3;
+UPDATE `version` set `version` = 21;
+COMMIT;

hikyuu/data/sqlite_upgrade/0022.sql

@@ -0,0 +1,6 @@
+BEGIN TRANSACTION;
+UPDATE `market` SET `closeTime1`=1130, `closeTime2`=1500 WHERE `marketid`=1;
+UPDATE `market` SET `closeTime1`=1130, `closeTime2`=1500 WHERE `marketid`=2;
+UPDATE `market` SET `closeTime1`=1130, `closeTime2`=1500 WHERE `marketid`=3;
+UPDATE `version` set `version` = 22;
+COMMIT;

hikyuu/data/sqlite_upgrade/0023.sql

@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+DELETE FROM `stkWeight`;
+UPDATE `coderuletype` SET `codepre`=51 WHERE `codepre`=510 AND `marketid`=1;
+UPDATE `coderuletype` SET `codepre`=50 WHERE `codepre`=500 AND `marketid`=1;
+UPDATE `coderuletype` SET `codepre`=20 WHERE `codepre`=200 AND `marketid`=2;
+UPDATE `version` set `version` = 23;
+COMMIT;

hikyuu/fetcher/stock/zh_stock_a_pytdx.py

@@ -6,9 +6,10 @@
 #     Author: fasiondog
 
 import datetime
+from concurrent import futures
 from pytdx.hq import TdxHq_API
 from hikyuu.data.common_pytdx import search_best_tdx
-
+from hikyuu import get_stock, constant
 from hikyuu.util import *
 
 
@@ -16,6 +17,12 @@ from hikyuu.util import *
 def parse_one_result(quotes):
     result = {}
     hku_check_ignore(quotes, "Invalid input param!")
+    try:
+        result['datetime'] = datetime.datetime.combine(
+            datetime.date.today(), datetime.time.fromisoformat(quotes['servertime'])
+        )
+    except:
+        return None
 
     result['market'] = 'SH' if quotes['market'] == 1 else 'SZ'
     result['code'] = quotes['code']
@@ -27,8 +34,13 @@ def parse_one_result(quotes):
     result['low'] = quotes['low']  # 今日最低价
     result['bid'] = float(quotes['bid1'])  # 竞买价，即“买一”报价
     result['ask'] = float(quotes['ask1'])  # 竞卖价，即“卖一”报价
-    result['volume'] = float(quotes['vol'])  # 成交的股票手数
-    result['amount'] = round(quotes['amount'] / 1000.0, 2)  # 成交金额，单位为“元”，若要以“万元”为成交金额的单位，需要把该值除以一万
+    # 指数 volumn 需要乘以 0.01
+    stk = get_stock(f"{result['market']}{result['code']}")
+    if not stk.is_null() and stk.type == constant.STOCKTYPE_INDEX:
+        result['volume'] = float(quotes['vol']) * 0.01
+    else:
+        result['volume'] = float(quotes['vol'])  # 成交的股票手数
+    result['amount'] = round(quotes['amount'] * 0.0001, 2)  # 成交金额，单位为“元”，若要以“万元”为成交金额的单位，需要把该值除以一万
     result['bid1_amount'] = float(quotes['bid_vol1'])  # “买一”申请4695股，即47手
     result['bid1'] = float(quotes['bid1'])  # “买一”报价
     result['bid2_amount'] = float(quotes['bid_vol2'])
@@ -49,13 +61,10 @@ def parse_one_result(quotes):
     result['ask4'] = float(quotes['ask4'])
     result['ask5_amount'] = float(quotes['ask_vol5'])
     result['ask5'] = float(quotes['ask5'])
-    result['datetime'] = datetime.datetime.combine(
-        datetime.date.today(), datetime.time.fromisoformat(quotes['servertime'])
-    )
     return result
 
 
-@hku_catch(ret=[])
+@ hku_catch(ret=[], trace=True)
 def request_data(api, stklist, parse_one_result):
     """请求失败将抛出异常"""
     quotes_list = api.get_security_quotes(stklist)
@@ -63,7 +72,8 @@ def request_data(api, stklist, parse_one_result):
     return [r for r in result if r is not None]
 
 
-def get_spot(stocklist, ip, port, batch_func=None):
+@hku_catch(ret=([], []))
+def inner_get_spot(stocklist, ip, port, batch_func=None):
     api = TdxHq_API()
     hku_check(api.connect(ip, port), 'Failed connect tdx ({}:{})!'.format(ip, port))
 
@@ -71,6 +81,7 @@ def get_spot(stocklist, ip, port, batch_func=None):
     tmplist = []
     result = []
     max_size = 80
+    err_list = []
     for stk in stocklist:
         tmplist.append((1 if stk.market == 'SH' else 0, stk.code))
         count += 1
@@ -80,6 +91,8 @@ def get_spot(stocklist, ip, port, batch_func=None):
                 result.extend(phase_result)
                 if batch_func:
                     batch_func(phase_result)
+            else:
+                err_list.extend(tmplist)
             count = 0
             tmplist = []
     if tmplist:
@@ -88,4 +101,39 @@ def get_spot(stocklist, ip, port, batch_func=None):
             result.extend(phase_result)
             if batch_func:
                 batch_func(phase_result)
-    return result
+        else:
+            err_list.extend(tmplist)
+    return result, err_list
+
+
+@spend_time
+def get_spot(stocklist, ip, port, batch_func=None):
+    hosts = search_best_tdx()
+    hosts_cnt = len(hosts)
+    num = len(stocklist) // hosts_cnt
+    batchslist = []
+    for i in range(hosts_cnt):
+        batchslist.append([[stk for stk in stocklist[i*num: (i+1)*num]], hosts[i][2], hosts[i][3], batch_func])
+    if len(stocklist) % hosts_cnt != 0:
+        pos = num * hosts_cnt
+        for i in range(hosts_cnt):
+            batchslist[i][0].append(stocklist[pos])
+            pos += 1
+            if pos >= len(stocklist):
+                break
+
+    def do_inner(param):
+        ret = inner_get_spot(param[0], param[1], param[2], param[3])
+        return ret
+
+    with futures.ThreadPoolExecutor() as executor:
+        res = executor.map(do_inner, batchslist, timeout=10)
+
+    result = []
+    errors = []
+    for batch_result in res:
+        if batch_result[0]:
+            result.extend(batch_result[0])
+        if batch_result[1]:
+            errors.extend(batch_result[1])
+    return result, errors

hikyuu/fetcher/stock/zh_stock_a_qmt.py

@@ -30,7 +30,7 @@ try:
         result['high'] = data['high']
         result['low'] = data['low']
         result['close'] = data['lastPrice']
-        result['amount'] = data['amount'] * 0.001  # 转千元
+        result['amount'] = data['amount'] * 0.0001  # 转千元
         result['volume'] = data['pvolume'] * 0.01  # 转手数
 
         for i in range(5):
@@ -40,7 +40,7 @@ try:
             result[f'ask{i+1}_amount'] = data['askVol'][i]
         return result
 
-    def get_spot(stocklist, unused1, unused2, batch_func=None):
+    def get_spot(stocklist, unused1=None, unused2=None, batch_func=None):
         code_list = [f'{s.code}.{s.market}' for s in stocklist]
         full_tick = xtdata.get_full_tick(code_list)
         records = [parse_one_result_qmt(code, data) for code, data in full_tick.items()]
@@ -53,6 +53,6 @@ except:
         hku_error("Not fount xtquant")
         return dict()
 
-    def get_spot(stocklist, unused1, unused2, batch_func=None):
+    def get_spot(stocklist, unused1=None, unused2=None, batch_func=None):
         hku_error("Not fount xtquant")
         return list()

hikyuu/fetcher/stock/zh_stock_a_sina_qq.py

@@ -61,11 +61,18 @@ def parse_one_result_sina(resultstr):
 def parse_one_result_qq(resultstr):
     result = {}
     hku_check_ignore(resultstr, "Invalid input param!")
-    hku_check_ignore(len(resultstr) > 3 and resultstr[:2] == 'v_', "Invalid input param! {}", resultstr)
+    # hku_check_ignore(len(resultstr) > 3 and resultstr[:2] == 'v_', "Invalid input param! {}", resultstr)
+    if (len(resultstr) <= 3 or resultstr[:2] != 'v_'):
+        return None
 
     a = resultstr.split('~')
-    result['market'] = a[0][2:4]
-    result['code'] = a[0][4:10]
+    if len(a) <= 1:
+        return None
+    market = a[0][2:4].upper()
+    code = a[0][4:10]
+    result['market'] = market
+    result['code'] = code
+
     result['name'] = a[1]
     result['close'] = float(a[3])  # 当前价格
     result['yesterday_close'] = float(a[4])  # 昨日收盘价
@@ -103,8 +110,11 @@ def parse_one_result_qq(resultstr):
     result['high'] = float(a[33])  # 最高价
     result['low'] = float(a[34])  # 最低价
     # 35: 价格/成交量（手）/成交额
-    result['volume'] = float(a[36])  # 成交量（手）
-    result['amount'] = float(a[37]) * 10.0  # 成交额（万）
+    if (market == 'SZ' and code[:2] == '39') or (market == 'SH' and code[:3] == '000'):
+        result['volume'] = float(a[36]) * 0.01  # 成交量（手）
+    else:
+        result['volume'] = float(a[36])  # 成交量（手）
+    result['amount'] = float(a[37])   # 成交额（万）
     result['turnover_rate'] = float(a[38]) if a[38] else 0.0  # 换手率
     result['pe'] = float(a[39]) if a[39] else 0.0  # 市盈率 Price Earnings Ratio，简称P/E或PER
     result['amplitude'] = float(a[43]) if a[43] else 0.0  # 振幅

hikyuu/gui/HikyuuTDX.py

@@ -631,6 +631,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
                 self.escape_time_thread = None
                 self.start_import_pushButton.setEnabled(True)
                 self.import_detail_textEdit.append("导入完毕！")
+                self.hdf5_weight_label.setText("导入完毕!")
                 if can_upgrade():
                     self.import_detail_textEdit.append("========================================================")
                     self.import_detail_textEdit.append(
@@ -661,7 +662,6 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
                     self.import_detail_textEdit.append('导入 {} 分时记录数：{}'.format(msg[3], msg[5]))
 
             elif msg_task_name == 'IMPORT_WEIGHT':
-                self.hdf5_weight_label.setText(msg[2])
                 if msg[2] == '导入权息数据完毕!':
                     self.import_detail_textEdit.append('导入权息记录数：{}'.format(msg[3]))
                 elif msg[2] == '导入通达信财务信息完毕!':

hikyuu/gui/data/ImportWeightToSqliteTask.py

@@ -42,7 +42,7 @@ from hikyuu.util.check import hku_catch, hku_check
 
 
 class ImportWeightToSqliteTask:
-    def __init__(self, log_queue, queue, config, dest_dir):
+    def __init__(self, log_queue, queue, config, dest_dir, market, cmd, host, port):
         self.logger = logging.getLogger(self.__class__.__name__)
         self.log_queue = log_queue
         self.queue = queue
@@ -50,6 +50,10 @@ class ImportWeightToSqliteTask:
         self.dest_dir = dest_dir
         self.msg_name = 'IMPORT_WEIGHT'
         self.status = "no run"
+        self.market = market
+        self.cmd = cmd  # "weight" | "finance"
+        self.host = host
+        self.port = port
 
     @hku_catch(trace=True)
     def __call__(self):
@@ -76,44 +80,31 @@ class ImportWeightToSqliteTask:
                 self.logger.debug('use mysql import weight')
 
         except Exception as e:
-            #self.queue.put([self.msg_name, str(e), -1, 0, total_count])
+            # self.queue.put([self.msg_name, str(e), -1, 0, total_count])
             self.queue.put([self.msg_name, 'INFO', str(e), 0, 0])
             self.queue.put([self.msg_name, '', 0, None, total_count])
             self.status = "failure"
             return
 
         try:
-            hosts = search_best_tdx()
             api = TdxHq_API()
-            hku_check(api.connect(hosts[0][2], hosts[0][3]), "failed connect pytdx {}:{}!", hosts[0][2], hosts[0][3])
-
-            self.logger.info('正在导入权息数据')
-            self.queue.put([self.msg_name, '正在导入权息数据...', 0, 0, 0])
-
-            total_count = 0
-            for market in g_market_list:
-                count = pytdx_import_weight(api, connect, market)
-                self.logger.info("导入 {} 权息记录数: {}".format(market, count))
-                total_count += count
-
-            self.queue.put([self.msg_name, '导入权息数据完毕!', 0, 0, total_count])
-            self.logger.info('导入权息数据完毕')
-
-            self.queue.put([self.msg_name, '下载通达信财务信息(上证)...', 0, 0, 0])
-            x = pytdx_import_finance(connect, api, "SH")
-
-            self.queue.put([self.msg_name, '下载通达信财务信息(深证)...', 0, 0, 0])
-            x += pytdx_import_finance(connect, api, "SZ")
-
-            self.queue.put([self.msg_name, '下载通达信财务信息(北证)...', 0, 0, 0])
-            x += pytdx_import_finance(connect, api, "BJ")
-            self.queue.put([self.msg_name, '导入通达信财务信息完毕!', 0, 0, x])
+            hku_check(api.connect(self.host, self.port), "failed connect pytdx {}:{}!", self.host, self.port)
+
+            if self.cmd == 'weight':
+                count = pytdx_import_weight(api, connect, self.market)
+                self.logger.info("导入 {} 权息记录数: {}".format(self.market, count))
+                self.queue.put([self.msg_name, '导入权息数据完毕!', 0, 0, f'{self.market} {total_count}'])
+            elif self.cmd == 'finance':
+                self.queue.put([self.msg_name, f'下载通达信当前财务信息({self.market})...', 0, 0, 0])
+                x = pytdx_import_finance(connect, api, self.market)
+                self.logger.info(f'导入 {self.market} 通达信当前财务信息数: {x}')
+                self.queue.put([self.msg_name, '导入通达信财务信息完毕!', 0, 0, f'{self.market} {x}'])
 
             api.disconnect()
 
         except Exception as e:
             self.logger.error(e)
-            #self.queue.put([self.msg_name, str(e), -1, 0, total_count])
+            # self.queue.put([self.msg_name, str(e), -1, 0, total_count])
             self.queue.put([self.msg_name, 'INFO', str(e), 0, 0])
         finally:
             connect.commit()