瀏覽代碼

任务报表成功、失败和进行中统计问题修复;

xuxueli 7 年之前
父節點
當前提交
960b8d5f5a

+ 1 - 0
doc/XXL-JOB官方文档.md 查看文件

1217
 - 12、脚本任务异常Log输出优化;
1217
 - 12、脚本任务异常Log输出优化;
1218
 - 13、任务线程停止变量修饰符优化;
1218
 - 13、任务线程停止变量修饰符优化;
1219
 - 14、脚本任务Log文件流关闭优化;
1219
 - 14、脚本任务Log文件流关闭优化;
1220
+- 15、任务报表成功、失败和进行中统计问题修复;
1220
 
1221
 
1221
 
1222
 
1222
 ### TODO LIST
1223
 ### TODO LIST

+ 5 - 4
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java 查看文件

56
 									continue;
56
 									continue;
57
 								}
57
 								}
58
 								if (IJobHandler.SUCCESS.getCode() == log.getTriggerCode() && log.getHandleCode() == 0) {
58
 								if (IJobHandler.SUCCESS.getCode() == log.getTriggerCode() && log.getHandleCode() == 0) {
59
+									// job running
59
 									JobFailMonitorHelper.monitor(jobLogId);
60
 									JobFailMonitorHelper.monitor(jobLogId);
60
 									logger.info(">>>>>>>>>>> job monitor, job running, JobLogId:{}", jobLogId);
61
 									logger.info(">>>>>>>>>>> job monitor, job running, JobLogId:{}", jobLogId);
61
 								} else if (IJobHandler.SUCCESS.getCode() == log.getHandleCode()) {
62
 								} else if (IJobHandler.SUCCESS.getCode() == log.getHandleCode()) {
62
 									// job success, pass
63
 									// job success, pass
63
 									logger.info(">>>>>>>>>>> job monitor, job success, JobLogId:{}", jobLogId);
64
 									logger.info(">>>>>>>>>>> job monitor, job success, JobLogId:{}", jobLogId);
64
-								} else if (IJobHandler.FAIL.getCode() == log.getTriggerCode()
65
+								} else /*if (IJobHandler.FAIL.getCode() == log.getTriggerCode()
65
 										|| IJobHandler.FAIL.getCode() == log.getHandleCode()
66
 										|| IJobHandler.FAIL.getCode() == log.getHandleCode()
66
-										|| IJobHandler.FAIL_RETRY.getCode() == log.getHandleCode() ) {
67
+										|| IJobHandler.FAIL_RETRY.getCode() == log.getHandleCode() )*/ {
67
 									// job fail,
68
 									// job fail,
68
 									failAlarm(log);
69
 									failAlarm(log);
69
 									logger.info(">>>>>>>>>>> job monitor, job fail, JobLogId:{}", jobLogId);
70
 									logger.info(">>>>>>>>>>> job monitor, job fail, JobLogId:{}", jobLogId);
70
-								} else {
71
+								}/* else {
71
 									JobFailMonitorHelper.monitor(jobLogId);
72
 									JobFailMonitorHelper.monitor(jobLogId);
72
 									logger.info(">>>>>>>>>>> job monitor, job status unknown, JobLogId:{}", jobLogId);
73
 									logger.info(">>>>>>>>>>> job monitor, job status unknown, JobLogId:{}", jobLogId);
73
-								}
74
+								}*/
74
 							}
75
 							}
75
 						}
76
 						}
76
 
77
 

+ 1 - 1
xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml 查看文件

172
 		SELECT
172
 		SELECT
173
 			DATE_FORMAT(trigger_time,'%Y-%m-%d') triggerDay,
173
 			DATE_FORMAT(trigger_time,'%Y-%m-%d') triggerDay,
174
 			COUNT(handle_code) triggerDayCount,
174
 			COUNT(handle_code) triggerDayCount,
175
-			SUM(CASE WHEN handle_code = 0 then 1 else 0 end) as triggerDayCountRunning,
175
+			SUM(CASE WHEN (trigger_code = 200 and handle_code = 0) then 1 else 0 end) as triggerDayCountRunning,
176
 			SUM(CASE WHEN handle_code = 200 then 1 else 0 end) as triggerDayCountSuc
176
 			SUM(CASE WHEN handle_code = 200 then 1 else 0 end) as triggerDayCountSuc
177
 		FROM XXL_JOB_QRTZ_TRIGGER_LOG
177
 		FROM XXL_JOB_QRTZ_TRIGGER_LOG
178
 		WHERE trigger_time BETWEEN #{from} and #{to}
178
 		WHERE trigger_time BETWEEN #{from} and #{to}