qsc20001102/astrbot_plugin_jx3
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
qsc20001102
2026-01-03 15:47:32 +08:00
parent 4bd6fc7c3e
commit af19db7082
3 changed files with 154 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/function_basic.py
+24 -33
View File
@@ -4,7 +4,7 @@ import matplotlib.pyplot as plt
from matplotlib.font_manager import FontProperties from matplotlib.font_manager import FontProperties
from io import BytesIO from io import BytesIO
import base64 import base64
from datetime import datetime from datetime import datetime,date
import calendar import calendar
def load_template(template_name): def load_template(template_name):
@@ -169,37 +169,28 @@ def plot_line_chart_base64(data, x_field, y_field, title=None, reverse_x=False):
return f"data:image/png;base64,{img_base64}" return f"data:image/png;base64,{img_base64}"
def build_calendar_items(start_date_str, data): def week_to_num(week :str):
start_date = datetime.datetime.strptime(start_date_str, "%Y-%m-%d").date() week_map = {
weekday = start_date.weekday() # 周一0 ~ 周日6 "一": 0,
weekday = (weekday + 1) % 7 # 调整：周日=0, 周一=1 ... 周六=6 "二": 1,
"三": 2,
"四": 3,
"五": 4,
"六": 5,
"日": 6,
}
return week_map.get(week,None)
result = [] def compare_date_str(date_str: str) -> str:
row = [] """
date_str 格式：YYYY-MM-DD
"""
d = datetime.strptime(date_str, "%Y-%m-%d").date()
today = date.today()
# 第一行补空 if d < today:
for _ in range(weekday): return "过去"
row.append({"date": "", "items": [], "is_today": False}) elif d == today:
return "今天"
# 排数据 else:
for i, day in enumerate(data): return "将来"
# 识别今天
is_today = (day["date"] == start_date_str)
row.append({
"date": day["day"],
"items": [day],
"is_today": is_today,
})
if len(row) == 7:
result.append(row)
row = []
# 最后一行剩余补空
if row:
while len(row) < 7:
row.append({"date": "", "items": [], "is_today": False})
result.append(row)
return result
core/jx3_service.py
+29 -2
View File
@@ -1,4 +1,6 @@
# pyright: reportArgumentType=false
from datetime import datetime from datetime import datetime
from typing import Dict, Any, Optional, List, Union from typing import Dict, Any, Optional, List, Union
@@ -7,7 +9,7 @@ from astrbot.api import AstrBotConfig
from .request import APIClient from .request import APIClient
from .aiosqlite import AsyncSQLite from .aiosqlite import AsyncSQLite
from .function_basic import load_template,gold_to_string,build_calendar_items from .function_basic import load_template,gold_to_string,week_to_num,compare_date_str
class JX3Service: class JX3Service:
def __init__(self, api_config, config:AstrBotConfig): def __init__(self, api_config, config:AstrBotConfig):
@@ -165,10 +167,34 @@ class JX3Service:
# 3. 处理返回数据 # 3. 处理返回数据
try: try:
return_data["data"]["items"] = build_calendar_items(data["today"]["date"],data["data"]) items = []
num_richang = week_to_num(data["data"][0]["week"])
# 空白数据
for _ in range(num_richang):
items.append({
"en": False,
"compare": "",
"date": "",
"war": "",
"battle": ""
})
# 真实数据
for m in data["data"]:
items.append({
"en": True,
"compare": compare_date_str(m.get("date", "")),
"date": m.get("date", ""),
"war": m.get("war", ""),
"battle": m.get("battle", "")
})
return_data["data"]["items"] = items
return_data["data"]["today"] = data["today"]
except Exception as e: except Exception as e:
logger.error(f"richang 数据处理时出错: {e}") logger.error(f"richang 数据处理时出错: {e}")
return_data["msg"] = "处理接口返回信息时出错" return_data["msg"] = "处理接口返回信息时出错"
# 加载模板 # 加载模板
try: try:
return_data["temp"] = load_template("richangyuche.html") return_data["temp"] = load_template("richangyuche.html")
@@ -176,6 +202,7 @@ class JX3Service:
logger.error(f"加载模板失败: {e}") logger.error(f"加载模板失败: {e}")
return_data["msg"] = "系统错误：模板文件不存在" return_data["msg"] = "系统错误：模板文件不存在"
return_data["code"] = 200 return_data["code"] = 200
return return_data return return_data
templates/richangyuche.html
+84 -65
View File
@@ -2,92 +2,111 @@
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>未来战场日程表</title> <title>日常预测</title>
<style> <style>
body { body {
margin: 0; padding: 20px; font-family: 'Microsoft YaHei', Arial, sans-serif;
background: #f5f7fb; color: #1f2333; background: #f1f2f6;
font-family: "Microsoft YaHei", Arial, sans-serif; margin: 0;
padding: 20px;
} }
.container {
max-width: 1100px;
margin: 0 auto;
}
h1 {
font-size: 32px;
margin-bottom: 25px;
color: #222;
font-weight: 800;
text-align: center;
}
/* ====== 日历网格 ====== */
.calendar { .calendar {
width: 100%; display: grid;
border-collapse: collapse; grid-template-columns: repeat(7, 1fr);
table-layout: fixed; gap: 14px;
} }
.calendar th {
background: #4f7cff; /* 表头 */
color: white; .week {
padding: 10px 0; text-align: center;
font-size: 18px; font-size: 18px;
font-weight: 700;
color: #555;
} }
.calendar td {
border: 1px solid #dce1eb; /* 卡片基础 */
vertical-align: top; .card {
padding: 8px; min-height: 120px;
border-radius: 12px;
padding: 12px;
box-sizing: border-box;
background: transparent;
}
/* 状态样式 */
.card.past {
background: #e5e5e5;
color: #666;
}
.card.today {
background: #3b82f6;
color: #fff;
}
.card.future {
background: #ffffff; background: #ffffff;
color: #333;
border: 1px solid #ddd;
} }
.today {
background: #fff6d1; /* 内容 */
border: 2px solid #ffb100; .date {
font-weight: 700;
margin-bottom: 8px;
} }
.date-num {
font-weight: bold; .line {
font-size: 16px; font-size: 16px;
margin-bottom: 4px; margin-top: 6px;
display: block;
}
.item-block {
font-size: 12px;
margin-bottom: 6px;
padding: 4px;
border-radius: 4px;
background: #f0f3fa;
}
.item-block span {
font-weight: bold;
} }
</style> </style>
</head> </head>
<body> <body>
<h1 style="margin-bottom:20px;">未来战场日程表</h1> <div class="container">
<h1>日常预测</h1>
<table class="calendar"> <div class="calendar">
<thead> <!-- 星期头 -->
<tr> {% for w in ["周一","周二","周三","周四","周五","周六","周日"] %}
<th>日</th><th>一</th><th>二</th><th>三</th><th>四</th><th>五</th><th>六</th> <div class="week">{{ w }}</div>
</tr> {% endfor %}
</thead>
<tbody>
{% for week in items %}
<tr>
{% for day in week %}
{% if day.date %}
<td class="{% if day.is_today %}today{% endif %}">
<span class="date-num">{{ day.date }}</span>
{% for obj in day.items %} <!-- 日程卡片 -->
<div class="item-block"> {% for m in items %}
<div><span>战场：</span>{{ obj.battle }}</div> <div class="
<div><span>战役：</span>{{ obj.war }}</div> card
<div><span>运车：</span>{{ obj.orecar }}</div> {% if m.compare == '过去' %}past{% endif %}
<div><span>门派：</span>{{ obj.school }}</div> {% if m.compare == '今天' %}today{% endif %}
<div><span>救援：</span>{{ obj.rescue }}</div> {% if m.compare == '将来' %}future{% endif %}
{% if obj.card %} ">
<div><span>卡牌：</span>{{ obj.card | join('、') }}</div> {% if m.en %}
<div class="date">{{ m.date }}</div>
<div class="line">日常：{{ m.war }}</div>
<div class="line">战场：{{ m.battle }}</div>
{% endif %} {% endif %}
</div> </div>
{% endfor %} {% endfor %}
</div>
</td> </div>
{% else %}
<td style="background:#f0f2f7;"></td>
{% endif %}
{% endfor %}
</tr>
{% endfor %}
</tbody>
</table>
</body> </body>
</html> </html>