refactor: DateTypeEnum接受非空日期
This commit is contained in:
parent
087e77ef2d
commit
7f7d1b6b8c
@ -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)
|
||||||
),
|
),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -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>()
|
||||||
|
Loading…
Reference in New Issue
Block a user