diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskConverter.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskConverter.java index b2216d02..7c376a20 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskConverter.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/JobTaskConverter.java @@ -129,4 +129,6 @@ public interface JobTaskConverter { CompleteJobBatchDTO completeJobBatchDTO(JobTaskPrepareDTO jobTaskPrepareDTO); + JobLogMessage toJobLogMessage(JobLogMessage jobLogMessage); + } diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobLogMergeSchedule.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobLogMergeSchedule.java index d2fc63cc..18786e76 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobLogMergeSchedule.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/schedule/JobLogMergeSchedule.java @@ -168,11 +168,12 @@ public class JobLogMergeSchedule extends AbstractSchedule implements Lifecycle { systemProperties.getMergeLogNum()); for (int i = 0; i < partitionMessages.size(); i++) { - JobLogMessage jobLogMessage = jobLogMessageMap.getValue().get(i); - // 剔除不需要删除的数据 - jobLogMessageDeleteBatchIds.remove(jobLogMessage.getId()); + // 深拷贝 + JobLogMessage jobLogMessage = JobTaskConverter.INSTANCE.toJobLogMessage( jobLogMessageMap.getValue().get(0)); + List messages = partitionMessages.get(i); - jobLogMessage.setMessage(JsonUtil.toJsonString(partitionMessages.get(0))); + jobLogMessage.setLogNum(messages.size()); + jobLogMessage.setMessage(JsonUtil.toJsonString(messages)); jobLogMessageUpdateList.add(jobLogMessage); }