GTsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: DateTypeEnum接受非空日期

Browse Source
This commit is contained in:
dhb52 2024-05-10 13:12:52 +08:00
parent 087e77ef2d
commit 7f7d1b6b8c
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/enums/DateTypeEnum.java
View File

@ -34,8 +34,8 @@ public enum DateTypeEnum {
} }
} }
}, },
(startTime) -> LocalDateTimeUtil.beginOfDay(Optional.ofNullable(startTime).orElse(LocalDateTime.now())), (startTime) -> LocalDateTimeUtil.beginOfDay(startTime),
(endTime) -> LocalDateTimeUtil.endOfDay(Optional.ofNullable(endTime).orElse(LocalDateTime.now())) (endTime) -> LocalDateTimeUtil.endOfDay(endTime)
), ),
/** /**
@ -52,8 +52,8 @@ public enum DateTypeEnum {
} }
} }
}, },
(startTime) -> LocalDateTimeUtil.beginOfDay(Optional.ofNullable(startTime).orElse(LocalDateTime.now()).minusDays(7)), (startTime) -> LocalDateTimeUtil.beginOfDay(startTime).minusDays(7),
(endTime) -> LocalDateTimeUtil.endOfDay(Optional.ofNullable(endTime).orElse(LocalDateTime.now())) (endTime) -> LocalDateTimeUtil.endOfDay(endTime)
), ),
/** /**
@ -71,8 +71,8 @@ public enum DateTypeEnum {
} }
} }
}, },
(startTime) -> LocalDateTimeUtil.beginOfDay(Optional.ofNullable(startTime).orElse(LocalDateTime.now()).minusMonths(1)), (startTime) -> LocalDateTimeUtil.beginOfDay(startTime).minusMonths(1),
(endTime) -> LocalDateTimeUtil.endOfDay(Optional.ofNullable(endTime).orElse(LocalDateTime.now())) (endTime) -> LocalDateTimeUtil.endOfDay(endTime)
), ),
/** /**

20
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/DashBoardServiceImpl.java
View File

@ -179,8 +179,14 @@ public class DashBoardServiceImpl implements DashBoardService {
// 折线图 // 折线图
DateTypeEnum dateTypeEnum = DateTypeEnum.valueOf(type); 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 startDateTime = dateTypeEnum.getStartTime().apply(
LocalDateTime endDateTime = dateTypeEnum.getEndTime().apply(StrUtil.isNotBlank(endTime) ? LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : null); 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<DashboardLineResponseDO> dashboardRetryLinkeResponseDOList = retrySummaryMapper.retryLineList( List<DashboardLineResponseDO> dashboardRetryLinkeResponseDOList = retrySummaryMapper.retryLineList(
DashboardLineEnum.dateFormat(type), DashboardLineEnum.dateFormat(type),
new LambdaQueryWrapper<RetrySummary>() new LambdaQueryWrapper<RetrySummary>()
@ -241,8 +247,14 @@ public class DashBoardServiceImpl implements DashBoardService {
// 折线图 // 折线图
DateTypeEnum dateTypeEnum = DateTypeEnum.valueOf(type); 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 startDateTime = dateTypeEnum.getStartTime().apply(
LocalDateTime endDateTime = dateTypeEnum.getEndTime().apply(StrUtil.isNotBlank(endTime) ? LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : null); 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<DashboardLineResponseDO> dashboardLineResponseDOList = jobSummaryMapper.jobLineList( List<DashboardLineResponseDO> dashboardLineResponseDOList = jobSummaryMapper.jobLineList(
DashboardLineEnum.dateFormat(type), DashboardLineEnum.dateFormat(type),
new LambdaQueryWrapper<JobSummary>() new LambdaQueryWrapper<JobSummary>()