From eaaee7680ce88bb5eccb320683ead5d7b2520ba3 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sun, 5 Apr 2026 18:30:20 +0800 Subject: [PATCH] =?UTF-8?q?refactor(log-report):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8A=A5=E8=A1=A8=E7=9B=B8=E5=85=B3=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 updateTime 字段到 XxlJobLogReport 模型 - 在 JobLogReportHelper 中设置更新时间戳 - 更新 XxlJobLogReportMapper.xml 的字段映射和 SQL 语句 - 在测试类中为 updateTime 字段赋值 - 完善报表数据填充逻辑并优化代码结构 --- doc/XXL-JOB官方文档.md | 2 +- .../com/xxl/job/admin/model/XxlJobLogReport.java | 12 +++++++++++- .../admin/scheduler/thread/JobLogReportHelper.java | 2 ++ .../main/resources/mapper/XxlJobLogReportMapper.xml | 13 +++++++++---- .../job/admin/mapper/XxlJobLogReportMapperTest.java | 1 + 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index dde5dcbd..a1414cd4 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2809,7 +2809,7 @@ public void execute() { - 7、【升级】升级多项maven依赖至较新版本； - 8、【优化】调度组件触发判断优化，合并PR-2502； - 9、【优化】调度日志调整，完善日志参数信息，合并PR-2761； -- 10、【优化】代码重构优化：I18N国际化处理、参数名重构、属性加载处理，合并PR-2888、PR-3006、PR-3027； +- 10、【优化】代码重构优化：I18N国际化、属性加载、报表SQL等逻辑重构，合并PR-2888、PR-3006、PR-3027、PR-3198、PR-3285； - 11、【优化】告警组件初始化重构，提升代码可维护性，合并PR-2903； - 12、【优化】一致性哈希路由算法优化，重构哈希环逻辑提升代码简洁性； diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogReport.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogReport.java index 82d138d6..92faada2 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogReport.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/model/XxlJobLogReport.java @@ -5,13 +5,14 @@ import java.util.Date; public class XxlJobLogReport { private int id; - private Date triggerDay; private int runningCount; private int sucCount; private int failCount; + private Date updateTime; + public int getId() { return id; } @@ -51,4 +52,13 @@ public class XxlJobLogReport { public void setFailCount(int failCount) { this.failCount = failCount; } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobLogReportHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobLogReportHelper.java index 5f1c032c..7ad7170e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobLogReportHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobLogReportHelper.java @@ -66,7 +66,9 @@ public class JobLogReportHelper { xxlJobLogReport.setRunningCount(0); xxlJobLogReport.setSucCount(0); xxlJobLogReport.setFailCount(0); + xxlJobLogReport.setUpdateTime(new Date()); + // fill count-data Map triggerCountMap = XxlJobAdminBootstrap.getInstance().getXxlJobLogMapper().findLogReport(todayFrom, todayTo); if (triggerCountMap!=null && !triggerCountMap.isEmpty()) { int triggerDayCount = triggerCountMap.containsKey("triggerDayCount")?Integer.parseInt(String.valueOf(triggerCountMap.get("triggerDayCount"))):0; diff --git a/xxl-job-admin/src/main/resources/mapper/XxlJobLogReportMapper.xml b/xxl-job-admin/src/main/resources/mapper/XxlJobLogReportMapper.xml index 6ca2ed3e..92a99363 100644 --- a/xxl-job-admin/src/main/resources/mapper/XxlJobLogReportMapper.xml +++ b/xxl-job-admin/src/main/resources/mapper/XxlJobLogReportMapper.xml @@ -9,6 +9,7 @@ + @@ -16,7 +17,8 @@ t.trigger_day, t.running_count, t.suc_count, - t.fail_count + t.fail_count, + t.update_time