update code

This commit is contained in:
lychang
2025-11-14 17:08:33 +08:00
parent 7458fe688f
commit 37c6ae9457
2 changed files with 9 additions and 9 deletions

18
app.py
View File

@@ -138,7 +138,7 @@ class ReportService:
"""获取按小时统计的消息量""" """获取按小时统计的消息量"""
return self.execute_query(''' return self.execute_query('''
SELECT strftime('%H', SELECT strftime('%H',
datetime(substr(time, 0, 11), 'unixepoch', 'localtime')) as hour, datetime(substr(time, 0, 11), 'unixepoch', ,'+8 hours')) as hour,
COUNT(*) as count COUNT(*) as count
FROM message FROM message
WHERE time >= ? WHERE time >= ?
@@ -187,7 +187,7 @@ class ReportService:
placeholders = ','.join(['?'] * len(message_ids)) placeholders = ','.join(['?'] * len(message_ids))
query = f""" query = f"""
SELECT m.id, m.content, m.type, m.sender, m.receiver,u.name as sender_name, SELECT m.id, m.content, m.type, m.sender, m.receiver,u.name as sender_name,
datetime(substr(time,0,11), 'unixepoch','localtime') as formatted_time datetime(substr(time,0,11), 'unixepoch',,'+8 hours') as formatted_time
FROM message m FROM message m
left join user u on m.sender = u.id left join user u on m.sender = u.id
WHERE m.id IN ({placeholders}) WHERE m.id IN ({placeholders})
@@ -202,7 +202,7 @@ class ReportService:
SELECT m.*, SELECT m.*,
u.name as sender_name, u.name as sender_name,
g.name as group_name, g.name as group_name,
datetime(substr(time, 0, 11), 'unixepoch', 'localtime') as formatted_time datetime(substr(time, 0, 11), 'unixepoch', ,'+8 hours') as formatted_time
FROM message m FROM message m
LEFT JOIN user u ON m.sender = u.id LEFT JOIN user u ON m.sender = u.id
LEFT JOIN "group" g ON m.receiver = g.id LEFT JOIN "group" g ON m.receiver = g.id
@@ -234,7 +234,7 @@ class ReportService:
query = ''' query = '''
SELECT m.*, SELECT m.*,
u.name as sender_name, u.name as sender_name,
datetime(substr(m.time, 0, 11), 'unixepoch', 'localtime') as formatted_time datetime(substr(m.time, 0, 11), 'unixepoch', '+8 hours') as formatted_time
FROM message m FROM message m
LEFT JOIN user u ON m.sender = u.id LEFT JOIN user u ON m.sender = u.id
WHERE m.toType = 1 WHERE m.toType = 1
@@ -247,7 +247,7 @@ class ReportService:
query = ''' query = '''
SELECT m.*, SELECT m.*,
u.name as sender_name, u.name as sender_name,
datetime(substr(m.time, 0, 11), 'unixepoch', 'localtime') as formatted_time datetime(substr(m.time, 0, 11), 'unixepoch', '+8 hours') as formatted_time
FROM message m FROM message m
LEFT JOIN user u ON m.sender = u.id LEFT JOIN user u ON m.sender = u.id
WHERE m.receiver = ? WHERE m.receiver = ?
@@ -267,7 +267,7 @@ class ReportService:
AND type NOT IN ('disagree', 'agree', 'weapp', 'link') AND type NOT IN ('disagree', 'agree', 'weapp', 'link')
''', (group_id,), fetch_all=False)['count'] ''', (group_id,), fetch_all=False)['count']
lastest_time = self.execute_query(''' lastest_time = self.execute_query('''
SELECT datetime(substr(time, 0, 11), 'unixepoch', 'localtime') as formatted_time SELECT datetime(substr(time, 0, 11), 'unixepoch', ,'+8 hours') as formatted_time
FROM message FROM message
WHERE receiver = ? WHERE receiver = ?
AND type NOT IN ('disagree', 'agree', 'weapp', 'link') AND type NOT IN ('disagree', 'agree', 'weapp', 'link')
@@ -301,7 +301,7 @@ class ReportService:
SELECT m.*, SELECT m.*,
u.name as sender_name, u.name as sender_name,
g.name as group_name, g.name as group_name,
datetime(substr(m.time, 0, 11), 'unixepoch', 'localtime') as formatted_time datetime(substr(m.time, 0, 11), 'unixepoch', ,'+8 hours') as formatted_time
FROM message m FROM message m
LEFT JOIN user u ON m.sender = u.id LEFT JOIN user u ON m.sender = u.id
LEFT JOIN "group" g ON m.receiver = g.id LEFT JOIN "group" g ON m.receiver = g.id
@@ -317,7 +317,7 @@ class ReportService:
SELECT m.*, SELECT m.*,
u.name as sender_name, u.name as sender_name,
g.name as group_name, g.name as group_name,
datetime(substr(m.time, 0, 11), 'unixepoch', 'localtime') as formatted_time datetime(substr(m.time, 0, 11), 'unixepoch', ,'+8 hours') as formatted_time
FROM message m FROM message m
LEFT JOIN user u ON m.sender = u.id LEFT JOIN user u ON m.sender = u.id
LEFT JOIN "group" g ON m.receiver = g.id LEFT JOIN "group" g ON m.receiver = g.id
@@ -989,7 +989,7 @@ def generate_daily_report():
# 获取热点话题 # 获取热点话题
recent_messages = report_service.get_recent_messages_by_time_range(start_timestamp, end_timestamp, 100) recent_messages = report_service.get_recent_messages_by_time_range(start_timestamp, end_timestamp, 100)
hot_topics = report_service.analyze_hot_topics(recent_messages) hot_topics = report_service.analyze_hot_topics(recent_messages)
print(start_timestamp,end_timestamp)
# 生成直方图 # 生成直方图
group_activity_chart = report_service.generate_group_activity_chart(group_activity_data) group_activity_chart = report_service.generate_group_activity_chart(group_activity_data)
hourly_activity_chart = report_service.generate_hourly_activity_chart(start_timestamp, end_timestamp) hourly_activity_chart = report_service.generate_hourly_activity_chart(start_timestamp, end_timestamp)

BIN
db/data

Binary file not shown.