diff --git a/main.py b/main.py index d602c1b..964a37b 100644 --- a/main.py +++ b/main.py @@ -51,8 +51,16 @@ class TelegramQuantStateMachine(QuantStateMachine): next_state, comment = StateRuleBook.evaluate_next_state(self.current_state, f) self.current_state = next_state + conn = sqlite3.connect(DB_FILE) + cursor = conn.cursor() + cursor.execute("SELECT stock_name FROM watchlist WHERE is_active = 1 and stock_code = ?", (self.stock_code,)) + row = cursor.fetchone() + conn.close() + name = row[0] if row else "unknow" + msg = f"๐Ÿ“Š *ใ€้‡ๅŒ–ๅšTๅค็›˜ๆŠฅๅ‘Šใ€‘* \n" msg += f"๐Ÿค– ่‚ก็ฅจไปฃ็ : `{self.stock_code}`\n" + msg += f"๐Ÿค– ่‚ก็ฅจๅ็งฐ: `{name}`\n" msg += f"๐Ÿ•’ ่ฏŠๆ–ญๆ—ถ้—ด: {datetime.now().strftime('%Y-%m-%d %H:%M')}\n" msg += f"๐Ÿ“ˆ ๅ› ๅญ: `%B`={f['percent_b']:.2f} | ๅˆ†ๆ—ถๅ็ฆป={f['min_bias']:.2%} | ๅธฆๅฎฝๅˆ†ไฝ={f['bw_quantile']:.2%}\n" msg += f"๐Ÿ” ็Šถๆ€: *{self.current_state}*\n" diff --git a/util.py b/util.py index d12c520..4192346 100644 --- a/util.py +++ b/util.py @@ -31,7 +31,6 @@ def get_history_k(code, start_date='19700101', end_date=None): stock_code = code + '.' + CN_CODE_TYPE[code[0:2]] elif code[0:3] in CN_CODE_TYPE: stock_code = code + '.' + CN_CODE_TYPE[code[0:3]] - print(stock_code) if stock_code != '': url = "https://api.zhituapi.com/hs/history/%s/d/f?token=6E0E86BC-15AD-4275-8A95-B02D168D63C1&st=%s"%(stock_code, start_date) @@ -42,7 +41,6 @@ def get_history_k(code, start_date='19700101', end_date=None): response = requests.get(url) data = response.json() - print(data) df = pd.DataFrame(data) df['t'] = df['t'].apply(pd.to_datetime)