看板内容进行优化,同时加入了用户管理模块,将用户信息全局开放,
This commit is contained in:
@@ -7,6 +7,7 @@ from flask import Flask, render_template, request, jsonify, redirect, url_for, s
|
||||
|
||||
from db.connection import DBConnectionManager
|
||||
from db.stats_db import StatsDBOperator
|
||||
from contact_manager import ContactManager # 导入联系人管理器
|
||||
|
||||
|
||||
class DashboardServer:
|
||||
@@ -23,6 +24,8 @@ class DashboardServer:
|
||||
# 修正:使用单例模式获取数据库连接
|
||||
self.db_manager = DBConnectionManager.get_instance()
|
||||
self.stats_db = StatsDBOperator(self.db_manager)
|
||||
# 获取联系人管理器实例
|
||||
self.contact_manager = ContactManager.get_instance()
|
||||
self.app = self._create_app()
|
||||
self._stop_event = threading.Event()
|
||||
self._server = None # 添加:存储服务器实例
|
||||
@@ -77,6 +80,13 @@ class DashboardServer:
|
||||
days = request.args.get('days', 7, type=int)
|
||||
limit = request.args.get('limit', 10, type=int)
|
||||
stats = self.stats_db.get_user_stats(days, limit)
|
||||
|
||||
# 将用户ID转换为名称
|
||||
for item in stats:
|
||||
if 'user_id' in item:
|
||||
user_id = item['user_id']
|
||||
item['user_name'] = self.contact_manager.get_nickname(user_id)
|
||||
|
||||
return jsonify({"success": True, "data": stats})
|
||||
|
||||
@app.route('/api/group_stats')
|
||||
@@ -84,6 +94,13 @@ class DashboardServer:
|
||||
days = request.args.get('days', 7, type=int)
|
||||
limit = request.args.get('limit', 10, type=int)
|
||||
stats = self.stats_db.get_group_stats(days, limit)
|
||||
|
||||
# 将群ID转换为名称
|
||||
for item in stats:
|
||||
if 'group_id' in item:
|
||||
group_id = item['group_id']
|
||||
item['group_name'] = self.contact_manager.get_nickname(group_id)
|
||||
|
||||
return jsonify({"success": True, "data": stats})
|
||||
|
||||
@app.route('/api/error_logs')
|
||||
@@ -104,6 +121,18 @@ class DashboardServer:
|
||||
try:
|
||||
days = request.args.get('days', 7, type=int)
|
||||
summary = self.stats_db.get_dashboard_summary(days)
|
||||
|
||||
# 转换用户和群组ID为名称
|
||||
if 'top_users' in summary:
|
||||
for user in summary['top_users']:
|
||||
if 'user_id' in user:
|
||||
user['user_name'] = self.contact_manager.get_nickname(user['user_id'])
|
||||
|
||||
if 'top_groups' in summary:
|
||||
for group in summary['top_groups']:
|
||||
if 'group_id' in group:
|
||||
group['group_name'] = self.contact_manager.get_nickname(group['group_id'])
|
||||
|
||||
self.logger.info(f"看板主页统计数据: {summary}")
|
||||
return jsonify({"success": True, "data": summary})
|
||||
except Exception as e:
|
||||
@@ -115,6 +144,15 @@ class DashboardServer:
|
||||
days = request.args.get('days', 7, type=int)
|
||||
plugin_name = request.args.get('plugin_name', '')
|
||||
trend = self.stats_db.get_plugin_trend(plugin_name, days)
|
||||
|
||||
# 如果趋势数据中包含用户或群组ID,也进行转换
|
||||
if isinstance(trend, list):
|
||||
for item in trend:
|
||||
if 'user_id' in item:
|
||||
item['user_name'] = self.contact_manager.get_nickname(item['user_id'])
|
||||
if 'group_id' in item:
|
||||
item['group_name'] = self.contact_manager.get_nickname(item['group_id'])
|
||||
|
||||
self.logger.info(f"看板主页/api/plugin_trend: {trend}")
|
||||
return jsonify({"success": True, "data": trend})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user