From b778e4a7ff6a3ac9da1f49128855188798c8113a Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Fri, 10 Jan 2025 14:09:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3557):=20=E7=AE=80=E5=8C=96=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=88=A0=E9=99=A4=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/server/job/LogCleanupJob.java    | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/job/LogCleanupJob.java b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/job/LogCleanupJob.java
index 9ddd3ab..e8ab4b6 100644
--- a/axzo-log-server/src/main/java/cn/axzo/log/platform/server/job/LogCleanupJob.java
+++ b/axzo-log-server/src/main/java/cn/axzo/log/platform/server/job/LogCleanupJob.java
@@ -2,6 +2,7 @@ package cn.axzo.log.platform.server.job;
 
 import cn.axzo.log.platform.server.entity.LogEntity;
 import com.alibaba.fastjson.JSON;
+import com.mongodb.client.result.DeleteResult;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.AllArgsConstructor;
@@ -10,14 +11,13 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 清理日志
@@ -36,7 +36,7 @@ public class LogCleanupJob {
     /**
      * 清理日志
      *
-     * @param param 示例：{\"batchSize\":1000,\"daysToKeep\":30,\"scene\":\"networkLog\"}
+     * @param param 示例：{"batchSize":1000,"daysToKeep":15,"scene":"networkLog"}
      * @return
      */
     @XxlJob("logCleanupJobHandler")
@@ -48,7 +48,7 @@ public class LogCleanupJob {
         try {
             paramDTO = JSON.parseObject(param, ParamDTO.class);
         } catch (Exception e) {
-            log.warn("Invalid parameter format, using default values.");
+            log.warn("Invalid parameter format, using default values. error info: {}", e.getMessage());
         }
         long deletedCount = 0;
         try {
@@ -57,22 +57,16 @@ public class LogCleanupJob {
             Criteria criteria = Criteria.where("scene").is(paramDTO.getScene())
                     .and("timestamp").lte(cutoffDate.getTime());
             Query query = new Query(criteria);
-            query.with(Sort.by(Sort.Direction.DESC, "_id"));
             query.limit(paramDTO.getBatchSize());
 
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
             while (true) {
-                List<LogEntity> logsToDelete = mongoTemplate.find(query, LogEntity.class);
-                if (logsToDelete.isEmpty()) {
+                DeleteResult result = mongoTemplate.remove(query, LogEntity.class);
+                if (result.getDeletedCount() == 0) {
                     break;
                 }
-
-                mongoTemplate.remove(query, LogEntity.class);
-                deletedCount += logsToDelete.size();
-                log.info("Cleaned up {} logs for scene: {} before timestamp: {}", logsToDelete.size(), paramDTO.getScene(), cutoffDate);
-
-                // 更新查询条件，使用最后一个日志的ID作为游标
-                LogEntity lastLog = logsToDelete.get(logsToDelete.size() - 1);
-                query.addCriteria(Criteria.where("_id").lt(lastLog.getId()));
+                deletedCount += result.getDeletedCount();
+                log.info("Cleaned up {} logs for scene: {} before data: {}", result.getDeletedCount(), paramDTO.getScene(), format.format(cutoffDate));
             }
         } catch (Exception e) {
             log.error("Error during log cleanup job", e);
@@ -92,16 +86,19 @@ public class LogCleanupJob {
         /**
          * 每次删除的日志数量（页大小）
          */
+        @Builder.Default
         private int batchSize = 1000;
 
         /**
          * 保留天数
          */
+        @Builder.Default
         private int daysToKeep = 30;
 
         /**
          * 场景
          */
+        @Builder.Default
         private String scene = "networkLog";
     }
 }