diff --git a/modules/common/src/main/java/org/dromara/jpom/cron/CronUtils.java b/modules/common/src/main/java/org/dromara/jpom/cron/CronUtils.java index a332068e3..20532e851 100644 --- a/modules/common/src/main/java/org/dromara/jpom/cron/CronUtils.java +++ b/modules/common/src/main/java/org/dromara/jpom/cron/CronUtils.java @@ -143,21 +143,22 @@ public class CronUtils { Scheduler scheduler = CronUtil.getScheduler(); Set> entries = TASK_STAT.entrySet(); return entries.stream() - .map(entry -> { - TaskStat taskStat = entry.getValue(); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("taskId", entry.getKey()); - CronPattern pattern = scheduler.getPattern(entry.getKey()); - Optional.ofNullable(pattern).ifPresent(cronPattern -> jsonObject.put("cron", cronPattern.toString())); - if (taskStat != null) { - jsonObject.put("executeCount", taskStat.executeCount.get()); - jsonObject.put("failedCount", taskStat.failedCount.get()); - jsonObject.put("succeedCount", taskStat.succeedCount.get()); - jsonObject.put("lastExecuteTime", taskStat.lastExecuteTime); - } - return jsonObject; - }) - .collect(Collectors.toList()); + .map(entry -> { + TaskStat taskStat = entry.getValue(); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("taskId", entry.getKey()); + CronPattern pattern = scheduler.getPattern(entry.getKey()); + Optional.ofNullable(pattern).ifPresent(cronPattern -> jsonObject.put("cron", cronPattern.toString())); + if (taskStat != null) { + jsonObject.put("executeCount", taskStat.executeCount.get()); + jsonObject.put("failedCount", taskStat.failedCount.get()); + jsonObject.put("succeedCount", taskStat.succeedCount.get()); + jsonObject.put("lastExecuteTime", taskStat.lastExecuteTime); + jsonObject.put("desc", taskStat.desc); + } + return jsonObject; + }) + .collect(Collectors.toList()); } /** diff --git a/web-vue/src/pages/build/history.vue b/web-vue/src/pages/build/history.vue index f5427fd4a..bf3ba10e6 100644 --- a/web-vue/src/pages/build/history.vue +++ b/web-vue/src/pages/build/history.vue @@ -1,7 +1,13 @@