refactor(log-report): 重构日志报表相关逻辑

- 添加 updateTime 字段到 XxlJobLogReport 模型
- 在 JobLogReportHelper 中设置更新时间戳
- 更新 XxlJobLogReportMapper.xml 的字段映射和 SQL 语句
- 在测试类中为 updateTime 字段赋值
- 完善报表数据填充逻辑并优化代码结构

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、【优化】一致性哈希路由算法优化，重构哈希环逻辑提升代码简洁性；
 

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;
+    }
+
 }

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<String, Object> 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;

xxl-job-admin/src/main/resources/mapper/XxlJobLogReportMapper.xml

@@ -9,6 +9,7 @@
 		<result column="running_count" property="runningCount" />
 	    <result column="suc_count" property="sucCount" />
 	    <result column="fail_count" property="failCount" />
+		<result column="update_time" property="updateTime" />
 	</resultMap>
 
 	<sql id="Base_Column_List">
@@ -16,7 +17,8 @@
 		t.trigger_day,
 		t.running_count,
 		t.suc_count,
-		t.fail_count
+		t.fail_count,
+		t.update_time
 	</sql>
 	
 	<!--<insert id="save" parameterType="com.xxl.job.admin.model.XxlJobLogReport" useGeneratedKeys="true" keyProperty="id" >
@@ -49,17 +51,20 @@
 			`trigger_day`,
 			`running_count`,
 			`suc_count`,
-			`fail_count`
+			`fail_count`,
+			`update_time`
 		) VALUES (
 			 #{triggerDay},
 			 #{runningCount},
 			 #{sucCount},
-			 #{failCount}
+			 #{failCount},
+			 #{updateTime}
 		 )
 		ON DUPLICATE KEY UPDATE
 			`running_count` = #{runningCount},
 			`suc_count` = #{sucCount},
-			`fail_count` = #{failCount}
+			`fail_count` = #{failCount},
+			`update_time` = #{updateTime}
 	</insert>
 
 	<select id="queryLogReport" resultMap="XxlJobLogReport">

xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobLogReportMapperTest.java

@@ -27,6 +27,7 @@ public class XxlJobLogReportMapperTest {
         xxlJobLogReport.setRunningCount(444);
         xxlJobLogReport.setSucCount(555);
         xxlJobLogReport.setFailCount(666);
+        xxlJobLogReport.setUpdateTime(new Date());
 
         int ret = xxlJobLogReportMapper.saveOrUpdate(xxlJobLogReport);
         logger.info("ret:{}", ret);