From 3d3217130ce8422d9151c9cd299b3896c2da76f6 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Fri, 10 May 2024 00:46:45 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=AE=80=E5=8C=96messages=E7=9A=84?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/JobLogServiceImpl.java | 17 +++------- .../service/impl/RetryTaskLogServiceImpl.java | 34 ++++++------------- 2 files changed, 14 insertions(+), 37 deletions(-) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java index 7dbe5d253..e5f06b326 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobLogServiceImpl.java @@ -9,7 +9,6 @@ import com.aizuda.snailjob.template.datasource.persistence.mapper.JobLogMessageM import com.aizuda.snailjob.template.datasource.persistence.mapper.JobTaskBatchMapper; import com.aizuda.snailjob.template.datasource.persistence.po.JobLogMessage; import com.aizuda.snailjob.template.datasource.persistence.po.JobTaskBatch; -import com.aizuda.snailjob.server.web.model.response.JobLogResponseVO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.google.common.collect.Lists; @@ -96,7 +95,7 @@ public class JobLogServiceImpl implements JobLogService { List> originalList = JsonUtil.parseObject(jobLogMessage.getMessage(), List.class); int size = originalList.size() - fromIndex; List> pageList = originalList.stream().skip(fromIndex).limit(queryVO.getSize()) - .collect(Collectors.toList()); + .collect(Collectors.toList()); if (messages.size() + size >= queryVO.getSize()) { messages.addAll(pageList); @@ -110,17 +109,9 @@ public class JobLogServiceImpl implements JobLogService { fromIndex = 0; } - messages = messages.stream().sorted((o1, o2) -> { - long value = Long.parseLong(o1.get(LogFieldConstants.TIME_STAMP)) - Long.parseLong(o2.get(LogFieldConstants.TIME_STAMP)); - - if (value > 0) { - return 1; - } else if (value < 0) { - return -1; - } - - return 0; - }).collect(Collectors.toList()); + messages = messages.stream() + .sorted(Comparator.comparingLong(o -> Long.parseLong(o.get(LogFieldConstants.TIME_STAMP)))) + .collect(Collectors.toList()); JobLogResponseVO jobLogResponseVO = new JobLogResponseVO(); jobLogResponseVO.setMessage(messages); diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskLogServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskLogServiceImpl.java index 22decac9e..dc4d329b4 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskLogServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryTaskLogServiceImpl.java @@ -6,33 +6,28 @@ import com.aizuda.snailjob.common.core.enums.RetryStatusEnum; import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.common.log.constant.LogFieldConstants; import com.aizuda.snailjob.server.common.exception.SnailJobServerException; +import com.aizuda.snailjob.server.web.model.base.PageResult; +import com.aizuda.snailjob.server.web.model.request.RetryTaskLogMessageQueryVO; +import com.aizuda.snailjob.server.web.model.request.RetryTaskLogQueryVO; import com.aizuda.snailjob.server.web.model.request.UserSessionVO; -import com.aizuda.snailjob.server.web.util.UserSessionUtils; import com.aizuda.snailjob.server.web.model.response.RetryTaskLogMessageResponseVO; +import com.aizuda.snailjob.server.web.model.response.RetryTaskLogResponseVO; +import com.aizuda.snailjob.server.web.service.RetryTaskLogService; import com.aizuda.snailjob.server.web.service.convert.RetryTaskLogResponseVOConverter; +import com.aizuda.snailjob.server.web.util.UserSessionUtils; import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMapper; import com.aizuda.snailjob.template.datasource.persistence.mapper.RetryTaskLogMessageMapper; import com.aizuda.snailjob.template.datasource.persistence.po.RetryTaskLog; import com.aizuda.snailjob.template.datasource.persistence.po.RetryTaskLogMessage; -import com.aizuda.snailjob.server.web.model.request.RetryTaskLogMessageQueryVO; -import com.aizuda.snailjob.server.web.service.convert.RetryTaskLogResponseVOConverter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.aizuda.snailjob.server.web.model.base.PageResult; -import com.aizuda.snailjob.server.web.service.RetryTaskLogService; -import com.aizuda.snailjob.server.web.model.request.RetryTaskLogQueryVO; -import com.aizuda.snailjob.server.web.model.response.RetryTaskLogResponseVO; import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -164,18 +159,9 @@ public class RetryTaskLogServiceImpl implements RetryTaskLogService { fromIndex = 0; } - messages = messages.stream().sorted((o1, o2) -> { - long value = Long.parseLong(o1.get(LogFieldConstants.TIME_STAMP)) - Long.parseLong( - o2.get(LogFieldConstants.TIME_STAMP)); - - if (value > 0) { - return 1; - } else if (value < 0) { - return -1; - } - - return 0; - }).collect(Collectors.toList()); + messages = messages.stream() + .sorted(Comparator.comparingLong(o -> Long.parseLong(o.get(LogFieldConstants.TIME_STAMP)))) + .collect(Collectors.toList()); RetryTaskLogMessageResponseVO responseVO = new RetryTaskLogMessageResponseVO(); responseVO.setMessage(messages);