diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/enums/DateTypeEnum.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/enums/DateTypeEnum.java index 0e9afecc..286134f3 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/enums/DateTypeEnum.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/enums/DateTypeEnum.java @@ -34,8 +34,8 @@ public enum DateTypeEnum { } } }, - (startTime) -> LocalDateTimeUtil.beginOfDay(Optional.ofNullable(startTime).orElse(LocalDateTime.now())), - (endTime) -> LocalDateTimeUtil.endOfDay(Optional.ofNullable(endTime).orElse(LocalDateTime.now())) + (startTime) -> LocalDateTimeUtil.beginOfDay(startTime), + (endTime) -> LocalDateTimeUtil.endOfDay(endTime) ), /** @@ -52,8 +52,8 @@ public enum DateTypeEnum { } } }, - (startTime) -> LocalDateTimeUtil.beginOfDay(Optional.ofNullable(startTime).orElse(LocalDateTime.now()).minusDays(7)), - (endTime) -> LocalDateTimeUtil.endOfDay(Optional.ofNullable(endTime).orElse(LocalDateTime.now())) + (startTime) -> LocalDateTimeUtil.beginOfDay(startTime).minusDays(7), + (endTime) -> LocalDateTimeUtil.endOfDay(endTime) ), /** @@ -71,8 +71,8 @@ public enum DateTypeEnum { } } }, - (startTime) -> LocalDateTimeUtil.beginOfDay(Optional.ofNullable(startTime).orElse(LocalDateTime.now()).minusMonths(1)), - (endTime) -> LocalDateTimeUtil.endOfDay(Optional.ofNullable(endTime).orElse(LocalDateTime.now())) + (startTime) -> LocalDateTimeUtil.beginOfDay(startTime).minusMonths(1), + (endTime) -> LocalDateTimeUtil.endOfDay(endTime) ), /** diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java index 3cebe6f5..165aa310 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java @@ -179,8 +179,14 @@ public class DashBoardServiceImpl implements DashBoardService { // 折线图 DateTypeEnum dateTypeEnum = DateTypeEnum.valueOf(type); - LocalDateTime startDateTime = dateTypeEnum.getStartTime().apply(StrUtil.isNotBlank(startTime) ? LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : null); - LocalDateTime endDateTime = dateTypeEnum.getEndTime().apply(StrUtil.isNotBlank(endTime) ? LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : null); + LocalDateTime startDateTime = dateTypeEnum.getStartTime().apply( + StrUtil.isNotBlank(startTime) ? + LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : + LocalDateTime.now()); + LocalDateTime endDateTime = dateTypeEnum.getEndTime().apply( + StrUtil.isNotBlank(endTime) ? + LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : + LocalDateTime.now()); List dashboardRetryLinkeResponseDOList = retrySummaryMapper.retryLineList( DashboardLineEnum.dateFormat(type), new LambdaQueryWrapper() @@ -241,8 +247,14 @@ public class DashBoardServiceImpl implements DashBoardService { // 折线图 DateTypeEnum dateTypeEnum = DateTypeEnum.valueOf(type); - LocalDateTime startDateTime = dateTypeEnum.getStartTime().apply(StrUtil.isNotBlank(startTime) ? LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : null); - LocalDateTime endDateTime = dateTypeEnum.getEndTime().apply(StrUtil.isNotBlank(endTime) ? LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : null); + LocalDateTime startDateTime = dateTypeEnum.getStartTime().apply( + StrUtil.isNotBlank(startTime) ? + LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : + LocalDateTime.now()); + LocalDateTime endDateTime = dateTypeEnum.getEndTime().apply( + StrUtil.isNotBlank(endTime) ? + LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : + LocalDateTime.now()); List dashboardLineResponseDOList = jobSummaryMapper.jobLineList( DashboardLineEnum.dateFormat(type), new LambdaQueryWrapper()