From 7f7d1b6b8c0ab6633d08c729921587631828f361 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Fri, 10 May 2024 13:12:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20DateTypeEnum=E6=8E=A5=E5=8F=97?=
 =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/web/model/enums/DateTypeEnum.java  | 12 +++++------
 .../service/impl/DashBoardServiceImpl.java    | 20 +++++++++++++++----
 2 files changed, 22 insertions(+), 10 deletions(-)

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<DashboardLineResponseDO> dashboardRetryLinkeResponseDOList = retrySummaryMapper.retryLineList(
             DashboardLineEnum.dateFormat(type),
             new LambdaQueryWrapper<RetrySummary>()
@@ -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<DashboardLineResponseDO> dashboardLineResponseDOList = jobSummaryMapper.jobLineList(
             DashboardLineEnum.dateFormat(type),
             new LambdaQueryWrapper<JobSummary>()