From 5f5633f4b676e690089f5b6a83cbea0d6a646603 Mon Sep 17 00:00:00 2001 From: blade <8019068@qq.com> Date: Tue, 5 Aug 2025 18:30:42 +0800 Subject: [PATCH] fix issue --- .../market_monitor.cpython-312.pyc | Bin 14187 -> 14586 bytes core/biz/market_monitor.py | 4 ++-- market_monitor_main.py | 14 +++++++++----- sql/query/sql_playground.sql | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/core/biz/__pycache__/market_monitor.cpython-312.pyc b/core/biz/__pycache__/market_monitor.cpython-312.pyc index deb0430eea0d21bc85c2f49e22c8237ccdfdde90..c5808e282b10cd0c98721f1447fd3632fe60d12b 100644 GIT binary patch delta 3913 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 Mq2x0I^4#?Q0C7$S)c^nh diff --git a/core/biz/market_monitor.py b/core/biz/market_monitor.py index 106fcd5..608f724 100644 --- a/core/biz/market_monitor.py +++ b/core/biz/market_monitor.py @@ -262,13 +262,13 @@ def create_metrics_report( short_info_list = long_short_info["空"] contents.append(f"#### 多头指标信号") if len(long_info_list) > 0: - contents.append(f"{"\n".join(long_info_list)}") + contents.append(f"{"\n\n".join(long_info_list)}") else: contents.append(f"无多头指标信号") contents.append(f"#### 空头指标信号") if len(short_info_list) > 0: - contents.append(f"{"\n".join(short_info_list)}") + contents.append(f"{"\n\n".join(short_info_list)}") else: contents.append(f"无空头指标信号") diff --git a/market_monitor_main.py b/market_monitor_main.py index 2295aef..e160477 100644 --- a/market_monitor_main.py +++ b/market_monitor_main.py @@ -141,7 +141,7 @@ class MarketMonitorMain: ) return if only_output_rise: - if realtime_row["pct_change"] > 0: + if realtime_row["pct_chg"] > 0: logging.info(f"监控到上涨: {symbol} {bar} 窗口大小: {self.window_size}") else: logging.info( @@ -191,10 +191,14 @@ class MarketMonitorMain: report_data = pd.DataFrame([report_data]) logging.info(f"插入数据到数据库") self.db_market_monitor.insert_data_to_mysql(report_data) + if self.latest_record.get(symbol, None) is None: self.latest_record[symbol] = {bar: {"timestamp": latest_realtime_timestamp}} else: - self.latest_record[symbol][bar]["timestamp"] = latest_realtime_timestamp + if self.latest_record.get(symbol, {}).get(bar, None) is None: + self.latest_record[symbol][bar] = {"timestamp": latest_realtime_timestamp} + else: + self.latest_record[symbol][bar]["timestamp"] = latest_realtime_timestamp with open(self.latest_record_file_path, "w", encoding="utf-8") as f: json.dump(self.latest_record, f, ensure_ascii=False, indent=4) @@ -252,8 +256,8 @@ class MarketMonitorMain: if __name__ == "__main__": market_monitor_main = MarketMonitorMain() market_monitor_main.monitor_realtime_market( - symbol="ETH-USDT", - bar="5m", + symbol="PUMP-USDT", + bar="15m", only_output_huge_volume=True, - only_output_rise=False, + only_output_rise=True, ) diff --git a/sql/query/sql_playground.sql b/sql/query/sql_playground.sql index d07bb41..e9fb023 100644 --- a/sql/query/sql_playground.sql +++ b/sql/query/sql_playground.sql @@ -1,7 +1,7 @@ select * from crypto_market_monitor; -delete from crypto_market_monitor where timestamp=1754382900000; + select date_time, open, high, low, close, k_shape from crypto_market_data -WHERE symbol='XCH-USDT' and bar='5m' and date_time > '2025-08-04 15:00:00' +WHERE symbol='DOGE-USDT' and bar='5m' and date_time > '2025-08-04 15:00:00' order by timestamp ; select * from crypto_market_data