From f3262b168fc9d4354c79437b5ab6aec43952bcaa Mon Sep 17 00:00:00 2001 From: liuwei Date: Fri, 7 Mar 2025 09:20:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E7=BB=93=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- message_storage/message_to_db.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/message_storage/message_to_db.py b/message_storage/message_to_db.py index e8238cc..5444f0c 100644 --- a/message_storage/message_to_db.py +++ b/message_storage/message_to_db.py @@ -74,13 +74,11 @@ class MessageStorage: time_diff = current_time - last_summary_time_obj if time_diff < timedelta(hours=3): - # 如果小于 3 小时，取当天的内容 - last_summary_time = current_time.replace(hour=0, minute=0, second=0, microsecond=0).strftime( - '%Y-%m-%d %H:%M:%S') + # 小于 3 小时，取 3 小时前 + last_summary_time = (current_time - timedelta(hours=3)).strftime('%Y-%m-%d %H:%M:%S') elif time_diff > timedelta(days=1): - # 如果超过 24 小时，将时间设置为当天 0 点 - last_summary_time = current_time.replace(hour=0, minute=0, second=0, microsecond=0).strftime( - '%Y-%m-%d %H:%M:%S') + # 大于 24 小时，取 6 小时前 + last_summary_time = (current_time - timedelta(hours=6)).strftime('%Y-%m-%d %H:%M:%S') # 更新 Redis 存储的当前时间 self._get_redis_connection().set(key, current_date) @@ -90,7 +88,8 @@ class MessageStorage: query = """ SELECT timestamp, sender, content,message_type FROM messages - WHERE timestamp >= %s AND message_type in(1,49) AND group_id = %s + WHERE timestamp >= %s AND message_type in(1,49) AND group_id = %s + AND length(content)>6 """ cursor.execute(query, (last_summary_time, group_id))