From e5a5f9a9c554555cf99ffaa5ba3c807e33b08c91 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Sun, 16 Jun 2024 10:47:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20DashboardController?= =?UTF-8?q?=20=E6=97=B6=E9=97=B4=E6=AE=B5=E4=BD=BF=E7=94=A8Mvc=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=BD=AC=E6=8D=A2LocalDateTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/DashboardController.java | 9 ++++---- .../server/web/service/DashboardService.java | 5 +++-- .../service/impl/DashboardServiceImpl.java | 22 ++++++------------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/DashboardController.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/DashboardController.java index e61415f6..a184f96f 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/DashboardController.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/DashboardController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDateTime; import java.util.List; import java.util.Set; @@ -42,8 +43,8 @@ public class DashboardController { public DashboardRetryLineResponseVO retryLineList(BaseQueryVO baseQueryVO, @RequestParam(value = "groupName", required = false) String groupName, @RequestParam(value = "type", required = false, defaultValue = "WEEK") String type, - @RequestParam(value = "startTime", required = false) String startTime, - @RequestParam(value = "endTime", required = false) String endTime) { + @RequestParam(value = "startTime", required = false) LocalDateTime startTime, + @RequestParam(value = "endTime", required = false) LocalDateTime endTime) { return dashBoardService.retryLineList(baseQueryVO, groupName, type, startTime, endTime); } @@ -53,8 +54,8 @@ public class DashboardController { @RequestParam(value = "mode", required = false) String mode, @RequestParam(value = "groupName", required = false) String groupName, @RequestParam(value = "type", required = false, defaultValue = "WEEK") String type, - @RequestParam(value = "startTime", required = false) String startTime, - @RequestParam(value = "endTime", required = false) String endTime) { + @RequestParam(value = "startTime", required = false) LocalDateTime startTime, + @RequestParam(value = "endTime", required = false) LocalDateTime endTime) { return dashBoardService.jobLineList(baseQueryVO, mode, groupName, type, startTime, endTime); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/DashboardService.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/DashboardService.java index e05ef57a..1c7cdd42 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/DashboardService.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/DashboardService.java @@ -7,6 +7,7 @@ import com.aizuda.snailjob.server.web.model.response.DashboardCardResponseVO; import com.aizuda.snailjob.server.web.model.response.DashboardRetryLineResponseVO; import com.aizuda.snailjob.server.web.model.response.ServerNodeResponseVO; +import java.time.LocalDateTime; import java.util.List; /** @@ -17,9 +18,9 @@ public interface DashboardService { DashboardCardResponseVO taskRetryJob(); - DashboardRetryLineResponseVO retryLineList(BaseQueryVO baseQueryVO, String groupName, String type, String startTime, String endTime); + DashboardRetryLineResponseVO retryLineList(BaseQueryVO baseQueryVO, String groupName, String type, LocalDateTime startTime, LocalDateTime endTime); - DashboardRetryLineResponseVO jobLineList(BaseQueryVO baseQueryVO, String mode, String groupName, String type, String startTime, String endTime); + DashboardRetryLineResponseVO jobLineList(BaseQueryVO baseQueryVO, String mode, String groupName, String type, LocalDateTime startTime, LocalDateTime endTime); PageResult> pods(ServerNodeQueryVO serverNodeQueryVO); } 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 38415ff2..69a7ecaf 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 @@ -2,6 +2,7 @@ package com.aizuda.snailjob.server.web.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.enums.NodeTypeEnum; import com.aizuda.snailjob.common.core.model.Result; @@ -51,7 +52,6 @@ import org.springframework.web.client.RestTemplate; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -149,7 +149,7 @@ public class DashboardServiceImpl implements DashboardService { @Override public DashboardRetryLineResponseVO retryLineList(BaseQueryVO baseQueryVO, String groupName, String type, - String startTime, String endTime) { + LocalDateTime startTime, LocalDateTime endTime) { // 查询登录用户权限 UserSessionVO userSessionVO = UserSessionUtils.currentUserSession(); @@ -177,13 +177,9 @@ 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")) : - LocalDateTime.now()); + ObjUtil.isNotNull(startTime) ? startTime : LocalDateTime.now()); LocalDateTime endDateTime = dateTypeEnum.getEndTime().apply( - StrUtil.isNotBlank(endTime) ? - LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : - LocalDateTime.now()); + ObjUtil.isNotNull(endTime) ? endTime : LocalDateTime.now()); List dashboardRetryLinkeResponseDOList = retrySummaryMapper.selectRetryLineList( DashboardLineEnum.dateFormat(type), new LambdaQueryWrapper() @@ -213,7 +209,7 @@ public class DashboardServiceImpl implements DashboardService { @Override public DashboardRetryLineResponseVO jobLineList(BaseQueryVO baseQueryVO, String mode, String groupName, String type, - String startTime, String endTime) { + LocalDateTime startTime, LocalDateTime endTime) { // 查询登录用户权限 UserSessionVO userSessionVO = UserSessionUtils.currentUserSession(); @@ -248,13 +244,9 @@ 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")) : - LocalDateTime.now()); + ObjUtil.isNotNull(startTime) ? startTime : LocalDateTime.now()); LocalDateTime endDateTime = dateTypeEnum.getEndTime().apply( - StrUtil.isNotBlank(endTime) ? - LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : - LocalDateTime.now()); + ObjUtil.isNotNull(endTime) ? endTime : LocalDateTime.now()); List dashboardLineResponseDOList = jobSummaryMapper.selectJobLineList( DashboardLineEnum.dateFormat(type), new LambdaQueryWrapper()