🎨 修改DAU的计算方式

gsuid_core/buildin_plugins/core_command/core_status/__init__.py

@@ -37,10 +37,11 @@ async def count_group_user():
 
 
 @scheduler.scheduled_job('cron', hour='0', minute='0')
-async def scheduled_save_global_val():
+async def _u_scheduled_save_global_val_all():
     global bot_val
     await save_all_global_val(1)
     gv.bot_val = {}
+    logger.success('[早柚核心] 状态已清空!')
     await count_group_user()
     logger.success('[早柚核心] 状态已保存!')
 

gsuid_core/global_val.py

@@ -138,16 +138,19 @@ async def get_global_analysis(
                 new_user.append(i)
 
     _user_all_list = list(set(user_all_list))
+    _group_sll_list = list(set(group_all_list))
     out_user = list(set(out_user))
+    out_group = list(set(out_group))
 
-    user_num = len(user_data)
+    # user_num = len(user_data)
-    group_num = len(group_data)
+    # group_num = len(group_data)
+
+    day7_user_num = len(user_7_list)
+    day7_group_num = len(group_7_list)
 
     data = {
-        'DAU': '{0:.2f}'.format(sum(user_data) / user_num) if user_num else 0,
+        'DAU': '{0:.2f}'.format(day7_user_num / 7) if day7_user_num else 0,
-        'DAG': (
+        'DAG': ('{0:.2f}'.format(day7_group_num / 7) if day7_group_num else 0),
-            '{0:.2f}'.format(sum(group_data) / group_num) if group_num else 0
-        ),
         'NU': str(len(new_user)),
         'OU': (
             '{0:.2f}%'.format((len(out_user) / len(_user_all_list)) * 100)
@@ -156,8 +159,8 @@ async def get_global_analysis(
         ),
         'NG': str(len(new_group)),
         'OG': (
-            '{0:.2f}%'.format((len(out_group) / len(group_all_list)) * 100)
+            '{0:.2f}%'.format((len(out_group) / len(_group_sll_list)) * 100)
-            if len(group_all_list) != 0
+            if len(_group_sll_list) != 0
             else "0.00%"
         ),
     }