From bd50e17c5821a00b0466e1475e451cc07cab0623 Mon Sep 17 00:00:00 2001
From: HibiKier <45528451+HibiKier@users.noreply.github.com>
Date: Fri, 4 Oct 2024 00:14:36 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E7=BB=9F=E8=AE=A1=E5=BC=82=E5=B8=B8=20(#1674)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistics/statistics_hook.py             | 36 ++++++++++++++-----
 zhenxun/models/statistics.py                  |  2 +-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/zhenxun/builtin_plugins/statistics/statistics_hook.py b/zhenxun/builtin_plugins/statistics/statistics_hook.py
index 7b352bcb..9842ad09 100644
--- a/zhenxun/builtin_plugins/statistics/statistics_hook.py
+++ b/zhenxun/builtin_plugins/statistics/statistics_hook.py
@@ -5,6 +5,7 @@ from nonebot.adapters import Bot, Event
 from nonebot.plugin import PluginMetadata
 from nonebot.message import run_postprocessor
 from nonebot_plugin_session import EventSession
+from nonebot_plugin_apscheduler import scheduler
 from nonebot.adapters.onebot.v11 import PokeNotifyEvent
 
 from zhenxun.services.log import logger
@@ -22,6 +23,8 @@ __plugin_meta__ = PluginMetadata(
     ).dict(),
 )
 
+TEMP_LIST = []
+
 
 @run_postprocessor
 async def _(
@@ -34,15 +37,32 @@ async def _(
     if matcher.type == "notice" and not isinstance(event, PokeNotifyEvent):
         """过滤除poke外的notice"""
         return
-    if session.id1:
-        plugin = await PluginInfo.get_or_none(module=matcher.module_name)
+    if session.id1 and matcher.plugin:
+        plugin = await PluginInfo.get_plugin(module_path=matcher.plugin.module_name)
         plugin_type = plugin.plugin_type if plugin else None
         if plugin_type == PluginType.NORMAL:
             logger.debug(f"提交调用记录: {matcher.plugin_name}...", session=session)
-            await Statistics.create(
-                user_id=session.id1,
-                group_id=session.id3 or session.id2,
-                plugin_name=matcher.plugin_name,
-                create_time=datetime.now(),
-                bot_id=bot.self_id,
+            TEMP_LIST.append(
+                Statistics(
+                    user_id=session.id1,
+                    group_id=session.id3 or session.id2,
+                    plugin_name=matcher.plugin_name,
+                    create_time=datetime.now(),
+                    bot_id=bot.self_id,
+                )
             )
+
+
+@scheduler.scheduled_job(
+    "interval",
+    minutes=1,
+)
+async def _():
+    try:
+        call_list = TEMP_LIST.copy()
+        TEMP_LIST.clear()
+        if call_list:
+            await Statistics.bulk_create(call_list)
+        logger.debug(f"批量添加调用记录 {len(call_list)} 条", "定时任务")
+    except Exception as e:
+        logger.error("定时批量添加调用记录", "定时任务", e=e)
diff --git a/zhenxun/models/statistics.py b/zhenxun/models/statistics.py
index 100e01e9..ad29cb17 100644
--- a/zhenxun/models/statistics.py
+++ b/zhenxun/models/statistics.py
@@ -28,5 +28,5 @@ class Statistics(Model):
             # 将user_qq改为user_id
             "ALTER TABLE statistics ALTER COLUMN user_id TYPE character varying(255);",
             "ALTER TABLE statistics ALTER COLUMN group_id TYPE character varying(255);",
-            "ALTER TABLE statistics ADD boe_id Text DEFAULT '';",
+            "ALTER TABLE statistics ADD bot_id Text DEFAULT '';",
         ]