From 1a9d2e43bc86ba480a40a7e40443138fcb944885 Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Tue, 26 Mar 2024 10:45:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=203.2.0=20=E4=BC=98=E5=8C=96=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=90=88=E5=B9=B6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../retry/server/job/task/support/JobTaskConverter.java  | 2 ++
 .../job/task/support/schedule/JobLogMergeSchedule.java   | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

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 b2216d021..7c376a209 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 d2fc63cc0..18786e762 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<String> messages = partitionMessages.get(i);
 
-                        jobLogMessage.setMessage(JsonUtil.toJsonString(partitionMessages.get(0)));
+                        jobLogMessage.setLogNum(messages.size());
+                        jobLogMessage.setMessage(JsonUtil.toJsonString(messages));
                         jobLogMessageUpdateList.add(jobLogMessage);
                     }