diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskLogServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskLogServiceImpl.java index f5404a3b..fe778422 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskLogServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskLogServiceImpl.java @@ -95,13 +95,15 @@ public class RetryTaskLogServiceImpl implements RetryTaskLogService { String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId(); PageDTO pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize()); - LambdaQueryWrapper retryTaskLogLambdaQueryWrapper = new LambdaQueryWrapper<>(); - retryTaskLogLambdaQueryWrapper.eq(RetryTaskLogMessage::getNamespaceId, namespaceId); - retryTaskLogLambdaQueryWrapper.eq(RetryTaskLogMessage::getUniqueId, queryVO.getUniqueId()); - retryTaskLogLambdaQueryWrapper.eq(RetryTaskLogMessage::getGroupName, queryVO.getGroupName()); - retryTaskLogLambdaQueryWrapper.orderByAsc(RetryTaskLogMessage::getId).orderByAsc(RetryTaskLogMessage::getRealTime); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.select(RetryTaskLogMessage::getId, RetryTaskLogMessage::getLogNum); + wrapper.ge(RetryTaskLogMessage::getId, queryVO.getStartId()); + wrapper.eq(RetryTaskLogMessage::getNamespaceId, namespaceId); + wrapper.eq(RetryTaskLogMessage::getUniqueId, queryVO.getUniqueId()); + wrapper.eq(RetryTaskLogMessage::getGroupName, queryVO.getGroupName()); + wrapper.orderByAsc(RetryTaskLogMessage::getId).orderByAsc(RetryTaskLogMessage::getRealTime); - PageDTO selectPage = retryTaskLogMessageMapper.selectPage(pageDTO, retryTaskLogLambdaQueryWrapper.orderByDesc(RetryTaskLogMessage::getCreateDt)); + PageDTO selectPage = retryTaskLogMessageMapper.selectPage(pageDTO, wrapper.orderByDesc(RetryTaskLogMessage::getCreateDt)); List records = selectPage.getRecords(); diff --git a/frontend/src/components/Log/index.vue b/frontend/src/components/Log/index.vue new file mode 100644 index 00000000..8dd92a29 --- /dev/null +++ b/frontend/src/components/Log/index.vue @@ -0,0 +1,234 @@ + + + + + + diff --git a/frontend/src/views/job/JobBatchLog.vue b/frontend/src/views/job/JobBatchLog.vue index da8a9c95..dfb74b38 100644 --- a/frontend/src/views/job/JobBatchLog.vue +++ b/frontend/src/views/job/JobBatchLog.vue @@ -6,43 +6,17 @@ :footer="null" title="日志详情" @cancel="onCancel"> -
- - - - - - - -
- {{ index + 1 }} - -
-
-
-
{{ timestampToDate(log.time_stamp) }}
-
- {{ log.level.length === 4 ? log.level + ' ' : log.level }} -
-
[{{ log.thread }}]
-
{{ log.location }}
-
:
-
-
{{ log.message }}
-
{{ log.throwable }}
-
-
-
-
+ + +