diff --git a/HTS_etf_all.py b/HTS_etf_all.py index 52cfb05..5973d79 100644 --- a/HTS_etf_all.py +++ b/HTS_etf_all.py @@ -33,17 +33,18 @@ if __name__ == "__main__": if stock['stock_code'] not in BUY_LIST: BUY_LIST[stock['stock_code']] = {} - MAX_BUY_PRICE = config['MAX_BUY_PRICE'] + BUY_LIST[stock['stock_code']]['MAX_BUY_PRICE'] = config['MAX_BUY_PRICE'] BUY_LIST[stock['stock_code']]['BUY_LIST_1'] = config['BUY_LIST_1'] BUY_LIST[stock['stock_code']]['BUY_LIST_1']["disparity"] = hts.getDisparityLimit(stock) print("START...") + close_data = {} while datetime.strptime(today + " 060000", '%Y%m%d %H%M%S') < datetime.now() < datetime.strptime(today + " 153100", '%Y%m%d %H%M%S'): if datetime.strptime(today + " 090000", '%Y%m%d %H%M%S') < datetime.now() < datetime.strptime(today + " 151500", '%Y%m%d %H%M%S'): THIS_TIME = datetime.now() for stock in stocks: if datetime.strptime(today + " 090000", '%Y%m%d %H%M%S') < datetime.now() < datetime.strptime(today + " 090100", '%Y%m%d %H%M%S'): - hts.bot.sendMsg("START... {} ({}) SLOW_K: {}".format(stock['stock_code'], stock['stock_name'], MAX_BUY_PRICE)) + hts.bot.sendMsg("START... {} ({}) SLOW_K: {}".format(stock['stock_code'], stock['stock_name'], BUY_LIST[stock['stock_code']]['MAX_BUY_PRICE'])) LAST_DATA = hts.getLastData(stock['stock_code'], today) result_m1 = hts.getRealTime(stock['stock_code'], today, LAST_DATA) @@ -53,14 +54,14 @@ if __name__ == "__main__": data_signal = hts.analyze(result_tic_m30) # data.drop(data.index[:len(data) - analyzed_day], inplace=True) - hts.buyRealTime(stock, data, data_signal, MAX_BUY_PRICE, BUY_LIST[stock['stock_code']]['BUY_LIST_1']) - + hts.buyRealTime(stock, data, data_signal, BUY_LIST[stock['stock_code']]['MAX_BUY_PRICE'], BUY_LIST[stock['stock_code']]['BUY_LIST_1']) + close_data[stock['stock_code']] = data['close'][-1] if (int(THIS_TIME.strftime("%M")) % 50 == 0 or int(THIS_TIME.strftime("%M")) % 20 == 0): vm = psutil.virtual_memory() vm_item = dict() vm_item['free'] = vm.available // (1024 * 1024) vm_item['idle'] = vm.available / vm.total * 100 - hts.bot.sendMsg("Alive... mem: {:.1f}".format(vm_item['idle'])) + hts.bot.sendMsg("Alive... close: {}, mem: {:.1f}".format(str(close_data), vm_item['idle'])) time.sleep(60)